gofnnp/h-selfdelivery-admin-panel-p
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #14073

Browse Source 
сделал кнопку отмены для налички (просто меняет статус на отменен)
This commit is contained in:
gofnnp 2023-04-13 21:59:04 +04:00
parent 9007e7fec8
commit 17691184e9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/pages/orders/orders.component.html
View File

@ -93,6 +93,7 @@
<option>Новый</option> <option>Новый</option>
<option>Выдан</option> <option>Выдан</option>
<option>Напечатан чек</option> <option>Напечатан чек</option>
<option>Отменен</option>
</select> </select>
<button (click)="saveStatus(ord.id)" [disabled]="!selectedStatus.length">Сохранить</button> <button (click)="saveStatus(ord.id)" [disabled]="!selectedStatus.length">Сохранить</button>
</td> </td>
@ -150,7 +151,8 @@
<th>Сумма оплаты</th> <th>Сумма оплаты</th>
<th>Тип оплаты</th> <th>Тип оплаты</th>
<th *ngIf="order[0].payment[0]?.type !== 'CASH'">Статус оплаты</th> <th *ngIf="order[0].payment[0]?.type !== 'CASH'">Статус оплаты</th>
<th *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== 'CASH'">Отмена заказа</th> <!-- <th *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== 'CASH'">Отмена заказа</th> -->
<th>Отмена заказа</th>
</tr> </tr>
</ng-template> </ng-template>
<ng-template pTemplate="body" let-pay> <ng-template pTemplate="body" let-pay>
@ -158,7 +160,8 @@
<td>{{pay.summ}}</td> <td>{{pay.summ}}</td>
<td>{{pay.type | paymentType}}</td> <td>{{pay.type | paymentType}}</td>
<td *ngIf="pay.type !== 'CASH'">{{pay.payload.status | paymentStatus}}</td> <td *ngIf="pay.type !== 'CASH'">{{pay.payload.status | paymentStatus}}</td>
<td *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== 'CASH'"> <!-- <td *ngIf="['PAID', 'NOTIFIED', 'INTERNAL_ERROR', 'PROCESSING'].includes(order[0].payment[0]?.payload?.status || '') && order[0].payment[0]?.type !== 'CASH'"> -->
<td>
<button (click)="cancelOrder(pay.payload?.id)">Отменить</button> <button (click)="cancelOrder(pay.payload?.id)">Отменить</button>
</td> </td>
</tr> </tr>

4
src/app/pages/orders/orders.component.ts
View File

@ -343,6 +343,10 @@ export class OrdersComponent implements OnInit {
} }
cancelOrder(payment_request_id: string) { cancelOrder(payment_request_id: string) {
if (this.order[0].payment[0]?.type === 'CASH') {
this.changeOrderStatus(this.order[0].id, 'cancel');
return;
}
this.jsonRpcService this.jsonRpcService
.rpc2( .rpc2(
{ {