Merge branch 'debtor' into 'development'

cash back front

See merge request CIEFWorldwideSdnBhd/exchange-2.0!96
This commit is contained in:
Leong Chee Siong
2022-04-02 01:33:45 +00:00
2 changed files with 17 additions and 2 deletions
@@ -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;
}
@@ -40,6 +40,17 @@
</div>
</div>
</div>
<div class="row align-items-center m-b-15 parentContainer bg-master-lighter p-t-10 p-b-10">
<div class="col">
<div class="row m-b-5">
<div class="col">
<div class="font-heading all-caps fs-10 muted">
{{ !item.purchase_order ? 'Please fill up purchase order to enjoy the cashback' : 'You have entitled to earn cashbback' }}
</div>
</div>
</div>
</div>
</div>
<div class="row align-items-center m-b-15 parentContainer bg-master-lighter p-t-10 p-b-10">
<div class="col">
<div class="row m-b-5">