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

Merge pull request #11 from bagisto/master

This commit is contained in:
Glenn Hermans 2020-03-21 00:39:43 +01:00 committed by GitHub
parent 5fb643fad9 6de80fff2f
commit bbef74b52c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example
View File

@ -4,10 +4,10 @@ APP_VERSION=1.1.0
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_TIMEZONE=Asia/Kolkata
APP_TIMEZONE=
APP_LOCALE=en
LOG_CHANNEL=stack
APP_CURRENCY=USD
APP_CURRENCY=
DB_CONNECTION=mysql
DB_HOST=127.0.0.1

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

@ -164,6 +164,8 @@
* #2693 [fixed] - Booking product page - add to cart button js error
* #2707 [fixed] Getting exception when generate invoice in appointment booking
## **v1.0.0 (24th of February 2020)** - *Release*

4
packages/Webkul/BookingProduct/src/Type/Booking.php
View File

@ -128,6 +128,10 @@ class Booking extends Virtual
{
$bookingProduct = $this->getBookingProduct($this->product->id);
if (! $bookingProduct) {
return false;
}
if (in_array($bookingProduct->type, ['default', 'rental', 'table'])) {
return true;
}

2
packages/Webkul/Velocity/publishable/assets/css/velocity.css vendored
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Velocity/publishable/assets/js/velocity.js vendored
View File

File diff suppressed because one or more lines are too long

4
packages/Webkul/Velocity/publishable/assets/mix-manifest.json
View File

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=ead79036faabfd4de68d",
"/js/velocity.js": "/js/velocity.js?id=973edd4336993fd9b95a",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=6f5bad6b6ae5777a1a98"
"/css/velocity.css": "/css/velocity.css?id=3e8619277d84a8bde711"
}

5
packages/Webkul/Velocity/src/Resources/assets/sass/components/app.scss vendored
View File

@ -678,6 +678,8 @@
.product-quantity {
.quantity {
float: left;
label {
display: none !important;
}
@ -2277,8 +2279,9 @@
.col,
.col-2 {
padding-left: 0;
max-width: 20%;
padding-left: 0;
word-break: break-word;
}
.image-wrapper {

5
packages/Webkul/Velocity/src/Resources/assets/sass/components/media.scss vendored
View File

@ -864,6 +864,11 @@
.actions {
margin-top: 7px !important;
}
.continue-shopping,
.empty-cart-message {
padding: 0;
}
}
.checkout-process {

8
packages/Webkul/Velocity/src/Resources/views/shop/checkout/cart/index.blade.php
View File

@ -204,7 +204,7 @@
</div>
<div class="row col-12 remove-padding-margin actions">
<div class="product-quantity col-4 no-padding">
<div class="product-quantity col-lg-4 col-6 no-padding">
<quantity-changer
:control-name="'qty[{{$item->id}}]'"
quantity="{{ $item->quantity }}">
@ -248,18 +248,18 @@
{!! view_render_event('bagisto.shop.checkout.cart.summary.after', ['cart' => $cart]) !!}
@if ($cart)
<div class="col-lg-4 col-md-12 offset-2 row order-summary-container">
<div class="col-lg-4 col-md-12 offset-lg-2 row order-summary-container">
@include('shop::checkout.total.summary', ['cart' => $cart])
<coupon-component></coupon-component>
</div>
@else
<div class="fs16 col-12">
<div class="fs16 col-12 empty-cart-message">
{{ __('shop::app.checkout.cart.empty') }}
</div>
<a
class="fs16 mt15 col-12 remove-decoration"
class="fs16 mt15 col-12 remove-decoration continue-shopping"
href="{{ route('shop.home.index') }}">
<button type="button" class="theme-btn remove-decoration">

1
packages/Webkul/Velocity/src/Resources/views/shop/guest/wishlist/index.blade.php
View File

@ -102,6 +102,7 @@
console.log(this.__('error.something_went_wrong'));
});
} else {
this.products = [];
this.isProductListLoaded = true;
}
},