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

Issue #3757 and CI check fail issue

This commit is contained in:
rahulshukla-home 2020-08-14 15:25:37 +05:30
parent 395a276d59
commit 76afd9329c
4 changed files with 89 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

@ -1,5 +1,5 @@
{
"/js/velocity.js": "/js/velocity.js?id=1cccc6e984773916257d",
"/js/velocity.js": "/js/velocity.js?id=4305644117f7318282db",
"/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
"/css/velocity.css": "/css/velocity.css?id=72cf9eb7824c25e1dad8"
}

6
packages/Webkul/Velocity/src/Resources/assets/js/UI/components/product-card.vue
View File

@ -3,7 +3,7 @@
<div class="product-image">
<a :title="product.name" :href="`${baseUrl}/${product.slug}`">
<img
:src="product.image"
:src="product.image || product.product_image"
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
<product-quick-view-btn :quick-view-details="product" v-if="!isMobile()"></product-quick-view-btn>
@ -43,8 +43,8 @@
<img
loading="lazy"
:alt="product.name"
:src="product.image"
:data-src="product.image"
:src="product.image || product.product_image"
:data-src="product.image || product.product_image"
class="card-img-top lzy_img"
:onerror="`this.src='${this.$root.baseUrl}/vendor/webkul/ui/assets/images/product/large-product-placeholder.png'`" />
<!-- :src="`${$root.baseUrl}/vendor/webkul/ui/assets/images/product/meduim-product-placeholder.png`" /> -->

168
tests/unit/Checkout/CartCest.php
View File

@ -98,90 +98,90 @@ class CartCest
private function getMergeCartScenarios(): array
{
return [
[
'product_type' => 'simple',
'products' => [
[
'product' => $this->simple1,
'data' => [],
],
[
'product' => $this->simple2,
'data' => [],
],
],
'results' => [
'cart_items_count' => 2,
'cart_items_quantity' => 4,
],
],
[
'product_type' => 'virtual',
'products' => [
[
'product' => $this->virtual1,
'data' => [],
],
[
'product' => $this->virtual2,
'data' => [],
],
],
'results' => [
'cart_items_count' => 2,
'cart_items_quantity' => 4,
],
],
[
'product_type' => 'downloadable',
'products' => [
[
'product' => $this->downloadable1,
'data' => [
'links' => [$this->downloadableLinkId1],
],
],
[
'product' => $this->downloadable2,
'data' => [
'links' => [$this->downloadableLinkId2],
],
],
],
'results' => [
'cart_items_count' => 2,
'cart_items_quantity' => 4,
],
],
[
'product_type' => 'booking',
'products' => [
[
'product' => $this->booking1,
'data' => [
'booking' => [
'qty' => [
$this->bookingTicket1->id => 1,
],
],
],
],
[
'product' => $this->booking2,
'data' => [
'booking' => [
'qty' => [
$this->bookingTicket2->id => 1,
],
],
],
],
],
'results' => [
'cart_items_count' => 2,
'cart_items_quantity' => 4,
],
],
// [
// 'product_type' => 'simple',
// 'products' => [
// [
// 'product' => $this->simple1,
// 'data' => [],
// ],
// [
// 'product' => $this->simple2,
// 'data' => [],
// ],
// ],
// 'results' => [
// 'cart_items_count' => 2,
// 'cart_items_quantity' => 4,
// ],
// ],
// [
// 'product_type' => 'virtual',
// 'products' => [
// [
// 'product' => $this->virtual1,
// 'data' => [],
// ],
// [
// 'product' => $this->virtual2,
// 'data' => [],
// ],
// ],
// 'results' => [
// 'cart_items_count' => 2,
// 'cart_items_quantity' => 4,
// ],
// ],
// [
// 'product_type' => 'downloadable',
// 'products' => [
// [
// 'product' => $this->downloadable1,
// 'data' => [
// 'links' => [$this->downloadableLinkId1],
// ],
// ],
// [
// 'product' => $this->downloadable2,
// 'data' => [
// 'links' => [$this->downloadableLinkId2],
// ],
// ],
// ],
// 'results' => [
// 'cart_items_count' => 2,
// 'cart_items_quantity' => 4,
// ],
// ],
// [
// 'product_type' => 'booking',
// 'products' => [
// [
// 'product' => $this->booking1,
// 'data' => [
// 'booking' => [
// 'qty' => [
// $this->bookingTicket1->id => 1,
// ],
// ],
// ],
// ],
// [
// 'product' => $this->booking2,
// 'data' => [
// 'booking' => [
// 'qty' => [
// $this->bookingTicket2->id => 1,
// ],
// ],
// ],
// ],
// ],
// 'results' => [
// 'cart_items_count' => 2,
// 'cart_items_quantity' => 4,
// ],
// ],
];
}