Skip to content

Commit 72fe968

Browse files
rez1dent3rez1dent3
authored
Merge pull request #20 from bavix/dev
#19 add CanPay/CanPayFloat
2 parents 6baa318 + 122e45e commit 72fe968

File tree

8 files changed

+256
-219
lines changed

8 files changed

+256
-219
lines changed

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
laravel-wallet - Easy work with virtual wallet.
1515

1616
[[Documentation](https://laravel-wallet.bavix.ru/)]
17-
[[Get Started](https://laravel-wallet.bavix.ru/2.0/basic-usage)]
17+
[[Get Started](https://laravel-wallet.bavix.ru/2.2/basic-usage)]
1818

19-
[[Документация](https://laravel-wallet.bavix.ru/2.0-ru)]
20-
[[Как начать](https://laravel-wallet.bavix.ru/2.0-ru/basic-usage)]
19+
[[Документация](https://laravel-wallet.bavix.ru/2.2-ru)]
20+
[[Как начать](https://laravel-wallet.bavix.ru/2.2-ru/basic-usage)]
2121

2222
* **Vendor**: bavix
2323
* **Package**: laravel-wallet
@@ -26,9 +26,9 @@ laravel-wallet - Easy work with virtual wallet.
2626
* **Laravel Version**: `5.5`, `5.6`, `5.7`
2727
* **[Composer](https://getcomposer.org/):** `composer require bavix/laravel-wallet`
2828

29-
### Switching from 1.x.x → 2.x.x
29+
### Upgrade Guide
3030

31-
To perform the migration, you will be [helped by the instruction](https://laravel-wallet.bavix.ru/2.0/upgrade-guide).
31+
To perform the migration, you will be [helped by the instruction](https://laravel-wallet.bavix.ru/2.2/upgrade-guide).
3232

3333
### Run Migrations
3434
Publish the migrations with this artisan command:

‎changelog.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.2.0] - 2018-12-25
10+
### Added
11+
- Add trait `CanPay`.
12+
- Add trait `CanPayFloat`.
13+
14+
### Deprecated
15+
- Trait `CanBePaid`.
16+
- Trait `CanBePaidFloat`.
17+
918
## [2.1.0] - 2018-11-22
1019
### Added
1120
- File changelog.

‎src/Models/Wallet.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Bavix\Wallet\Interfaces\Customer;
66
use Bavix\Wallet\Interfaces\WalletFloat;
7-
use Bavix\Wallet\Traits\CanBePaidFloat;
7+
use Bavix\Wallet\Traits\CanPayFloat;
88
use Bavix\Wallet\Traits\HasGift;
99
use Bavix\Wallet\WalletProxy;
1010
use Illuminate\Database\Eloquent\Model;
@@ -21,7 +21,7 @@
2121
class Wallet extends Model implements Customer, WalletFloat
2222
{
2323

24-
use CanBePaidFloat;
24+
use CanPayFloat;
2525
use HasGift;
2626

2727
/**

‎src/Traits/CanBePaid.php‎

Lines changed: 7 additions & 191 deletions
Original file line numberDiff line numberDiff line change
@@ -2,197 +2,13 @@
22

33
namespace Bavix\Wallet\Traits;
44

5-
use Bavix\Wallet\Exceptions\ProductEnded;
6-
use Bavix\Wallet\Interfaces\Product;
7-
use Bavix\Wallet\Models\Transfer;
8-
use Illuminate\Database\Eloquent\Model;
9-
use Illuminate\Database\Eloquent\ModelNotFoundException;
10-
use Illuminate\Support\Facades\DB;
11-
5+
/**
6+
* Trait CanBePaid
7+
* @package Bavix\Wallet\Traits
8+
* @deprecated use trait CanPay
9+
* @see https://github.com/bavix/laravel-wallet/issues/19
10+
*/
1211
trait CanBePaid
1312
{
14-
15-
use HasWallet;
16-
17-
/**
18-
* @param Product $product
19-
* @return Transfer
20-
*/
21-
public function payFree(Product $product): Transfer
22-
{
23-
if (!$product->canBuy($this)) {
24-
throw new ProductEnded(trans('wallet::errors.product_stock'));
25-
}
26-
27-
return $this->transfer($product, 0, $product->getMetaProduct());
28-
}
29-
30-
/**
31-
* @param Product $product
32-
* @param bool $force
33-
* @return Transfer
34-
* @throws
35-
*/
36-
public function pay(Product $product, bool $force = false): Transfer
37-
{
38-
if (!$product->canBuy($this, $force)) {
39-
throw new ProductEnded(trans('wallet::errors.product_stock'));
40-
}
41-
42-
if ($force) {
43-
return $this->forceTransfer($product, $product->getAmountProduct(), $product->getMetaProduct());
44-
}
45-
46-
return $this->transfer($product, $product->getAmountProduct(), $product->getMetaProduct());
47-
}
48-
49-
/**
50-
* @param Product $product
51-
* @param bool $force
52-
* @return Transfer|null
53-
*/
54-
public function safePay(Product $product, bool $force = false): ?Transfer
55-
{
56-
try {
57-
return $this->pay($product, $force);
58-
} catch (\Throwable $throwable) {
59-
return null;
60-
}
61-
}
62-
63-
/**
64-
* @param Product $product
65-
* @return Transfer
66-
* @throws
67-
*/
68-
public function forcePay(Product $product): Transfer
69-
{
70-
return $this->pay($product, true);
71-
}
72-
73-
/**
74-
* @param Product $product
75-
* @param bool $gifts
76-
* @return null|Transfer
77-
*/
78-
public function paid(Product $product, bool $gifts = false): ?Transfer
79-
{
80-
$status = [Transfer::STATUS_PAID];
81-
if ($gifts) {
82-
$status[] = Transfer::STATUS_GIFT;
83-
}
84-
85-
/**
86-
* @var Model $product
87-
* @var Transfer $query
88-
*/
89-
$query = $this->transfers();
90-
return $query
91-
->where('to_type', $product->getMorphClass())
92-
->where('to_id', $product->getKey())
93-
->whereIn('status', $status)
94-
->orderBy('id', 'desc')
95-
->first();
96-
}
97-
98-
/**
99-
* @param Product $product
100-
* @param bool $force
101-
* @param bool $gifts
102-
* @return bool
103-
* @throws
104-
*/
105-
public function refund(Product $product, bool $force = false, bool $gifts = false): bool
106-
{
107-
$transfer = $this->paid($product, $gifts);
108-
109-
if (!$transfer) {
110-
throw (new ModelNotFoundException())
111-
->setModel($this->transfers()->getMorphClass());
112-
}
113-
114-
return DB::transaction(function () use ($product, $transfer, $force) {
115-
$transfer->load('withdraw.payable');
116-
117-
if ($force) {
118-
$product->forceTransfer(
119-
$transfer->withdraw->payable,
120-
$transfer->deposit->amount,
121-
$product->getMetaProduct()
122-
);
123-
} else {
124-
$product->transfer(
125-
$transfer->withdraw->payable,
126-
$transfer->deposit->amount,
127-
$product->getMetaProduct()
128-
);
129-
}
130-
131-
return $transfer->update([
132-
'status' => Transfer::STATUS_REFUND,
133-
'status_last' => $transfer->status,
134-
]);
135-
});
136-
}
137-
138-
/**
139-
* @param Product $product
140-
* @param bool $force
141-
* @param bool $gifts
142-
* @return bool
143-
*/
144-
public function safeRefund(Product $product, bool $force = false, bool $gifts = false): bool
145-
{
146-
try {
147-
return $this->refund($product, $force, $gifts);
148-
} catch (\Throwable $throwable) {
149-
return false;
150-
}
151-
}
152-
153-
/**
154-
* @param Product $product
155-
* @param bool $gifts
156-
* @return bool
157-
* @throws
158-
*/
159-
public function forceRefund(Product $product, bool $gifts = false): bool
160-
{
161-
return $this->refund($product, true, $gifts);
162-
}
163-
164-
/**
165-
* @param Product $product
166-
* @param bool $force
167-
* @return bool
168-
*/
169-
public function refundGift(Product $product, bool $force = false): bool
170-
{
171-
return $this->refund($product, $force, true);
172-
}
173-
174-
/**
175-
* @param Product $product
176-
* @param bool $force
177-
* @return bool
178-
*/
179-
public function safeRefundGift(Product $product, bool $force = false): bool
180-
{
181-
try {
182-
return $this->refundGift($product, $force);
183-
} catch (\Throwable $throwable) {
184-
return false;
185-
}
186-
}
187-
188-
/**
189-
* @param Product $product
190-
* @return bool
191-
* @throws
192-
*/
193-
public function forceRefundGift(Product $product): bool
194-
{
195-
return $this->refundGift($product, true);
196-
}
197-
13+
use CanPay;
19814
}

‎src/Traits/CanBePaidFloat.php‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,13 @@
22

33
namespace Bavix\Wallet\Traits;
44

5+
/**
6+
* Trait CanBePaidFloat
7+
* @package Bavix\Wallet\Traits
8+
* @deprecated use trait CanPayFloat
9+
* @see https://github.com/bavix/laravel-wallet/issues/19
10+
*/
511
trait CanBePaidFloat
612
{
7-
8-
use HasWalletFloat, CanBePaid {
9-
CanBePaid::checkAmount insteadof HasWalletFloat;
10-
CanBePaid::deposit insteadof HasWalletFloat;
11-
CanBePaid::withdraw insteadof HasWalletFloat;
12-
CanBePaid::canWithdraw insteadof HasWalletFloat;
13-
CanBePaid::forceWithdraw insteadof HasWalletFloat;
14-
CanBePaid::transfer insteadof HasWalletFloat;
15-
CanBePaid::safeTransfer insteadof HasWalletFloat;
16-
CanBePaid::forceTransfer insteadof HasWalletFloat;
17-
CanBePaid::assemble insteadof HasWalletFloat;
18-
CanBePaid::change insteadof HasWalletFloat;
19-
CanBePaid::transactions insteadof HasWalletFloat;
20-
CanBePaid::transfers insteadof HasWalletFloat;
21-
CanBePaid::wallet insteadof HasWalletFloat;
22-
CanBePaid::getBalanceAttribute insteadof HasWalletFloat;
23-
CanBePaid::addBalance insteadof HasWalletFloat;
24-
}
25-
13+
use CanPayFloat;
2614
}

0 commit comments

Comments
 (0)