merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2515 from rahulshukla-webkul/development 

Issue #2435 and change log updated
This commit is contained in:
Jitendra Singh 2020-02-20 12:35:16 +05:30 committed by GitHub
parent bd73f2b8e9 aeb4d1a6ee
commit ad482fd8a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 399 additions and 448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG for v1.x.x.md
View File

@ -2,7 +2,7 @@
#### This changelog consists the bug & security fixes and new features being included in the releases listed below.
## **v1.0.0-BETA2(13th of February 2020)** - *Release*
## **v1.0.0-BETA2(20th of February 2020)** - *Release*
* #2377 [fixed] - Getting exception on creating a new category under any other category.
@ -48,6 +48,8 @@
* #2439 [fixed] - can't process for further checkout steps until all the address line filled.
* #2435 [fixed] - error composer install --no-dev.
* #2440 [fixed] - Advertisement Three Images is not working.
* #2449 [fixed] - error clicking empty cart.
@ -58,6 +60,8 @@
* #2463 [fixed] - Tax rate is not update on same product.
* #2468 [fixed] - Guest user is able to checkout if guest checkout is disabled.
* #2469 [fixed] - Displaying wrong amount for bundle product in cart.
* #2479 [fixed] - showing total review in recent view product list.

6
composer.json
View File

@ -33,17 +33,17 @@
"maatwebsite/excel": "3.1.18",
"nwidart/laravel-modules": "^3.2",
"prettus/l5-repository": "^2.6",
"tymon/jwt-auth": "^1.0.0"
"tymon/jwt-auth": "^1.0.0",
"barryvdh/laravel-debugbar": "^3.1",
"fzaninotto/faker": "^1.4"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.1",
"codeception/codeception": "^4.0",
"codeception/module-asserts": "^1.1",
"codeception/module-filesystem": "^1.0",
"codeception/module-laravel5": "^1.0",
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
"laravel/dusk": "^5.7.0",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^2.0",

831
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
packages/Webkul/Shop/src/Http/Controllers/OnepageController.php
View File

@ -103,6 +103,10 @@ class OnepageController extends Controller
{
$data = request()->all();
if (! auth()->guard('customer')->check() && ! $cart->hasGuestCheckoutItems()) {
return response()->json(['redirect_url' => route('customer.session.index')], 403);
}
$data['billing']['address1'] = implode(PHP_EOL, array_filter($data['billing']['address1']));
$data['shipping']['address1'] = implode(PHP_EOL, array_filter($data['shipping']['address1']));