diff --git a/app/Http/Resources/GroupForOrderV2Resource.php b/app/Http/Resources/GroupForOrderV2Resource.php index 4c4c8c33..c1f1d981 100644 --- a/app/Http/Resources/GroupForOrderV2Resource.php +++ b/app/Http/Resources/GroupForOrderV2Resource.php @@ -40,7 +40,9 @@ class GroupForOrderV2Resource extends JsonResource 'payment_transaction' => $payment_transaction ? [ 'id' => $payment_transaction->id, 'status' => $payment_transaction->status, - 'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status] + 'status_name' => ApprovalStatus::APPROVAL_STATUS_ID[$payment_transaction->status], + 'bill_no' => $payment_transaction->bill_no, + 'updated_at' => Carbon::parse($payment_transaction->updated_at)->format('d-m-Y h:i:s A'), ] : [] ]; } diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 40984608..d8697f8a 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -78,7 +78,7 @@ class TransactionResource extends JsonResource ->get() ), 'remarks' => RemarkResource::collection($this->remarks), - 'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'), + 'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'), 'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'), 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y') ]; diff --git a/app/Http/Resources/TransactionWithStorageResource.php b/app/Http/Resources/TransactionWithStorageResource.php index d072913a..dd307ad8 100644 --- a/app/Http/Resources/TransactionWithStorageResource.php +++ b/app/Http/Resources/TransactionWithStorageResource.php @@ -121,7 +121,7 @@ class TransactionWithStorageResource extends JsonResource 'remarks' => RemarkResource::collection($this->remarks), 'storages' => $this->storages ? $this->storages : null, //from middleware 'is_waived' => (int) $this->is_waived, - 'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'), + 'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:i:s A'), 'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'), 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y') ]; diff --git a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue index 7a95322e..2b176920 100644 --- a/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue +++ b/resources/assets/vue/components/paymentsBilling/elements/SingleGroupPaymentHistoryTransactionDetailsComponent.vue @@ -19,16 +19,16 @@ {{item.currency.short_code}} {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}} -