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

Merge pull request #2188 from rahulshukla-webkul/development 

Development
This commit is contained in:
Jitendra Singh 2020-01-29 12:45:15 +05:30 committed by GitHub
parent 9ccc8b26c5 434b681962
commit c0209743c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 79 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
CHANGELOG for v1.x.x.md Normal file
View File

@ -0,0 +1,75 @@
# CHANGELOG for v1.x.x
#### This changelog consists the bug & security fixes and new features being included in the releases listed below.
## **v0.1.0(28th of January 2020)** - *Release*
* [feature] Updated to laravel version 6.
* [feature] Added four new product types - Group, Bundle, Downloadable and Virtaul.
* [feature] Povided default theme (Velocity).
* #1971 [fixed] - Filter is not working properly for id column in autogenerated coupon codes in cart rule.
* #1977 [fixed] - On editing the product, selected category for that product is not checked.
* #1978 [fixed] - Getting exception if changing the locale from cart page, if translation is not written for that product.
* #1979 [fixed] - Wrong calculation at customer as well as at admin end in due amount and grandtotal.
* #1983 [fixed] - Getting exception on deleting admin logo.
* #1986 [fixed] - Subscribe to newsletter does not work.
* #1997 [fixed] - Getting exception on adding attribute or creating product in bagisto on php version 7.4 .
* #1998 [fixed] - Showing product sale amount as zero when creating a product, and a existing catalog rule apply on it.
* #2001 [fixed] - php artisan route:list throws error.
* #2012 [fixed] - FGetting exception when clicking on view all under review section at product page.
* #2045 [fixed] - Login option is not coming while checkout with existing customer mail id.
* #2051 [fixed] - Forgot password not working due to recent changes in mail keys.
* #2054 [fixed] -Automatically 1st item of bundle is getting selected as a default after saving product.
* #2058 [fixed] - Not getting any validation message if entered admin credentials are wrong.
* #2066 [fixed] - Exception while writing product review.
* #2071 [fixed] - Customer is not getting forget password email.
* #2074 [fixed] - Getting exception while creating bundle type product.
* #2075 [fixed] - Getting exception if trying to select any parent category of root.
* #2087 [fixed] - Getting exception while adding configurable/bundle/grouped/Downloadable Type product to cart.
* #2088 [fixed] - Getting exception on customer login.
* #2089 [fixed] - Info missing on printing invoice at customer and admin end.
* #2114 [fixed] - getting exception while recovering admin password in case admin did not enter the details in env.
* #2118 [fixed] - Installation issue, getting exception on migrate command.
* #2119 [fixed] - confirm password is not matching even if admin is entering similar password in password and confirm password.
* #2120 [fixed] - Not able to add new user as while creating user password its giving error confirm password doesn't match.
* #2124 [fixed] - Able to make all product as default while creating bundle product in select type option.
* #2128 [fixed] - Click on add attribute, error is thrown.
* #2132 [fixed] - Price range slider not displaying.
* #2145 [fixed] - Emails don't work on registration.
* #2146 [fixed] - Getting exception on creating bundle product without any option.
* #2147 [fixed] - Sort order of bundle product doesn't work..
* #2168 [fixed] - locale direction drop down always select ltr.

2
packages/Webkul/Admin/src/Resources/views/customers/addresses/create.blade.php
View File

@ -68,7 +68,7 @@
<span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
</div>
@include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? '', 'stateCode' => old('state') ?? ''])
@include ('admin::customers.country-state', ['countryCode' => old('country') ?? config('app.default_country'), 'stateCode' => old('state') ?? ''])
<div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
<label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>

2
packages/Webkul/Product/src/Helpers/ConfigurableOption.php
View File

@ -191,7 +191,7 @@ class ConfigurableOption extends AbstractProduct
if (isset($options[$attribute->id][$optionId])) {
$attributeOptionsData[] = [
'id' => $optionId,
'label' => $attributeOption->label,
'label' => $attributeOption->label ? $attributeOption->label : $attributeOption->admin_name,
'swatch_value' => $attribute->swatch_type == 'image' ? $attributeOption->swatch_value_url : $attributeOption->swatch_value,
'products' => $options[$attribute->id][$optionId]
];

2
packages/Webkul/Shop/publishable/assets/css/shop.css
View File

File diff suppressed because one or more lines are too long

2
packages/Webkul/Shop/publishable/assets/mix-manifest.json
View File

@ -1,4 +1,4 @@
{
"/js/shop.js": "/js/shop.js?id=d0a3f597b439d75f4a4e",
"/css/shop.css": "/css/shop.css?id=617c680f279cb4a73734"
"/css/shop.css": "/css/shop.css?id=dbbd9009872174a61946"
}

3
packages/Webkul/Shop/src/Resources/assets/sass/app.scss
View File

@ -927,7 +927,6 @@ section.slider-block {
.dropdown-content {
padding-top: 8px;
margin-bottom: 55px;
width: 100%;
max-height: 329px;
overflow-y: auto;
@ -975,11 +974,9 @@ section.slider-block {
justify-content: space-between;
align-items: center;
padding: 8px 16px;
position: absolute;
bottom: 0;
width: 100%;
background: #fff;
border-top: 1px solid $border-color;
.btn {
margin: 0;