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

Merge branch 'master' of https://github.com/bagisto/bagisto into velocity-updated

This commit is contained in:
shubhammehrotra.symfony@webkul.com 2020-02-20 12:59:00 +05:30
parent 179cac23ce ad482fd8a0
commit 0ca4eb66f1
8 changed files with 404 additions and 467 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.
@ -72,6 +76,8 @@
* #2494 [fixed] - Product total inventory for all locale is showing wrong.
* #2500 [fixed] - Database reset fails.
## **v1.0.0-BETA1(5th of February 2020)** - *Release*
* [feature] Updated to laravel version 6.

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

10
packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024321_create_cart_rules_table.php
View File

@ -47,16 +47,6 @@ class CreateCartRulesTable extends Migration
*/
public function down()
{
Schema::table('cart_rule_customers', function (Blueprint $table) {
$table->dropForeign('cart_rule_customers_cart_rule_id_foreign');
});
Schema::table('cart_rule_coupons', function (Blueprint $table) {
$table->dropForeign('cart_rule_coupons_cart_rule_id_foreign');
});
// Schema::dropIfExists('cart_rule_coupons');
Schema::dropIfExists('cart_rules');
}
}

2
packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024325_create_cart_rule_customers_table.php
View File

@ -32,6 +32,6 @@ class CreateCartruleCustomersTable extends Migration
*/
public function down()
{
Schema::dropIfExists('cartrule_customers');
Schema::dropIfExists('cart_rule_customers');
}
}

4
packages/Webkul/CartRule/src/Database/Migrations/2019_05_13_024326_create_cart_rule_coupons_table.php
View File

@ -22,7 +22,7 @@ class CreateCartruleCouponsTable extends Migration
$table->integer('type')->unsigned()->default(0);
$table->boolean('is_primary')->default(0);
$table->date('expired_at')->nullable();
$table->integer('cart_rule_id')->unsigned();
$table->foreign('cart_rule_id')->references('id')->on('cart_rules')->onDelete('cascade');
$table->timestamps();
@ -36,6 +36,6 @@ class CreateCartruleCouponsTable extends Migration
*/
public function down()
{
Schema::dropIfExists('cartrule_coupons');
Schema::dropIfExists('cart_rule_coupons');
}
}

6
packages/Webkul/Customer/src/Database/Migrations/2018_07_24_082930_create_customers_table.php
View File

@ -39,12 +39,6 @@ class CreateCustomersTable extends Migration
*/
public function down()
{
Schema::table('cart_rule_customers', function (Blueprint $table) {
$table->dropForeign('cart_rule_customers_customer_id_foreign');
});
// Schema::dropIfExists('cart_rule_customers');
Schema::dropIfExists('customers');
}
}

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']));