+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Click
here
+
-
-
-
-
+
+
+
+
Your Cart ( {{ cartProductsItem.length }} )
@@ -50,7 +76,7 @@
-
+
-
-
- Discount ({{ cartProductTotalAmt.couponCode }})
-
-
- -${{
- priceFormatter(
- cartProductTotalAmt.baseDiscountAmount
- .toString()
- .substring(1)
- )
- }}
-
- -$0
-
+
Shipping
${{ priceFormatter(cartProductTotalAmt.baseShippingAmount) }}
-
- Estimated Tax
-
- ${{ priceFormatter(cartProductTotalAmt.taxAmount) }}
-
-
-
-
- Estimated Total
-
- ${{ priceFormatter(cartProductTotalAmt.baseGrandTotal) }}
-
-
-
-
-
-
-
-
-
-
-
- Apply Discount Code
-
-
-
-
-
-
-
- APPLY
-
-
- CANCEL
-
-
-
-
-
-
@@ -249,12 +182,15 @@
/* eslint-disable no-alert, no-console , no-debugger */
const baseUrl = process.env.VUE_APP_BASE_URL;
import CartProductList from "@/components/retailer/cart-product/CartProductList";
+import RetailerSearchProducts from "@/components/retailer/retailer-search/RetailerSearchProducts";
+
import SnackbarComponent from "@/components/common/SnackbarComponent";
import { getCookieByName } from "@/services/auth";
import { priceFormatter } from "@/services/util.service";
export default {
name: "CartProducts",
data: () => ({
+ searchData: null,
priceFormatter: priceFormatter,
stockFlag: true,
cartProductPage: true,
@@ -265,7 +201,6 @@ export default {
dialog: false,
chekoutFlag: true,
discountTextCode: "",
- validDiscountCode: true,
lazy: false,
textRules: [(v) => !!v || "This field is required"],
snackbar: {
@@ -278,6 +213,7 @@ export default {
components: {
CartProductList,
SnackbarComponent,
+ RetailerSearchProducts,
},
computed: {
canonical: function () {
@@ -313,13 +249,7 @@ export default {
return this.$store.state.cartProduct.cartTotalAmtProgress;
}
},
- inProgressDiscountCode() {
- if (this.userAuth) {
- return this.$store.state.userCartProduct.fetchInProgress;
- } else {
- return this.$store.state.cartProduct.fetchInProgress;
- }
- },
+
cartProductsProgress: function () {
if (this.userAuth) {
return this.$store.state.userCartProduct.cartProductsProgress;
@@ -327,13 +257,7 @@ export default {
return this.$store.state.cartProduct.cartProductsProgress;
}
},
- discountCode() {
- if (this.userAuth) {
- return this.$store.state.userCartProduct.discountCode;
- } else {
- return this.$store.state.cartProduct.discountCode;
- }
- },
+
},
metaInfo() {
return {
@@ -356,14 +280,7 @@ export default {
};
},
watch: {
- validDiscountCode() {
- if (!this.validDiscountCode) {
- this.$refs.discountCodeForm.reset();
- }
- },
- discountCode() {
- this.discountTextCode = this.discountCode;
- },
+
cartProductsItem() {
this.stockFlagHideShow();
this.calledCriteoViewBasket();
@@ -380,7 +297,6 @@ export default {
}
},
removeMinus(val) {
- debugger;
if (val) return val.toString().substring(1);
},
showSnackBarMessage(obj) {
@@ -413,11 +329,7 @@ export default {
}
}
},
- resetValidation() {
- if (!this.validDiscountCode) {
- this.$refs.discountCodeForm.reset();
- }
- },
+ resetValidation() {},
goToShopping() {
this.$router.push({
name: "HomePage",
@@ -430,134 +342,28 @@ export default {
params: {},
});
},
- setDiscountTextCode() {
- if (this.userAuth) {
- this.discountTextCode = this.$store.state.userCartProduct.discountCode;
- } else {
- this.discountTextCode = this.$store.state.cartProduct.discountCode;
- }
- },
- applyDiscountCode() {
- if (this.$refs.discountCodeForm.validate()) {
- if (this.userAuth) {
- this.$store
- .dispatch(
- "userCartProduct/applyDiscountCode",
- this.discountTextCode
- )
- .then(() => {
- this.snackbar = {
- message: "Your coupon was successfully applied",
- color: "success",
- show: true,
- timeout: 2000,
- };
- this.$store.dispatch("userCartProduct/productTotalAmt");
- })
- .catch((error) => {
- this.snackbar = {
- message: error.message,
- color: "error",
- show: true,
- timeout: 2000,
- };
- });
- } else {
- this.$store
- .dispatch("cartProduct/applyDiscountCode", {
- discountTextCode: this.discountTextCode,
- guestQuoteId: this.guestQuoteId,
- })
- .then(() => {
- this.snackbar = {
- message: "Your coupon was successfully applied",
- color: "success",
- show: true,
- timeout: 2000,
- };
- this.$store.dispatch(
- "cartProduct/productTotalAmt",
- this.guestQuoteId
- );
- })
- .catch((error) => {
- this.snackbar = {
- message: error.message,
- color: "error",
- show: true,
- timeout: 2000,
- };
- });
- }
- }
- },
- removeDiscountCode() {
- if (this.$refs.discountCodeForm.validate()) {
- if (this.userAuth) {
- this.$store
- .dispatch(
- "userCartProduct/removeDiscountCode",
- this.discountTextCode
- )
- .then(() => {
- this.snackbar = {
- message: "Your coupon was successfully removed",
- color: "success",
- show: true,
- timeout: 2000,
- };
- this.$store.dispatch("userCartProduct/productTotalAmt");
- })
- .catch((error) => {
- this.snackbar = {
- message: error,
- color: "error",
- show: true,
- timeout: 2000,
- };
- });
- } else {
- this.$store
- .dispatch("cartProduct/removeDiscountCode", {
- discountTextCode: this.discountTextCode,
- guestQuoteId: this.guestQuoteId,
- })
- .then(() => {
- this.snackbar = {
- message: "Your coupon was successfully removed",
- color: "success",
- show: true,
- timeout: 2000,
- };
- this.$store.dispatch(
- "cartProduct/productTotalAmt",
- this.guestQuoteId
- );
- })
- .catch((error) => {
- this.snackbar = {
- message: error,
- color: "error",
- show: true,
- timeout: 2000,
- };
- });
- }
+ searchProducts() {
+ if (this.searchData) {
+ this.$store.dispatch("catalogBrowser/search", {
+ fullCatalog: window.craneCatalog,
+ keywords: this.searchData,
+ filters: [],
+ pageNumber: 1,
+ pageSize: "ALL",
+ sortBy: "relevance",
+ });
}
},
},
created() {
+ this.$store.dispatch("catalogBrowser/index", {
+ productsCatalog: window.craneCatalog.products,
+ });
if (this.userAuth) {
this.$store.dispatch("userCartProduct/fetchCartCoupon");
- this.setDiscountTextCode();
+
this.calledCriteoViewBasket();
- } else {
- if (this.guestQuoteId) {
- this.$store.dispatch("cartProduct/fetchCartCoupon", this.guestQuoteId);
- this.setDiscountTextCode();
- this.calledCriteoViewBasket();
- }
}
this.stockFlagHideShow();
},
diff --git a/src/services/search.service.js b/src/services/search.service.js
index 978d64e..ed35d2d 100644
--- a/src/services/search.service.js
+++ b/src/services/search.service.js
@@ -67,8 +67,9 @@ export const doFilterItems = ({ items, enabledFilters, availableFilters, attribu
for (var i = 0; i < items.length; i++) {
var product = items[i]
const isValid = doCheckProductForEnabledFilters({ product, enabledFilters })
- if (isValid) {
+ if (isValid && product.per =='No') {
doCountProductAttributes({ product, availableFilters, attributesMap })
+
matchingItems.push(product)
}
}
diff --git a/src/stores/retailer/catalog_browser.js b/src/stores/retailer/catalog_browser.js
index a9ebce3..e64a2e5 100644
--- a/src/stores/retailer/catalog_browser.js
+++ b/src/stores/retailer/catalog_browser.js
@@ -1,6 +1,6 @@
import { getField, updateField } from 'vuex-map-fields'
-import { doFilterItems } from '@/services/search.service'
-import { criteoForProductList } from "@/services/util.service";
+ import { doFilterItems } from '@/services/search.service'
+//import { criteoForProductList } from "@/services/util.service";
import Fuse from 'fuse.js'
export const catalogBrowser = {
namespaced: true,
@@ -63,7 +63,7 @@ export const catalogBrowser = {
setSearchResults(state, results) {
state.searchResults.page = [];
state.searchResults.page = results;
- criteoForProductList(results);
+ // criteoForProductList(results);
},
setFuseWithIndex(state, index) {
state.fuseWithIndex = index
@@ -129,14 +129,16 @@ export const catalogBrowser = {
const fuse = new Fuse(productsArray, options)
commit('setFuseWithIndex', fuse)
},
+ /* eslint-disable no-alert, no-console , no-debugger */
+
search: ({ commit, state }, { fullCatalog, keywords, filters, pageNumber, pageSize, sortBy }) => {
- //debugger
+
commit('inProgress', true)
console.log('searching:', pageNumber)
console.log('pageSize:', pageSize)
- commit('setEnabledFilters', filters)
- //debugger
+ // commit('setEnabledFilters', filters)
+ // debugger
const products = []
if (filters !== undefined && filters.length) {
const categoryFilter = filters.find((f => f.prop == 'ci'))
@@ -154,6 +156,7 @@ export const catalogBrowser = {
}
}
}
+
if (keywords !== null && keywords != '') {
products.length = 0
const relevantResults = state.fuseWithIndex.search(keywords)
@@ -164,18 +167,13 @@ export const catalogBrowser = {
}
}
}
- /* else {
- if (products.length < 1) {
- for (const [, product] of Object.entries(fullCatalog.products)) {
- products.push(product)
- }
- }
- }*/
+
const availableFilters = [];
let filteredItems = [];
let pageData = [];
if (products.length > 0) {
- filteredItems = doFilterItems({
+
+ filteredItems = doFilterItems({
items: products, enabledFilters: state.enabledFilters,
availableFilters, attributesMap: window.attributesMap
})
@@ -212,6 +210,7 @@ export const catalogBrowser = {
}
}
commit('setSearchResults', pageData);
+
commit('setAvailableFilters', availableFilters);
commit('setSearchTerms', { keywords: keywords, pageNumber: pageNumber, pageSize: pageSize, sortBy: sortBy, filters: filters }
);
diff --git a/yarn.lock b/yarn.lock
index d35e22e..6034e31 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2213,9 +2213,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001038, caniuse-lite@^1.0.30001039:
- version "1.0.30001137"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001137.tgz"
- integrity sha512-54xKQZTqZrKVHmVz0+UvdZR6kQc7pJDgfhsMYDG19ID1BWoNnDMFm5Q3uSBSU401pBvKYMsHAt9qhEDcxmk8aw==
+ version "1.0.30001299"
+ resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz"
+ integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
card-validator@8.1.1:
version "8.1.1"