diff --git a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php index 33aaa3a9..6ad26563 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateCashBackTransactionProcessor.php @@ -86,7 +86,11 @@ class CreateCashBackTransactionProcessor where('type', TransactionType::CASH_BACK) ->whereMonth('created_at', Carbon::now()->month)->sum('amount'); - if ($current_total_cash_back < CashBack::MAX) { + + if ( + $current_total_cash_back < CashBack::MAX && + $transaction->owner()->first()->transactions()->where('type', TransactionType::PURCHASE_ORDER)->count() > 0 + ) { $cash_back_segemnt = CashBack::SEGMENT; @@ -119,12 +123,12 @@ class CreateCashBackTransactionProcessor $cash_back_transaction = $this->createsTransaction->execute($transaction, $object); + $company = $transaction->owner()->first()->company; $credit = $this->creditWalletProcessor->execute($company, $transaction->type, $cash_back_transaction->amount, ''); } } } - return $transaction; } diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue index 6f5cb632..b03b6447 100644 --- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue +++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue @@ -40,6 +40,17 @@ +