From caecd431b08eff3bc948b36d1b2f38047bdbeb5b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 12:26:50 +0800
Subject: [PATCH 1/8] fix wallet insufficient credit

---
 .../bookings/forms/BookingPaymentQuotationComponent.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index d43eb47b..ca515606 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -529,7 +529,7 @@
         computed: {
             walletOutstanding(){
                 let walletBalance = this.data.company.wallet ? this.data.company.wallet.amount : 0;
-                return walletBalance - this.calculation.total;
+                return (walletBalance - this.calculation.total).toFixed(2);
             }
         },
         methods: {

From 14200bf52e17762b7e715a06475ae4b2090a037d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 12:31:38 +0800
Subject: [PATCH 2/8] fix wallet insufficient credit

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index 38080fff..87e6866f 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -121,7 +121,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             /** @var Wallet $wallet */
             $wallet = $booking->company->wallets()->first();
 
-            if($wallet->amount < $amount){
+            if($wallet->amount < round($amount, 2)){
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 

From 58f3d85f8d942dc222a6a125ccebd2e58534a83a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 12:50:39 +0800
Subject: [PATCH 3/8] filter out wallet payment from payment list

---
 .../Eloquent/Filters/PaymentMethodNotIn.php   | 20 +++++++++++++++++++
 resources/views/pages/payments.blade.php      |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/Classes/General/Eloquent/Filters/PaymentMethodNotIn.php

diff --git a/app/Classes/General/Eloquent/Filters/PaymentMethodNotIn.php b/app/Classes/General/Eloquent/Filters/PaymentMethodNotIn.php
new file mode 100644
index 00000000..239bb8df
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/PaymentMethodNotIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class PaymentMethodNotIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereNotIn('payment_method', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index 00e480c3..961e48db 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -11,7 +11,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3}">
+                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [5}">
                                 <template slot="list" slot-scope="{data}">
                                     <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
                                 </template>

From c126731960dc4a1a7cd61d658d529b359c556480 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 12:51:33 +0800
Subject: [PATCH 4/8] filter out wallet payment from payment list

---
 resources/views/pages/payments.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index 961e48db..cf13a12e 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -11,7 +11,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [5}">
+                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [5]}">
                                 <template slot="list" slot-scope="{data}">
                                     <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
                                 </template>

From ed17418ac96da24d6933f49258a561e1534da513 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 12:52:35 +0800
Subject: [PATCH 5/8] filter out wallet payment from payment list

---
 resources/views/pages/payments.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/payments.blade.php b/resources/views/pages/payments.blade.php
index cf13a12e..14517e6e 100644
--- a/resources/views/pages/payments.blade.php
+++ b/resources/views/pages/payments.blade.php
@@ -11,7 +11,7 @@
                     </div>
                     <div class="row">
                         <div class="col">
-                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [5]}">
+                            <list-component key="2" section="paymentVerificationSection" :endpoint="route('api.transaction.list')" :options="{'type': 1, 'status': 3, 'payment_method_not_in': [4]}">
                                 <template slot="list" slot-scope="{data}">
                                     <payment-verification-component section="paymentVerificationSection" :data="data" :no_action="true"></payment-verification-component>
                                 </template>

From 8b3fffd52b989b9023f0cd2a35327c204a7e14f0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 13:43:59 +0800
Subject: [PATCH 6/8] show timer in urgent list

---
 .../components/bookings/elements/UrgentTransactionComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue b/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue
index 37de4dcc..acf9cbf9 100644
--- a/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/UrgentTransactionComponent.vue
@@ -4,7 +4,7 @@
             <p>{{item.documents ? item.documents.created_at : item.updated_at}}</p>
         </td>
         <td class="v-align-middle ">
-            <p v-if="item.booking.bank.bank_name.includes('浙江网商银行')">1688.com</p>
+            <p v-if="item.booking.bank.bank_name.includes('浙江网商银行')">1688.com, </p>{{item.interval.value}}  {{item.interval.duration}} days
         </td>
         <td class="v-align-middle ">
             <p>{{item.booking.marking}}</p>

From 3c8d9c1e653ef7de7b1c2cdb51562440c0746891 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 14:11:50 +0800
Subject: [PATCH 7/8] fix urgent list payment filter wallet transactions

---
 .../components/bookings/sections/UrgentListSectionComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/UrgentListSectionComponent.vue b/resources/assets/vue/components/bookings/sections/UrgentListSectionComponent.vue
index eb3aff4d..887af3f4 100644
--- a/resources/assets/vue/components/bookings/sections/UrgentListSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/UrgentListSectionComponent.vue
@@ -47,7 +47,7 @@
         },
         methods: {
             fetchList(Page = 1){
-                this.submit(route('api.transaction.list') + '?page='+ Page +'&filters=' + JSON.stringify({status: 2, type: 1, per_page: 50, order_by: {
+                this.submit(route('api.transaction.list') + '?page='+ Page +'&filters=' + JSON.stringify({status: 2, type: 1, owner_type: 'App\\Models\\Booking', per_page: 50, order_by: {
                         column: 'created_at',
                         DESC: true
                     }}), 'get', 'urgentListSection', false, true)

From 5b373bd8232c547d262f35cfe774284ece6b8e6a Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 4 Mar 2022 15:06:32 +0800
Subject: [PATCH 8/8] fix urgent list payment filter wallet transactions

---
 .../bookings/sections/SupplierPendingOrdersSectionComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index 8d1b279e..897ab360 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -114,7 +114,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 10000, status: 2, type: 1, original_currency_id_in: [selectedCurrency.id], service_type_id_in: [selectedService.id]}">
+                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 10000, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], service_type_id_in: [selectedService.id]}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>