From 2d61d27aab5f06a25c413dd2eb6c3a863f0d3824 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Wed, 2 Mar 2022 20:33:03 +0800 Subject: [PATCH 01/14] hide booking status --- .../vue/components/bookings/elements/BookingComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/bookings/elements/BookingComponent.vue b/resources/assets/vue/components/bookings/elements/BookingComponent.vue index c0563a15..9ff3fe9c 100644 --- a/resources/assets/vue/components/bookings/elements/BookingComponent.vue +++ b/resources/assets/vue/components/bookings/elements/BookingComponent.vue @@ -42,7 +42,7 @@
Payable Amount
{{this.item.amount}} {{this.item.fixed_currency.short_code}}
-
+
status
{{item.status === 3 ? 'Complete' : 'In Progress'}} From e540a52844e13e44ada03b3cdff6f4d280ccdf43 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 3 Mar 2022 11:07:41 +0800 Subject: [PATCH 02/14] JY BADGE --- .../assets/vue/components/wallets/elements/WalletComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue index 486f821d..44e744d2 100644 --- a/resources/assets/vue/components/wallets/elements/WalletComponent.vue +++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue @@ -10,7 +10,7 @@
-
Congratulation! You've earned and achievement
+
Congratulation! You've earned an achievement
From 6209f13ffa5b1d960a8ccbbaf9fd16f4440049c1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 3 Mar 2022 13:02:17 +0800 Subject: [PATCH 03/14] fix wallet --- .../vue/components/wallets/forms/WalletTopUpFormComponent.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue index 23f56c46..dc995b94 100644 --- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue +++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue @@ -120,9 +120,6 @@ amount: { required, minValue: minValue(this.minValue), - }, - reference: { - required: requiredIf(function () { return this.parameters.transaction_type !== 0 }) } } } From 628ccd2bcb7e2074b1981459ca637f35f2b216cc Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 3 Mar 2022 13:04:06 +0800 Subject: [PATCH 04/14] fix wallet --- .../components/wallets/forms/WalletTopUpFormComponent.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue index dc995b94..7e2cfd47 100644 --- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue +++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue @@ -119,7 +119,10 @@ parameters: { amount: { required, - minValue: minValue(this.minValue), + minValue: 0, + }, + reference: { + required: requiredIf(function () { return this.parameters.transaction_type !== 0 }) } } } From fc67c720f81bdbb30fb8b4653e6821277b925215 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 3 Mar 2022 14:09:58 +0800 Subject: [PATCH 05/14] fix timer for transaction --- app/Http/Resources/TransactionResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index efcdb99c..b3bc19ad 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -17,7 +17,7 @@ class TransactionResource extends JsonResource public function toArray($request) { $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; - $days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 1 : 2); + $days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 2 : 3); return [ 'id' => $this->id, From 9ff3f3ab5bdc28e128cea026372d1d89456367d1 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Thu, 3 Mar 2022 14:12:52 +0800 Subject: [PATCH 06/14] fix timer for transaction --- app/Http/Resources/TransactionResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index b3bc19ad..6676fc0b 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -17,7 +17,7 @@ class TransactionResource extends JsonResource public function toArray($request) { $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking; - $days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 2 : 3); + $days = Carbon::parse($this->created_at->format('d-m-Y'))->addDays($booking->service_id === 1 ? 2 : 3); return [ 'id' => $this->id, From caecd431b08eff3bc948b36d1b2f38047bdbeb5b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 4 Mar 2022 12:26:50 +0800 Subject: [PATCH 07/14] 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 Date: Fri, 4 Mar 2022 12:31:38 +0800 Subject: [PATCH 08/14] 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 Date: Fri, 4 Mar 2022 12:50:39 +0800 Subject: [PATCH 09/14] 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 @@ +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 @@
- + From c126731960dc4a1a7cd61d658d529b359c556480 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 4 Mar 2022 12:51:33 +0800 Subject: [PATCH 10/14] 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 @@
- + From ed17418ac96da24d6933f49258a561e1534da513 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 4 Mar 2022 12:52:35 +0800 Subject: [PATCH 11/14] 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 @@
- + From 8b3fffd52b989b9023f0cd2a35327c204a7e14f0 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 4 Mar 2022 13:43:59 +0800 Subject: [PATCH 12/14] 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 @@

{{item.documents ? item.documents.created_at : item.updated_at}}

-

1688.com

+

1688.com,

{{item.interval.value}} {{item.interval.duration}} days

{{item.booking.marking}}

From 3c8d9c1e653ef7de7b1c2cdb51562440c0746891 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Fri, 4 Mar 2022 14:11:50 +0800 Subject: [PATCH 13/14] 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 Date: Fri, 4 Mar 2022 15:06:32 +0800 Subject: [PATCH 14/14] 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 @@
- +