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

Resolved conflict

This commit is contained in:
Abhishek Kathuria 2022-09-07 12:39:10 +05:30
parent 2f8c66190a 41fb2837a4
commit ca3e992fd1
8 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Webkul/Admin/src/Resources/views/marketing/promotions/catalog-rules/create.blade.php
View File

@ -218,9 +218,9 @@
</div> </div>
<div v-else> <div v-else>
<div class="control-group" :class="[errors.has('value') ? 'has-error' : '']" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'"> <div class="control-group" :class="[errors.has('conditions[' + index + '][value]') ? 'has-error' : '']" v-if="matchedAttribute.type == 'text' || matchedAttribute.type == 'price' || matchedAttribute.type == 'decimal' || matchedAttribute.type == 'integer'">
<input v-validate="matchedAttribute.type == 'price' ? 'decimal:2' : '' || matchedAttribute.type == 'decimal' ? 'decimal:2' : '' || matchedAttribute.type == 'integer' ? 'decimal:2' : '' || matchedAttribute.type == 'text' ? 'alpha_num' : ''" class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value" name="value"/> <input v-validate="matchedAttribute.type == 'price' ? 'decimal:2' : '' || matchedAttribute.type == 'decimal' ? 'decimal:2' : '' || matchedAttribute.type == 'integer' ? 'decimal:2' : '' || matchedAttribute.type == 'text' ? 'alpha_dash' : ''" class="control" :name="['conditions[' + index + '][value]']" v-model="condition.value" data-vv-as="&quot;{{ __('admin::app.promotions.catalog-rules.conditions') }}&quot;"/>
<span class="control-error" v-if="errors.has('value')" v-text="errors.first('value')"></span> <span class="control-error" v-if="errors.has('conditions[' + index + '][value]')" v-text="errors.first('conditions[' + index + '][value]')"></span>
</div> </div>
<div class="control-group date" v-if="matchedAttribute.type == 'date'"> <div class="control-group date" v-if="matchedAttribute.type == 'date'">

4
packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
View File

@ -117,6 +117,10 @@
.text-center { .text-center {
text-align: center; text-align: center;
} }
.logo {
margin-left: 300px;
}
</style> </style>
</head> </head>

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

File diff suppressed because one or more lines are too long

6
packages/Webkul/Velocity/publishable/assets/js/components.js.LICENSE.txt
View File

@ -16,7 +16,7 @@
*/ */
/*! /*!
* Vue.js v2.7.8 * Vue.js v2.7.10
* (c) 2014-2022 Evan You * (c) 2014-2022 Evan You
* Released under the MIT License. * Released under the MIT License.
*/ */
@ -33,7 +33,7 @@
*/ */
/*! /*!
* jQuery JavaScript Library v3.6.0 * jQuery JavaScript Library v3.6.1
* https://jquery.com/ * https://jquery.com/
* *
* Includes Sizzle.js * Includes Sizzle.js
@ -43,7 +43,7 @@
* Released under the MIT license * Released under the MIT license
* https://jquery.org/license * https://jquery.org/license
* *
* Date: 2021-03-02T17:08Z * Date: 2022-08-26T17:52Z
*/ */
/*! /*!

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

@ -3,8 +3,8 @@
"/js/velocity-core.js": "/js/velocity-core.js?id=dcc312fe978be1aff63a33eaf7ad190c", "/js/velocity-core.js": "/js/velocity-core.js?id=dcc312fe978be1aff63a33eaf7ad190c",
"/js/velocity.js": "/js/velocity.js?id=5e563e0af3ea88a56b03a4a30fad0a92", "/js/velocity.js": "/js/velocity.js?id=5e563e0af3ea88a56b03a4a30fad0a92",
"/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d", "/js/manifest.js": "/js/manifest.js?id=4113cf6789cdd4f2768f508bc32cad2d",
"/js/components.js": "/js/components.js?id=f1962fbe19365543e54b0e329f86b8ff", "/js/components.js": "/js/components.js?id=f60a033c9b4233754d022b4b9f156bb9",
"/css/velocity.css": "/css/velocity.css?id=b052a38bbdda8e29ff1dee8479d69d63", "/css/velocity.css": "/css/velocity.css?id=1dc9d611540ff31dfa2cf8c86f5ad16a",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f", "/css/velocity-admin.css": "/css/velocity-admin.css?id=b67a82956e53163b5e3ff45a44f9778f",
"/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8", "/images/Camera.svg": "/images/Camera.svg?id=b2fd2f9e17e1ccee96e29f6c6cec91e8",
"/images/Icon-Arrow-Right.svg": "/images/Icon-Arrow-Right.svg?id=e30f624f1a70197dc9ad9011b240aa8e", "/images/Icon-Arrow-Right.svg": "/images/Icon-Arrow-Right.svg?id=e30f624f1a70197dc9ad9011b240aa8e",

1
packages/Webkul/Velocity/src/Models/VelocityMetadata.php
View File

@ -9,4 +9,5 @@ class VelocityMetadata extends Model implements VelocityMetadataContract
{ {
protected $table = 'velocity_meta_data'; protected $table = 'velocity_meta_data';
protected $guarded = ['id'];
} }

2
packages/Webkul/Velocity/src/Resources/assets/sass/components/shared.scss vendored
View File

@ -297,7 +297,7 @@
background-color: $white-color !important; background-color: $white-color !important;
box-shadow: 0 1px 0 0 #CFCFCF; box-shadow: 0 1px 0 0 #CFCFCF;
border: 1px solid rgba(0,0,0,0.12); border: 1px solid rgba(0,0,0,0.12);
z-index: 0; z-index: 1;
&:hover, &:hover,
&:focus { &:focus {

26
packages/Webkul/Velocity/src/Resources/views/shop/products/view.blade.php
View File

@ -289,9 +289,35 @@
setTimeout(function() { setTimeout(function() {
document.getElementById('product-form').submit(); document.getElementById('product-form').submit();
}, 0); }, 0);
} else {
this.activateAutoScroll();
} }
}); });
}, },
activateAutoScroll: function(event) {
/**
* This is normal Element
*/
const normalElement = document.querySelector(
'.control-error:first-of-type'
);
/**
* Scroll Config
*/
const scrollConfig = {
behavior: 'smooth',
block: 'end',
inline: 'nearest',
}
if (normalElement) {
normalElement.scrollIntoView(scrollConfig);
return;
}
}
} }
}); });