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

Merge pull request #980 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2019-06-07 11:14:43 +05:30 committed by GitHub
parent 9bb3c2def9 dc96dfb7b2
commit 87542306a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/Webkul/Checkout/src/Database/Migrations/2019_06_06_195905_update_custom_price_to_nullable_in_cart_items.php Normal file
View File

@ -0,0 +1,34 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateCustomPriceToNullableInCartItems extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('cart_items', function (Blueprint $table) {
$table->dropColumn('custom_price');
});
Schema::table('cart_items', function (Blueprint $table) {
$table->decimal('custom_price', 12,4)->nullable();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
//
}
}

4
packages/Webkul/Shop/src/Resources/views/products/index.blade.php
View File

@ -63,13 +63,13 @@
</div>
@endif
{!! view_render_event('bagisto.shop.products.index.pagination.before') !!}
{!! view_render_event('bagisto.shop.products.index.pagination.before', ['category' => $category]) !!}
<div class="bottom-toolbar">
{{ $products->appends(request()->input())->links() }}
</div>
{!! view_render_event('bagisto.shop.products.index.pagination.after') !!}
{!! view_render_event('bagisto.shop.products.index.pagination.after', ['category' => $category]) !!}
@else