Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return a collection of all related WalletLog for successfull calls to the pay() method. #37

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion src/Facades/LaravelPayPocket.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* @see \HPWebdeveloper\LaravelPayPocket\Services\PocketServices
*
* @method static void pay(WalletOperations $user, int|float $orderValue, ?string $notes = null)
* @method static \Illuminate\Support\Collection pay(WalletOperations $user, int|float $orderValue, ?string $notes = null)
* @method static bool deposit(WalletOperations $user, string $type, int|float $amount, ?string $notes = null)
* @method static int|float checkBalance(WalletOperations $user)
* @method static int|float walletBalanceByType(WalletOperations $user, string $type)
Expand Down
6 changes: 5 additions & 1 deletion src/Interfaces/WalletOperations.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace HPWebdeveloper\LaravelPayPocket\Interfaces;

use HPWebdeveloper\LaravelPayPocket\Exceptions\InsufficientBalanceException;
use HPWebdeveloper\LaravelPayPocket\Models\WalletsLog;

interface WalletOperations
{
Expand All @@ -24,9 +25,12 @@ public function hasSufficientBalance(int|float $value): bool;
/**
* Pay the order value from the user's wallets.
*
* @param ?string $notes
* @return \Illuminate\Support\Collection<TKey,WalletsLog>
*
* @throws InsufficientBalanceException
*/
public function pay(int|float $orderValue, ?string $notes = null): void;
public function pay(int|float $orderValue, ?string $notes = null): \Illuminate\Support\Collection;

/**
* Deposit an amount to the user's wallet of a specific type.
Expand Down
8 changes: 6 additions & 2 deletions src/Services/PocketServices.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use HPWebdeveloper\LaravelPayPocket\Exceptions\InsufficientBalanceException;
use HPWebdeveloper\LaravelPayPocket\Interfaces\WalletOperations;
use HPWebdeveloper\LaravelPayPocket\Models\WalletsLog;

class PocketServices
{
Expand All @@ -18,11 +19,14 @@ public function deposit(WalletOperations $user, string $type, int|float $amount,
/**
* Pay the order value from the user's wallets.
*
* @param ?string $notes
* @return \Illuminate\Support\Collection<TKey,WalletsLog>
*
* @throws InsufficientBalanceException
*/
public function pay(WalletOperations $user, int|float $orderValue, ?string $notes = null): void
public function pay(WalletOperations $user, int|float $orderValue, ?string $notes = null): \Illuminate\Support\Collection
{
$user->pay($orderValue, $notes);
return $user->pay($orderValue, $notes);
}

/**
Expand Down
8 changes: 6 additions & 2 deletions src/Traits/BalanceOperation.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,23 @@ public function hasBalance(): bool
/**
* Decrement Balance and create a log entry.
*/
public function decrementAndCreateLog(int|float $value, ?string $notes = null): void
public function decrementAndCreateLog(int|float $value, ?string $notes = null): WalletsLog
{
$this->createLog('dec', $value, $notes);
$this->decrement('balance', $value);

return $this->createdLog;
}

/**
* Increment Balance and create a log entry.
*/
public function incrementAndCreateLog(int|float $value, ?string $notes = null): void
public function incrementAndCreateLog(int|float $value, ?string $notes = null): WalletsLog
{
$this->createLog('inc', $value, $notes);
$this->increment('balance', $value);

return $this->createdLog;
}

/**
Expand Down
1 change: 1 addition & 0 deletions src/Traits/HandlesDeposit.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ trait HandlesDeposit
/**
* Deposit an amount to the user's wallet of a specific type.
*
*
* @throws InvalidDepositException
* @throws InvalidValueException
* @throws InvalidWalletTypeException
Expand Down
14 changes: 11 additions & 3 deletions src/Traits/HandlesPayment.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,42 @@
namespace HPWebdeveloper\LaravelPayPocket\Traits;

use HPWebdeveloper\LaravelPayPocket\Exceptions\InsufficientBalanceException;
use HPWebdeveloper\LaravelPayPocket\Models\WalletsLog;
use Illuminate\Support\Facades\DB;

trait HandlesPayment
{
/**
* Pay the order value from the user's wallets.
*
*
* @return \Illuminate\Support\Collection<TKey,WalletsLog>
*
* @throws InsufficientBalanceException
*/
public function pay(int|float $orderValue, ?string $notes = null): void
public function pay(int|float $orderValue, ?string $notes = null): \Illuminate\Database\Eloquent\Collection
{
if (! $this->hasSufficientBalance($orderValue)) {
throw new InsufficientBalanceException('Insufficient balance to cover the order.');
}

DB::transaction(function () use ($orderValue, $notes) {
return DB::transaction(function () use ($orderValue, $notes) {
$remainingOrderValue = $orderValue;

/**
* @var \Illuminate\Support\Collection<TKey, \HPWebdeveloper\LaravelPayPocket\Models\Wallet>
*/
$walletsInOrder = $this->wallets()->whereIn('type', $this->walletsInOrder())->get();

$logs = (new WalletsLog())->newCollection();

foreach ($walletsInOrder as $wallet) {
if (! $wallet || ! $wallet->hasBalance()) {
continue;
}

$amountToDeduct = min($wallet->balance, $remainingOrderValue);
$wallet->decrementAndCreateLog($amountToDeduct, $notes);
$logs->push($wallet->decrementAndCreateLog($amountToDeduct, $notes));
$remainingOrderValue -= $amountToDeduct;

if ($remainingOrderValue <= 0) {
Expand All @@ -43,6 +49,8 @@ public function pay(int|float $orderValue, ?string $notes = null): void
if ($remainingOrderValue > 0) {
throw new InsufficientBalanceException('Insufficient total wallet balance to cover the order.');
}

return $logs;
});
}
}
12 changes: 12 additions & 0 deletions tests/OperationsWithFacadeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -129,3 +129,15 @@

expect(WalletsLog::whereNotNull('reference')->exists())->toBe(true);
});

test('Payment returns log', function () {
$user = User::factory()->create();

$type = 'wallet_2';

LaravelPayPocket::deposit($user, $type, 234.56);

$log = LaravelPayPocket::pay($user, 100.16);

expect($log->sum('value'))->toBe(100.16);
});
12 changes: 12 additions & 0 deletions tests/OperationsWithoutFacadeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,15 @@

expect(WalletsLog::whereNotNull('reference')->exists())->toBe(true);
});

test('Payment returns log', function () {
$user = User::factory()->create();

$type = 'wallet_2';

$user->deposit($type, 234.56);

$log = $user->pay(100.16);

expect($log->sum('value'))->toBe(100.16);
});