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

Merge pull request #6176 from jitendra-webkul/master 

Issue #6174 fixed
This commit is contained in:
Jitendra Singh 2022-03-30 11:33:53 +05:30 committed by GitHub
parent f43a2b1538 be8012781b
commit c09ceeb634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Webkul/Product/src/Type/Bundle.php
View File

@ -42,7 +42,7 @@ class Bundle extends AbstractType
*
* @var array
*/
protected $skipAttributes = ['price', 'cost', 'special_price', 'special_price_from', 'special_price_to', 'length', 'width', 'height', 'weight'];
protected $skipAttributes = ['price', 'cost', 'special_price', 'special_price_from', 'special_price_to', 'length', 'width', 'height', 'weight', 'depth'];
/**
* These blade files will be included in product edit page.

2
packages/Webkul/Product/src/Type/Downloadable.php
View File

@ -34,7 +34,7 @@ class Downloadable extends AbstractType
*
* @var array
*/
protected $skipAttributes = ['length', 'width', 'height', 'weight', 'guest_checkout'];
protected $skipAttributes = ['length', 'width', 'height', 'weight', 'depth', 'guest_checkout'];
/**
* These blade files will be included in product edit page.

2
packages/Webkul/Product/src/Type/Grouped.php
View File

@ -25,7 +25,7 @@ class Grouped extends AbstractType
*
* @var array
*/
protected $skipAttributes = ['price', 'cost', 'special_price', 'special_price_from', 'special_price_to', 'length', 'width', 'height', 'weight'];
protected $skipAttributes = ['price', 'cost', 'special_price', 'special_price_from', 'special_price_to', 'length', 'width', 'height', 'weight', 'depth'];
/**
* These blade files will be included in product edit page.

2
packages/Webkul/Product/src/Type/Virtual.php
View File

@ -9,7 +9,7 @@ class Virtual extends AbstractType
*
* @var array
*/
protected $skipAttributes = ['length', 'width', 'height', 'weight'];
protected $skipAttributes = ['length', 'width', 'height', 'weight', 'depth'];
/**
* These blade files will be included in product edit page.

2
packages/Webkul/Ui/publishable/assets/css/ui.css vendored
View File

File diff suppressed because one or more lines are too long

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

@ -1,4 +1,4 @@
{
"/js/ui.js": "/js/ui.js?id=a45138406e848b98ad5d",
"/css/ui.css": "/css/ui.css?id=ca90582f920febe7c3ae"
"/css/ui.css": "/css/ui.css?id=0c1d648e1ddc0ee2eeb9"
}

4
packages/Webkul/Ui/src/Resources/assets/sass/app.scss vendored
View File

@ -1206,7 +1206,7 @@ modal {
.modal-overlay {
display: none;
overflow-y: auto;
z-index: 10;
z-index: 1001;
top: 0px;
right: 0px;
bottom: 0px;
@ -1228,7 +1228,7 @@ modal {
left: 50%;
margin-left: -300px;
position: fixed;
z-index: 11;
z-index: 1002;
@include box-shadow(
0px 15px 25px 0px rgba(0, 0, 0, 0.03),
0px 20px 45px 5px rgba(0, 0, 0, 0.2)