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

Issue #1779 fixed

This commit is contained in:
Jitendra Singh 2020-01-14 13:23:49 +05:30
parent c435b6c121
commit 05a619d39b
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/Webkul/Admin/package.json
View File

@ -15,7 +15,10 @@
"jquery": "^3.4.1",
"laravel-mix": "^5.0.0",
"laravel-mix-merge-manifest": "^0.1.2",
"vue": "^2.6.10"
"sass": "^1.24.4",
"sass-loader": "^8.0.2",
"vue": "^2.6.10",
"vue-template-compiler": "^2.6.11"
},
"dependencies": {
"vee-validate": "^2.2.15"

4
packages/Webkul/Admin/src/Resources/assets/js/app.js vendored
View File

@ -6,7 +6,9 @@ import './bootstrap';
window.Vue = Vue;
window.VeeValidate = VeeValidate;
Vue.use(VeeValidate);
Vue.use(VeeValidate, {
events: 'input|change|blur',
});
Vue.prototype.$http = axios
window.eventBus = new Vue();

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

@ -483,7 +483,7 @@ class Bundle extends AbstractType
if ($this->product->id != $options2['product_id'])
return false;
return $options1['bundle_options'] == $options2['bundle_options'];
return $options1['bundle_options'] == $options2['bundle_options'] && $options1['bundle_option_qty'] == $options2['bundle_option_qty'];
}
/**

3
packages/Webkul/Shop/src/Resources/assets/js/app.js vendored
View File

@ -18,7 +18,8 @@ require("ez-plus/src/jquery.ez-plus.js");
Vue.use(VeeValidate, {
dictionary: {
ar: { messages: localeMessages.ar }
}
},
events: 'input|change|blur',
});
Vue.prototype.$http = axios