diff --git a/.DS_Store b/.DS_Store index e50c26a..3782fed 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/Http/Controllers/ProductsCompareController.php b/app/Http/Controllers/ProductsCompareController.php index cb23096..2f292fa 100644 --- a/app/Http/Controllers/ProductsCompareController.php +++ b/app/Http/Controllers/ProductsCompareController.php @@ -51,7 +51,7 @@ class ProductsCompareController extends Controller Log::info("ONLINE {codes} {countries}", ["codes" => $codes, "countries" => $countries, "online" => $online]); $products = $this->countryCompareController->compare($countries, $cHash, $codes); } else { - $products = IkeaProducts::whereIn("code", $aCodes); + $products = IkeaProducts::whereIn("itemNoGlobal", $aCodes); if (count($countries)) $products->whereIn("country", $countries); $products = $products->get(); } diff --git a/lang/id.json b/lang/id.json index 62220aa..e263fb9 100644 --- a/lang/id.json +++ b/lang/id.json @@ -126,5 +126,12 @@ "typeerror: invalid assignment to const 'response'": "TypeError: invalid assignment to const 'response'", "error: request aborted": "Error: Request aborted", "typeerror: can't access property \"code\", form.country is null": "TypeError: can't access property \"code\", form.country is null", - "error: request failed with status code 504": "Error: Request failed with status code 504" + "error: request failed with status code 504": "Error: Request failed with status code 504", + "referenceerror: geoip is not defined": "ReferenceError: geoip is not defined", + "referenceerror: ccodes is not defined": "ReferenceError: ccodes is not defined", + "referenceerror: items is not defined": "ReferenceError: items is not defined", + "referenceerror: settings is not defined": "ReferenceError: settings is not defined", + "referenceerror: currencyhash is not defined": "ReferenceError: currencyHash is not defined", + "typeerror: can't access property \"code\", (intermediate value).country.country is undefined": "TypeError: can't access property \"code\", (intermediate value).country.country is undefined", + "typeerror: can't access property \"code\", (intermediate value).country[0] is undefined": "TypeError: can't access property \"code\", (intermediate value).country[0] is undefined" } \ No newline at end of file diff --git a/package.json b/package.json index 073ada0..ea7afe9 100644 --- a/package.json +++ b/package.json @@ -17,24 +17,27 @@ "lodash": "^4.17.19", "postcss": "^8.4.14", "tailwindcss": "^3.1.0", - "vite": "^2.9.11", - "vue": "^3.4.15" + "vite": "^2.9.11" }, "dependencies": { "@coreui/vue": "^4.10.2", "@vueform/multiselect": "^2.5.1", + "flag-icons": "^7.2.0", "flowbite": "^2.1.1", - "flowbite-vue": "^0.1.3", + "flowbite-vue": "github:skjaro/flowbite-vue", "laravel-echo": "^1.13.0", "pusher-js": "^7.3.0", "sweetalert2": "^11.4.23", "vee-validate": "^4.12.4", + "vue": "3.3.x", "vue-google-charts": "^1.1.0", "vue-multiselect": "^3.0.0-beta.3", - "vue3-easy-data-table": "^1.5.47", "vue3-multiselect-checkboxed": "^0.0.9", "vue3-popper": "^1.5.0", "vuedraggable": "^4.1.0", "yup": "^1.3.3" - } + }, + "bundleDependencies": [ + "flowbite-vue" + ] } diff --git a/resources/js/Layouts/GuestLayout.vue b/resources/js/Layouts/GuestLayout.vue index e15b945..9a55b3f 100644 --- a/resources/js/Layouts/GuestLayout.vue +++ b/resources/js/Layouts/GuestLayout.vue @@ -1,9 +1,7 @@ - +