From b9b482374107ee48b10efaa70f1f0c850c04c042 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Mon, 28 Aug 2023 13:38:56 +0300 Subject: [PATCH 001/109] PIPRES-113: Billie payment method (#784) * PIPRES-113: Billie payment method validation (#783) * PIPRES-113: Billie payment method validation * added missing services to base service provider * wrong method call fix * missing repository * PIPRES-113: Billie payment method setup (#788) * PIPRES-113: Billie payment method additional data send (#789) --- composer.json | 2 +- src/Adapter/Context.php | 2 +- src/Builder/FormBuilder.php | 12 +- src/Config/Config.php | 26 +- src/DTO/Object/Company.php | 58 +++++ src/DTO/Object/Payment.php | 142 +++++++++++ src/DTO/OrderData.php | 19 +- src/Handler/Order/OrderCreationHandler.php | 6 +- src/Install/OrderStateInstaller.php | 16 +- src/Repository/CustomerRepository.php | 11 + .../CustomerRepositoryInterface.php | 7 + src/Service/ConfigFieldService.php | 104 ++++---- src/Service/OrderStatusService.php | 2 +- ...lePayPaymentMethodRestrictionValidator.php | 4 +- .../B2bPaymentMethodRestrictionValidator.php | 91 +++++++ src/Service/PaymentMethodService.php | 42 +++- src/Service/SettingsSaveService.php | 59 ++--- src/Service/TransactionService.php | 35 ++- src/ServiceProvider/BaseServiceProvider.php | 5 + src/Validator/OrderConfMailValidator.php | 2 +- tests/Integration/Factory/AddressFactory.php | 28 +++ tests/Integration/Factory/CarrierFactory.php | 55 +++++ tests/Integration/Factory/CartFactory.php | 24 ++ tests/Integration/Factory/CustomerFactory.php | 24 ++ .../Integration/Factory/FactoryInterface.php | 8 + .../Install/OrderStateInstallerTest.php | 4 +- ...bPaymentMethodRestrictionValidatorTest.php | 223 ++++++++++++++++++ ...ecificPaymentRestrictionValidationTest.php | 13 +- upgrade/Upgrade-4.2.0.php | 13 +- upgrade/Upgrade-6.0.3.php | 100 ++++++++ views/templates/admin/invoice_description.tpl | 4 +- 31 files changed, 974 insertions(+), 167 deletions(-) create mode 100644 src/DTO/Object/Company.php create mode 100644 src/DTO/Object/Payment.php create mode 100644 src/Repository/CustomerRepository.php create mode 100644 src/Repository/CustomerRepositoryInterface.php create mode 100644 src/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidator.php create mode 100644 tests/Integration/Factory/AddressFactory.php create mode 100644 tests/Integration/Factory/CarrierFactory.php create mode 100644 tests/Integration/Factory/CartFactory.php create mode 100644 tests/Integration/Factory/CustomerFactory.php create mode 100644 tests/Integration/Factory/FactoryInterface.php create mode 100644 tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php create mode 100644 upgrade/Upgrade-6.0.3.php diff --git a/composer.json b/composer.json index adc9065c4..895fa0191 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "ext-json": "*", "ext-simplexml": "*", "prestashop/decimal": "^1.3", - "mollie/mollie-api-php": "v2.42.1", + "mollie/mollie-api-php": "v2.61.0", "segmentio/analytics-php": "^1.5", "sentry/sentry": "3.17.0", "league/container": "2.5.0", diff --git a/src/Adapter/Context.php b/src/Adapter/Context.php index 7ec026b26..a2de76c69 100644 --- a/src/Adapter/Context.php +++ b/src/Adapter/Context.php @@ -111,7 +111,7 @@ public function getModuleLink( ); } - public function getAddressInvoiceId(): int + public function getInvoiceAddressId(): int { return (int) PrestashopContext::getContext()->cart->id_address_invoice; } diff --git a/src/Builder/FormBuilder.php b/src/Builder/FormBuilder.php index 6ad92466d..eacef51b6 100644 --- a/src/Builder/FormBuilder.php +++ b/src/Builder/FormBuilder.php @@ -430,8 +430,6 @@ protected function getAccountSettingsSection($isApiKeyProvided) 'customLogoUrl' => $this->creditCardLogoProvider->getLogoPathUri() . "?{$dateStamp}", 'customLogoExist' => $this->creditCardLogoProvider->logoExists(), 'voucherCategory' => $this->configuration->get(Config::MOLLIE_VOUCHER_CATEGORY), - 'klarnaPayments' => Config::KLARNA_PAYMENTS, - 'klarnaStatuses' => [Config::MOLLIE_STATUS_KLARNA_AUTHORIZED, Config::MOLLIE_STATUS_KLARNA_SHIPPED], 'applePayDirectProduct' => (int) $this->configuration->get(Config::MOLLIE_APPLE_PAY_DIRECT_PRODUCT), 'applePayDirectCart' => (int) $this->configuration->get(Config::MOLLIE_APPLE_PAY_DIRECT_CART), 'applePayDirectStyle' => (int) $this->configuration->get(Config::MOLLIE_APPLE_PAY_DIRECT_STYLE), @@ -505,22 +503,22 @@ protected function getAdvancedSettingsSection() $input[] = [ 'type' => 'select', - 'label' => $this->module->l('Select when to create the Klarna invoice', self::FILE_NAME), + 'label' => $this->module->l('Select when to create the Order invoice', self::FILE_NAME), 'desc' => $this->module->display($this->module->getPathUri(), 'views/templates/admin/invoice_description.tpl'), 'tab' => $advancedSettings, - 'name' => Config::MOLLIE_KLARNA_INVOICE_ON, + 'name' => Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, 'options' => [ 'query' => [ [ - 'id' => Config::MOLLIE_STATUS_DEFAULT, + 'id' => Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT, 'name' => $this->module->l('Default', self::FILE_NAME), ], [ - 'id' => Config::MOLLIE_STATUS_KLARNA_AUTHORIZED, + 'id' => Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, 'name' => $this->module->l('Authorised', self::FILE_NAME), ], [ - 'id' => Config::MOLLIE_STATUS_KLARNA_SHIPPED, + 'id' => Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, 'name' => $this->module->l('Shipped', self::FILE_NAME), ], ], diff --git a/src/Config/Config.php b/src/Config/Config.php index 13a7a64e5..b08d3a074 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -143,11 +143,11 @@ class Config const PARTIAL_REFUND_CODE = 'partial_refund'; const MOLLIE_STATUS_PARTIALLY_SHIPPED = 'MOLLIE_PARTIALLY_SHIPPED'; const MOLLIE_STATUS_ORDER_COMPLETED = 'MOLLIE_STATUS_ORDER_COMPLETED'; - const MOLLIE_STATUS_DEFAULT = 'MOLLIE_STATUS_DEFAULT'; - const MOLLIE_STATUS_KLARNA_AUTHORIZED = 'MOLLIE_STATUS_KLARNA_AUTHORIZED'; - const MOLLIE_STATUS_KLARNA_SHIPPED = 'MOLLIE_STATUS_KLARNA_SHIPPED'; + const MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT = 'MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT'; + const MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED = 'MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED'; + const MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED = 'MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED'; const MOLLIE_STATUS_CHARGEBACK = 'MOLLIE_STATUS_CHARGEBACK'; - const MOLLIE_KLARNA_INVOICE_ON = 'MOLLIE_KLARNA_INVOICE_ON'; + const MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS = 'MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS'; const MOLLIE_APPLE_PAY_DIRECT_PRODUCT = 'MOLLIE_APPLE_PAY_DIRECT_PRODUCT'; const MOLLIE_APPLE_PAY_DIRECT_CART = 'MOLLIE_APPLE_PAY_DIRECT_CART'; @@ -256,16 +256,18 @@ class Config const RESTORE_CART_BACKTRACE_MEMORIZATION_SERVICE = 'memo'; const RESTORE_CART_BACKTRACE_RETURN_CONTROLLER = 'return'; - const KLARNA_PAYMENTS = [ + const AUTHORIZABLE_PAYMENTS = [ PaymentMethod::KLARNA_PAY_LATER, PaymentMethod::KLARNA_SLICE_IT, PaymentMethod::KLARNA_PAY_NOW, + PaymentMethod::BILLIE, ]; const ORDER_API_ONLY_METHODS = [ PaymentMethod::KLARNA_PAY_LATER, PaymentMethod::KLARNA_SLICE_IT, PaymentMethod::KLARNA_PAY_NOW, + PaymentMethod::BILLIE, self::MOLLIE_VOUCHER_METHOD_ID, self::MOLLIE_in3_METHOD_ID, ]; @@ -303,20 +305,22 @@ class Config 'voucher' => 'Voucher', 'klarnapaynow' => 'Klarna Pay now.', 'in3' => 'in3', + 'billie' => 'Billie', ]; const MOLLIE_BUTTON_ORDER_TOTAL_REFRESH = 'MOLLIE_BUTTON_ORDER_TOTAL_REFRESH'; + // TODO migrate functions below to separate service public static function getStatuses() { - $isKlarnaDefault = Configuration::get(Config::MOLLIE_KLARNA_INVOICE_ON) === Config::MOLLIE_STATUS_DEFAULT; + $isAuthorizablePaymentInvoiceOnStatusDefault = Configuration::get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS) === Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT; return [ self::MOLLIE_AWAITING_PAYMENT => Configuration::get(self::MOLLIE_STATUS_AWAITING), PaymentStatus::STATUS_PAID => Configuration::get(self::MOLLIE_STATUS_PAID), OrderStatus::STATUS_COMPLETED => Configuration::get(self::MOLLIE_STATUS_COMPLETED), - PaymentStatus::STATUS_AUTHORIZED => $isKlarnaDefault ? - Configuration::get(self::MOLLIE_STATUS_PAID) : Configuration::get(self::MOLLIE_STATUS_KLARNA_AUTHORIZED), + PaymentStatus::STATUS_AUTHORIZED => $isAuthorizablePaymentInvoiceOnStatusDefault ? + Configuration::get(self::MOLLIE_STATUS_PAID) : Configuration::get(self::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED), PaymentStatus::STATUS_CANCELED => Configuration::get(self::MOLLIE_STATUS_CANCELED), PaymentStatus::STATUS_EXPIRED => Configuration::get(self::MOLLIE_STATUS_EXPIRED), RefundStatus::STATUS_REFUNDED => Configuration::get(self::MOLLIE_STATUS_REFUNDED), @@ -329,7 +333,7 @@ public static function getStatuses() self::STATUS_PAID_ON_BACKORDER => Configuration::get('PS_OS_OUTOFSTOCK_PAID'), self::STATUS_PENDING_ON_BACKORDER => Configuration::get('PS_OS_OUTOFSTOCK_UNPAID'), self::STATUS_ON_BACKORDER => Configuration::get('PS_OS_OUTOFSTOCK'), - self::MOLLIE_STATUS_KLARNA_SHIPPED => Configuration::get(self::MOLLIE_STATUS_KLARNA_SHIPPED), + self::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED => Configuration::get(self::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED), self::MOLLIE_CHARGEBACK => Configuration::get(self::MOLLIE_STATUS_CHARGEBACK), ]; } @@ -351,8 +355,8 @@ public static function getMollieOrderStatuses() self::MOLLIE_STATUS_PARTIAL_REFUND, self::MOLLIE_STATUS_AWAITING, self::MOLLIE_STATUS_ORDER_COMPLETED, - self::MOLLIE_STATUS_KLARNA_AUTHORIZED, - self::MOLLIE_STATUS_KLARNA_SHIPPED, + self::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, + self::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, self::MOLLIE_STATUS_CHARGEBACK, ]; } diff --git a/src/DTO/Object/Company.php b/src/DTO/Object/Company.php new file mode 100644 index 000000000..80a2ec05d --- /dev/null +++ b/src/DTO/Object/Company.php @@ -0,0 +1,58 @@ +vatNumber; + } + + /** + * @param string $vatNumber + * + * @maps vatNumber + */ + public function setVatNumber(string $vatNumber): void + { + $this->vatNumber = $vatNumber; + } + + /** + * @return string + */ + public function getRegistrationNumber(): string + { + return $this->registrationNumber; + } + + /** + * @param string $registrationNumber + * + * @maps registrationNumber + */ + public function setRegistrationNumber(string $registrationNumber): void + { + $this->registrationNumber = $registrationNumber; + } + + public function jsonSerialize() + { + $json = []; + $json['vatNumber'] = $this->getVatNumber(); + $json['registrationNumber'] = $this->getRegistrationNumber(); + + return array_filter($json, static function ($val) { + return $val !== null && $val !== ''; + }); + } +} diff --git a/src/DTO/Object/Payment.php b/src/DTO/Object/Payment.php new file mode 100644 index 000000000..127f0cfd2 --- /dev/null +++ b/src/DTO/Object/Payment.php @@ -0,0 +1,142 @@ +cardToken; + } + + /** + * @param string $cardToken + * + * @maps cardToken + */ + public function setCardToken(string $cardToken): void + { + $this->cardToken = $cardToken; + } + + /** + * @return string + */ + public function getWebhookUrl(): string + { + return $this->webhookUrl; + } + + /** + * @param string $webhookUrl + * + * @maps webhookUrl + */ + public function setWebhookUrl(string $webhookUrl): void + { + $this->webhookUrl = $webhookUrl; + } + + /** + * @return ?string + */ + public function getIssuer(): ?string + { + return $this->issuer; + } + + /** + * @param string $issuer + * + * @maps issuer + */ + public function setIssuer(string $issuer): void + { + $this->issuer = $issuer; + } + + /** + * @return ?string + */ + public function getCustomerId(): ?string + { + return $this->customerId; + } + + /** + * @param string $customerId + * + * @maps customerId + */ + public function setCustomerId(string $customerId): void + { + $this->customerId = $customerId; + } + + /** + * @return ?string + */ + public function getApplePayPaymentToken(): ?string + { + return $this->applePayPaymentToken; + } + + /** + * @param string $applePayPaymentToken + * + * @maps applePayPaymentToken + */ + public function setApplePayPaymentToken(string $applePayPaymentToken): void + { + $this->applePayPaymentToken = $applePayPaymentToken; + } + + /** + * @return ?Company + */ + public function getCompany(): ?Company + { + return $this->company; + } + + /** + * @param \Mollie\DTO\Object\Company $company + * + * @maps company + */ + public function setCompany(Company $company): void + { + $this->company = $company; + } + + public function jsonSerialize() + { + $result = []; + $result['cardToken'] = $this->getCardToken(); + $result['webhookUrl'] = $this->getWebhookUrl(); + $result['issuer'] = $this->getIssuer(); + $result['customerId'] = $this->getCustomerId(); + $result['applePayPaymentToken'] = $this->getApplePayPaymentToken(); + $result['company'] = $this->getCompany() ? $this->getCompany()->jsonSerialize() : null; + + return array_filter($result, static function ($val) { + return $val !== null && $val !== ''; + }); + } +} diff --git a/src/DTO/OrderData.php b/src/DTO/OrderData.php index e3fa2e32f..e50652f16 100644 --- a/src/DTO/OrderData.php +++ b/src/DTO/OrderData.php @@ -16,6 +16,7 @@ use Country; use JsonSerializable; use Mollie\DTO\Object\Amount; +use Mollie\DTO\Object\Payment; class OrderData implements JsonSerializable { @@ -85,7 +86,7 @@ class OrderData implements JsonSerializable private $lines; /** - * @var array + * @var Payment */ private $payment; @@ -363,17 +364,19 @@ public function setLines($lines) } /** - * @return array + * @return Payment */ - public function getPayment() + public function getPayment(): Payment { return $this->payment; } /** - * @param array $payment + * @param \Mollie\DTO\Object\Payment $payment + * + * @maps payment */ - public function setPayment($payment) + public function setPayment(Payment $payment): void { $this->payment = $payment; } @@ -460,7 +463,7 @@ public function jsonSerialize() 'locale' => $this->getLocale(), 'orderNumber' => $this->getOrderNumber(), 'lines' => $lines, - 'payment' => $this->getPayment(), + 'payment' => $this->getPayment()->jsonSerialize(), 'consumerDateOfBirth' => $this->getConsumerDateOfBirth(), ]; @@ -476,7 +479,9 @@ public function jsonSerialize() $result['sequenceType'] = $this->sequenceType; } - return $result; + return array_filter($result, static function ($val) { + return $val !== null && $val !== ''; + }); } private function cleanUpInput($input, $defaultValue = 'N/A') diff --git a/src/Handler/Order/OrderCreationHandler.php b/src/Handler/Order/OrderCreationHandler.php index 836d35fce..4f21ab40b 100644 --- a/src/Handler/Order/OrderCreationHandler.php +++ b/src/Handler/Order/OrderCreationHandler.php @@ -109,7 +109,7 @@ public function __construct( /** * @param MollieOrderAlias|MolliePaymentAlias $apiPayment * @param int $cartId - * @param bool $isKlarnaOrder + * @param bool $isAuthorizablePayment * * @return int * @@ -119,9 +119,9 @@ public function __construct( * @throws \PrestaShopDatabaseException * @throws \PrestaShopException */ - public function createOrder($apiPayment, int $cartId, $isKlarnaOrder = false): int + public function createOrder($apiPayment, int $cartId, bool $isAuthorizablePayment = false): int { - $orderStatus = $isKlarnaOrder ? + $orderStatus = $isAuthorizablePayment ? (int) Config::getStatuses()[PaymentStatus::STATUS_AUTHORIZED] : (int) Config::getStatuses()[PaymentStatus::STATUS_PAID]; diff --git a/src/Install/OrderStateInstaller.php b/src/Install/OrderStateInstaller.php index 9a07dcac7..1d1d92325 100644 --- a/src/Install/OrderStateInstaller.php +++ b/src/Install/OrderStateInstaller.php @@ -33,7 +33,7 @@ public function __construct( /** * @throws CouldNotInstallModule */ - public function install() + public function install(): bool { $this->installOrderState( Config::MOLLIE_STATUS_PARTIAL_REFUND, @@ -69,9 +69,9 @@ public function install() ); $this->installOrderState( - Config::MOLLIE_STATUS_KLARNA_AUTHORIZED, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, new OrderStateData( - 'Klarna payment authorized', + 'Order payment authorized', '#8A2BE2', true, true, @@ -85,9 +85,9 @@ public function install() ); $this->installOrderState( - Config::MOLLIE_STATUS_KLARNA_SHIPPED, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, new OrderStateData( - 'Klarna payment shipped', + 'Order payment shipped', '#8A2BE2', true, true, @@ -114,7 +114,7 @@ public function install() /** * @throws CouldNotInstallModule */ - private function installOrderState(string $orderStatus, OrderStateData $orderStateInstallerData) + private function installOrderState(string $orderStatus, OrderStateData $orderStateInstallerData): void { if ($this->validateIfStatusExists($orderStatus)) { $this->enableState($orderStatus); @@ -136,7 +136,7 @@ private function validateIfStatusExists(string $key): bool return \Validate::isLoadedObject($orderState); } - private function enableState(string $key) + private function enableState(string $key): void { $existingStateId = (int) $this->configurationAdapter->get($key); $orderState = new OrderState($existingStateId); @@ -186,7 +186,7 @@ private function createOrderState(OrderStateData $orderStateInstallerData): Orde return $orderState; } - private function updateStateConfiguration(string $key, OrderState $orderState) + private function updateStateConfiguration(string $key, OrderState $orderState): void { $this->configurationAdapter->updateValue($key, (int) $orderState->id); } diff --git a/src/Repository/CustomerRepository.php b/src/Repository/CustomerRepository.php new file mode 100644 index 000000000..75841fb3d --- /dev/null +++ b/src/Repository/CustomerRepository.php @@ -0,0 +1,11 @@ +module = $module; $this->apiService = $apiService; @@ -52,67 +53,72 @@ public function __construct( public function getConfigFieldsValues() { $configFields = [ - Config::MOLLIE_ENVIRONMENT => Configuration::get(Config::MOLLIE_ENVIRONMENT), - Config::MOLLIE_API_KEY => Configuration::get(Config::MOLLIE_API_KEY), - Config::MOLLIE_API_KEY_TEST => Configuration::get(Config::MOLLIE_API_KEY_TEST), - Config::MOLLIE_PAYMENTSCREEN_LOCALE => Configuration::get(Config::MOLLIE_PAYMENTSCREEN_LOCALE), - Config::MOLLIE_SEND_ORDER_CONFIRMATION => Configuration::get(Config::MOLLIE_SEND_ORDER_CONFIRMATION), + Config::MOLLIE_ENVIRONMENT => $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT), + Config::MOLLIE_API_KEY => $this->configurationAdapter->get(Config::MOLLIE_API_KEY), + Config::MOLLIE_API_KEY_TEST => $this->configurationAdapter->get(Config::MOLLIE_API_KEY_TEST), + Config::MOLLIE_PAYMENTSCREEN_LOCALE => $this->configurationAdapter->get(Config::MOLLIE_PAYMENTSCREEN_LOCALE), + Config::MOLLIE_SEND_ORDER_CONFIRMATION => $this->configurationAdapter->get(Config::MOLLIE_SEND_ORDER_CONFIRMATION), Config::MOLLIE_IFRAME[(int) $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT) ? 'production' : 'sandbox'] => $this->configurationAdapter->get(Config::MOLLIE_IFRAME), Config::MOLLIE_SINGLE_CLICK_PAYMENT[(int) $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT) ? 'production' : 'sandbox'] => $this->configurationAdapter->get(Config::MOLLIE_SINGLE_CLICK_PAYMENT), - Config::MOLLIE_CSS => Configuration::get(Config::MOLLIE_CSS), - Config::MOLLIE_IMAGES => Configuration::get(Config::MOLLIE_IMAGES), - Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK => Configuration::get(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK), + Config::MOLLIE_CSS => $this->configurationAdapter->get(Config::MOLLIE_CSS), + Config::MOLLIE_IMAGES => $this->configurationAdapter->get(Config::MOLLIE_IMAGES), + Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK => $this->configurationAdapter->get(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK), Config::MOLLIE_ISSUERS[(int) $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT) ? 'production' : 'sandbox'] => $this->configurationAdapter->get(Config::MOLLIE_ISSUERS), - Config::MOLLIE_METHOD_COUNTRIES => Configuration::get(Config::MOLLIE_METHOD_COUNTRIES), - Config::MOLLIE_METHOD_COUNTRIES_DISPLAY => Configuration::get(Config::MOLLIE_METHOD_COUNTRIES_DISPLAY), - - Config::MOLLIE_STATUS_OPEN => Configuration::get(Config::MOLLIE_STATUS_OPEN), - Config::MOLLIE_STATUS_AWAITING => Configuration::get(Config::MOLLIE_STATUS_AWAITING), - Config::MOLLIE_STATUS_PAID => Configuration::get(Config::MOLLIE_STATUS_PAID), - Config::MOLLIE_STATUS_COMPLETED => Configuration::get(Config::MOLLIE_STATUS_COMPLETED), - Config::MOLLIE_STATUS_CANCELED => Configuration::get(Config::MOLLIE_STATUS_CANCELED), - Config::MOLLIE_STATUS_EXPIRED => Configuration::get(Config::MOLLIE_STATUS_EXPIRED), - Config::MOLLIE_STATUS_PARTIAL_REFUND => Configuration::get(Config::MOLLIE_STATUS_PARTIAL_REFUND), - Config::MOLLIE_STATUS_REFUNDED => Configuration::get(Config::MOLLIE_STATUS_REFUNDED), - Config::MOLLIE_STATUS_CHARGEBACK => Configuration::get(Config::MOLLIE_STATUS_CHARGEBACK), - Config::MOLLIE_MAIL_WHEN_OPEN => Configuration::get(Config::MOLLIE_MAIL_WHEN_OPEN), - Config::MOLLIE_MAIL_WHEN_AWAITING => Configuration::get(Config::MOLLIE_MAIL_WHEN_AWAITING), - Config::MOLLIE_MAIL_WHEN_PAID => Configuration::get(Config::MOLLIE_MAIL_WHEN_PAID), - Config::MOLLIE_MAIL_WHEN_COMPLETED => Configuration::get(Config::MOLLIE_MAIL_WHEN_COMPLETED), - Config::MOLLIE_MAIL_WHEN_CANCELED => Configuration::get(Config::MOLLIE_MAIL_WHEN_CANCELED), - Config::MOLLIE_MAIL_WHEN_EXPIRED => Configuration::get(Config::MOLLIE_MAIL_WHEN_EXPIRED), - Config::MOLLIE_MAIL_WHEN_REFUNDED => Configuration::get(Config::MOLLIE_MAIL_WHEN_REFUNDED), - Config::MOLLIE_MAIL_WHEN_CHARGEBACK => Configuration::get(Config::MOLLIE_MAIL_WHEN_CHARGEBACK), - Config::MOLLIE_ACCOUNT_SWITCH => Configuration::get(Config::MOLLIE_ACCOUNT_SWITCH), - - Config::MOLLIE_DISPLAY_ERRORS => Configuration::get(Config::MOLLIE_DISPLAY_ERRORS), - Config::MOLLIE_DEBUG_LOG => Configuration::get(Config::MOLLIE_DEBUG_LOG), - Config::MOLLIE_API => Configuration::get(Config::MOLLIE_API), - - Config::MOLLIE_AUTO_SHIP_MAIN => Configuration::get(Config::MOLLIE_AUTO_SHIP_MAIN), - - Config::MOLLIE_STATUS_SHIPPING => Configuration::get(Config::MOLLIE_STATUS_SHIPPING), - Config::MOLLIE_MAIL_WHEN_SHIPPING => Configuration::get(Config::MOLLIE_MAIL_WHEN_SHIPPING), - Config::MOLLIE_KLARNA_INVOICE_ON => Configuration::get(Config::MOLLIE_KLARNA_INVOICE_ON), + Config::MOLLIE_METHOD_COUNTRIES => $this->configurationAdapter->get(Config::MOLLIE_METHOD_COUNTRIES), + Config::MOLLIE_METHOD_COUNTRIES_DISPLAY => $this->configurationAdapter->get(Config::MOLLIE_METHOD_COUNTRIES_DISPLAY), + + Config::MOLLIE_STATUS_OPEN => $this->configurationAdapter->get(Config::MOLLIE_STATUS_OPEN), + Config::MOLLIE_STATUS_AWAITING => $this->configurationAdapter->get(Config::MOLLIE_STATUS_AWAITING), + Config::MOLLIE_STATUS_PAID => $this->configurationAdapter->get(Config::MOLLIE_STATUS_PAID), + Config::MOLLIE_STATUS_COMPLETED => $this->configurationAdapter->get(Config::MOLLIE_STATUS_COMPLETED), + Config::MOLLIE_STATUS_CANCELED => $this->configurationAdapter->get(Config::MOLLIE_STATUS_CANCELED), + Config::MOLLIE_STATUS_EXPIRED => $this->configurationAdapter->get(Config::MOLLIE_STATUS_EXPIRED), + Config::MOLLIE_STATUS_PARTIAL_REFUND => $this->configurationAdapter->get(Config::MOLLIE_STATUS_PARTIAL_REFUND), + Config::MOLLIE_STATUS_REFUNDED => $this->configurationAdapter->get(Config::MOLLIE_STATUS_REFUNDED), + Config::MOLLIE_STATUS_CHARGEBACK => $this->configurationAdapter->get(Config::MOLLIE_STATUS_CHARGEBACK), + Config::MOLLIE_MAIL_WHEN_OPEN => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_OPEN), + Config::MOLLIE_MAIL_WHEN_AWAITING => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_AWAITING), + Config::MOLLIE_MAIL_WHEN_PAID => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_PAID), + Config::MOLLIE_MAIL_WHEN_COMPLETED => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_COMPLETED), + Config::MOLLIE_MAIL_WHEN_CANCELED => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_CANCELED), + Config::MOLLIE_MAIL_WHEN_EXPIRED => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_EXPIRED), + Config::MOLLIE_MAIL_WHEN_REFUNDED => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_REFUNDED), + Config::MOLLIE_MAIL_WHEN_CHARGEBACK => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_CHARGEBACK), + Config::MOLLIE_ACCOUNT_SWITCH => $this->configurationAdapter->get(Config::MOLLIE_ACCOUNT_SWITCH), + + Config::MOLLIE_DISPLAY_ERRORS => $this->configurationAdapter->get(Config::MOLLIE_DISPLAY_ERRORS), + Config::MOLLIE_DEBUG_LOG => $this->configurationAdapter->get(Config::MOLLIE_DEBUG_LOG), + Config::MOLLIE_API => $this->configurationAdapter->get(Config::MOLLIE_API), + + Config::MOLLIE_AUTO_SHIP_MAIN => $this->configurationAdapter->get(Config::MOLLIE_AUTO_SHIP_MAIN), + + Config::MOLLIE_STATUS_SHIPPING => $this->configurationAdapter->get(Config::MOLLIE_STATUS_SHIPPING), + Config::MOLLIE_MAIL_WHEN_SHIPPING => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_SHIPPING), + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS => $this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS), ]; - if (Mollie\Utility\EnvironmentUtility::getApiKey() && $this->module->getApiClient() !== null) { + if (EnvironmentUtility::getApiKey() && $this->module->getApiClient() !== null) { foreach ($this->apiService->getMethodsForConfig($this->module->getApiClient()) as $method) { $countryIds = $this->countryRepository->getMethodCountryIds($method['id']); + if ($countryIds) { - $configFields = array_merge($configFields, [Config::MOLLIE_COUNTRIES . $method['id'] . '[]' => $countryIds]); + $configFields[Config::MOLLIE_COUNTRIES . $method['id'] . '[]'] = $countryIds; + continue; } - $configFields = array_merge($configFields, [Config::MOLLIE_COUNTRIES . $method['id'] . '[]' => []]); + + $configFields[Config::MOLLIE_COUNTRIES . $method['id'] . '[]'] = []; } } $checkStatuses = []; - if (Configuration::get(Config::MOLLIE_AUTO_SHIP_STATUSES)) { - $checkConfs = @json_decode(Configuration::get(Config::MOLLIE_AUTO_SHIP_STATUSES), true); + + if ($this->configurationAdapter->get(Config::MOLLIE_AUTO_SHIP_STATUSES)) { + $checkConfs = @json_decode($this->configurationAdapter->get(Config::MOLLIE_AUTO_SHIP_STATUSES), true); } + if (!isset($checkConfs) || !is_array($checkConfs)) { $checkConfs = []; } @@ -121,8 +127,6 @@ public function getConfigFieldsValues() $checkStatuses[Config::MOLLIE_AUTO_SHIP_STATUSES . '_' . (int) $conf] = true; } - $configFields = array_merge($configFields, $checkStatuses); - - return $configFields; + return array_merge($configFields, $checkStatuses); } } diff --git a/src/Service/OrderStatusService.php b/src/Service/OrderStatusService.php index 1d4c26d0e..33c1ea8d1 100644 --- a/src/Service/OrderStatusService.php +++ b/src/Service/OrderStatusService.php @@ -157,6 +157,6 @@ private function isStatusPaid($statusId) { return ((int) $statusId === (int) Configuration::get(Config::MOLLIE_STATUS_PAID)) || ((int) $statusId === (int) Configuration::get(Config::STATUS_PS_OS_OUTOFSTOCK_PAID)) || - ((int) $statusId === (int) Configuration::get(Config::MOLLIE_STATUS_KLARNA_AUTHORIZED)); + ((int) $statusId === (int) Configuration::get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED)); } } diff --git a/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/ApplePayPaymentMethodRestrictionValidator.php b/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/ApplePayPaymentMethodRestrictionValidator.php index e98743f4c..531fcea49 100644 --- a/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/ApplePayPaymentMethodRestrictionValidator.php +++ b/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/ApplePayPaymentMethodRestrictionValidator.php @@ -37,7 +37,7 @@ namespace Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation; use Mollie\Adapter\ConfigurationAdapter; -use Mollie\Config\Config; +use Mollie\Api\Types\PaymentMethod; use MolPaymentMethod; class ApplePayPaymentMethodRestrictionValidator implements PaymentMethodRestrictionValidatorInterface @@ -73,7 +73,7 @@ public function isValid(MolPaymentMethod $paymentMethod): bool */ public function supports(MolPaymentMethod $paymentMethod): bool { - return $paymentMethod->getPaymentMethodName() === Config::MOLLIE_METHOD_ID_APPLE_PAY; + return $paymentMethod->getPaymentMethodName() === PaymentMethod::APPLEPAY; } /** diff --git a/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidator.php b/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidator.php new file mode 100644 index 000000000..c4d6d9810 --- /dev/null +++ b/src/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidator.php @@ -0,0 +1,91 @@ +context = $context; + $this->addressRepository = $addressRepository; + $this->customerRepository = $customerRepository; + $this->configuration = $configuration; + } + + /** + * {@inheritDoc} + */ + public function isValid(MolPaymentMethod $paymentMethod): bool + { + if (!$this->isB2bEnabled()) { + return false; + } + + if (!$this->isIdentificationNumberValid()) { + return false; + } + + if (!$this->isVatNumberValid()) { + return false; + } + + return true; + } + + /** + * {@inheritDoc} + */ + public function supports(MolPaymentMethod $paymentMethod): bool + { + return $paymentMethod->getPaymentMethodName() === PaymentMethod::BILLIE; + } + + private function isIdentificationNumberValid(): bool + { + $customerId = $this->context->getCustomerId(); + + /** @var \Customer $customer */ + $customer = $this->customerRepository->findOneBy([ + 'id_customer' => $customerId, + ]); + + return !empty($customer->siret); + } + + private function isVatNumberValid(): bool + { + $billingAddressId = $this->context->getInvoiceAddressId(); + + /** @var \Address $billingAddress */ + $billingAddress = $this->addressRepository->findOneBy([ + 'id_address' => (int) $billingAddressId, + ]); + + return !empty($billingAddress->vat_number); + } + + private function isB2bEnabled(): bool + { + return (bool) (int) $this->configuration->get('PS_B2B_ENABLE'); + } +} diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php index 2ae9d10e4..9c105278b 100644 --- a/src/Service/PaymentMethodService.php +++ b/src/Service/PaymentMethodService.php @@ -30,6 +30,8 @@ use Mollie\Api\Types\SequenceType; use Mollie\Config\Config; use Mollie\DTO\Object\Amount; +use Mollie\DTO\Object\Company; +use Mollie\DTO\Object\Payment; use Mollie\DTO\OrderData; use Mollie\DTO\PaymentData; use Mollie\Exception\OrderCreationException; @@ -325,6 +327,7 @@ public function getPaymentData( $paymentData = new PaymentData($amountObj, $orderReference, $redirectUrl, $webhookUrl); $paymentData->setMetadata($metaData); + $paymentData->setLocale($this->getLocale($molPaymentMethod->method)); $paymentData->setMethod($molPaymentMethod->id_method); @@ -388,14 +391,22 @@ public function getPaymentData( if (isset($cart->id_address_invoice)) { $billingAddress = new Address((int) $cart->id_address_invoice); + if (!empty($billingAddress->vat_number) && !empty($customer->siret)) { + $company = new Company(); + $company->setVatNumber($billingAddress->vat_number); + $company->setRegistrationNumber($customer->siret); + } + $orderData->setBillingAddress($billingAddress); $orderData->setBillingPhoneNumber($this->phoneNumberProvider->getFromAddress($billingAddress)); } if (isset($cart->id_address_delivery)) { $shippingAddress = new Address((int) $cart->id_address_delivery); + $orderData->setShippingAddress($shippingAddress); $orderData->setDeliveryPhoneNumber($this->phoneNumberProvider->getFromAddress($shippingAddress)); } + $orderData->setOrderNumber($orderReference); $orderData->setLocale($this->getLocale($molPaymentMethod->method)); $orderData->setEmail($customer->email); @@ -427,30 +438,37 @@ public function getPaymentData( (bool) Configuration::get('PS_GIFT_WRAPPING'), $selectedVoucherCategory )); - $payment = []; - if ($cardToken) { - $payment['cardToken'] = $cardToken; + + $payment = new Payment(); + + if (!empty($cardToken)) { + $payment->setCardToken($cardToken); } - $payment['webhookUrl'] = $this->context->getModuleLink( + + $payment->setWebhookUrl($this->context->getModuleLink( 'mollie', 'webhook', [], true - ); + )); - if ($issuer) { - $payment['issuer'] = $issuer; + if (!empty($issuer)) { + $payment->setIssuer($issuer); } if ($molPaymentMethod->id_method === PaymentMethod::CREDITCARD) { $molCustomer = $this->handleCustomerInfo($cart->id_customer, $saveCard, $useSavedCard); - if ($molCustomer) { - $payment['customerId'] = $molCustomer->customer_id; + if ($molCustomer && !empty($molCustomer->customer_id)) { + $payment->setCustomerId($molCustomer->customer_id); } } - if ($molPaymentMethod->id_method === PaymentMethod::APPLEPAY && $applePayToken) { - $payment['applePayPaymentToken'] = $applePayToken; + if ($molPaymentMethod->id_method === PaymentMethod::APPLEPAY && !empty($applePayToken)) { + $payment->setApplePayPaymentToken($applePayToken); + } + + if (isset($company)) { + $payment->setCompany($company); } $orderData->setPayment($payment); @@ -504,7 +522,7 @@ private function removeNotSupportedMethods($methods, $mollieMethods) private function getSupportedMollieMethods(?string $sequenceType = null): array { - $address = new Address($this->context->getAddressInvoiceId()); + $address = new Address($this->context->getInvoiceAddressId()); $country = new Country($address->id_country); $cartAmount = $this->orderTotalProvider->getOrderTotal(); diff --git a/src/Service/SettingsSaveService.php b/src/Service/SettingsSaveService.php index f3f75cdac..8b7f9ca55 100644 --- a/src/Service/SettingsSaveService.php +++ b/src/Service/SettingsSaveService.php @@ -13,7 +13,6 @@ namespace Mollie\Service; use Carrier; -use Configuration; use Context; use Exception; use Mollie; @@ -125,7 +124,7 @@ public function __construct( */ public function saveSettings(&$errors = []) { - $oldEnvironment = (int) Configuration::get(Config::MOLLIE_ENVIRONMENT); + $oldEnvironment = (int) $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT); $environment = (int) Tools::getValue(Config::MOLLIE_ENVIRONMENT); $mollieApiKey = Tools::getValue(Config::MOLLIE_API_KEY); $mollieApiKeyTest = Tools::getValue(Config::MOLLIE_API_KEY_TEST); @@ -141,16 +140,17 @@ public function saveSettings(&$errors = []) } if (Tools::getValue(Config::METHODS_CONFIG) && json_decode(Tools::getValue(Config::METHODS_CONFIG))) { - Configuration::updateValue( + $this->configurationAdapter->updateValue( Config::METHODS_CONFIG, json_encode(@json_decode(Tools::getValue(Config::METHODS_CONFIG))) ); } if ((int) Tools::getValue(Config::MOLLIE_ENV_CHANGED) === 1) { - Configuration::updateValue(Config::MOLLIE_API_KEY, $mollieApiKey); - Configuration::updateValue(Config::MOLLIE_API_KEY_TEST, $mollieApiKeyTest); - Configuration::updateValue(Config::MOLLIE_ENVIRONMENT, $environment); + $this->configurationAdapter->updateValue(Config::MOLLIE_API_KEY, $mollieApiKey); + $this->configurationAdapter->updateValue(Config::MOLLIE_API_KEY_TEST, $mollieApiKeyTest); + $this->configurationAdapter->updateValue(Config::MOLLIE_ENVIRONMENT, $environment); + try { $api = $this->apiKeyService->setApiKey($apiKey, $this->module->version); if (null === $api) { @@ -158,7 +158,7 @@ public function saveSettings(&$errors = []) } } catch (Exception $e) { $errors[] = $e->getMessage(); - Configuration::updateValue(Config::MOLLIE_API_KEY, null); + $this->configurationAdapter->updateValue(Config::MOLLIE_API_KEY, null); return [$this->module->l('Wrong API Key!', self::FILE_NAME)]; } @@ -209,7 +209,7 @@ public function saveSettings(&$errors = []) } $useCustomLogo = Tools::getValue(Config::MOLLIE_SHOW_CUSTOM_LOGO); - Configuration::updateValue( + $this->configurationAdapter->updateValue( Config::MOLLIE_SHOW_CUSTOM_LOGO, $useCustomLogo ); @@ -272,15 +272,15 @@ public function saveSettings(&$errors = []) } } catch (Exception $e) { $errors[] = $e->getMessage(); - Configuration::updateValue(Config::MOLLIE_API_KEY, null); + $this->configurationAdapter->updateValue(Config::MOLLIE_API_KEY, null); return [$this->module->l('Wrong API Key!', self::FILE_NAME)]; } } try { - $this->handleKlarnaInvoiceStatus(); + $this->handleAuthorizablePaymentInvoiceStatus(); } catch (Exception $e) { - $errors[] = $this->module->l('There are issues with your Klarna statuses, please try resetting Mollie module.', self::FILE_NAME); + $errors[] = $this->module->l('There are issues with your authorizable payment statuses, please try resetting Mollie module.', self::FILE_NAME); } if (empty($errors)) { @@ -337,11 +337,11 @@ public function saveSettings(&$errors = []) continue; } $new = (int) Tools::getValue("MOLLIE_STATUS_{$name}"); - Configuration::updateValue("MOLLIE_STATUS_{$name}", $new); + $this->configurationAdapter->updateValue("MOLLIE_STATUS_{$name}", $new); Config::getStatuses()[Tools::strtolower($name)] = $new; if (PaymentStatus::STATUS_OPEN != $name) { - Configuration::updateValue( + $this->configurationAdapter->updateValue( "MOLLIE_MAIL_WHEN_{$name}", Tools::getValue("MOLLIE_MAIL_WHEN_{$name}") ? true : false ); @@ -381,30 +381,33 @@ private function getStatusesValue($key) return $statesEnabled; } - private function handleKlarnaInvoiceStatus() + private function handleAuthorizablePaymentInvoiceStatus(): void { - $klarnaInvoiceStatus = Tools::getValue(Config::MOLLIE_KLARNA_INVOICE_ON); - Configuration::updateValue(Config::MOLLIE_KLARNA_INVOICE_ON, $klarnaInvoiceStatus); - if (Config::MOLLIE_STATUS_KLARNA_SHIPPED === $klarnaInvoiceStatus) { - $this->updateKlarnaStatuses(true); + $authorizablePaymentInvoiceOnStatus = (string) Tools::getValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS); + + $this->configurationAdapter->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, $authorizablePaymentInvoiceOnStatus); + + if (Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED === $authorizablePaymentInvoiceOnStatus) { + $this->updateAuthorizablePaymentOrderStatus(true); return; } - $this->updateKlarnaStatuses(false); + $this->updateAuthorizablePaymentOrderStatus(false); } - private function updateKlarnaStatuses($isShipped = true) + private function updateAuthorizablePaymentOrderStatus(bool $isShipped): void { - $klarnaInvoiceShippedId = Configuration::get(Config::MOLLIE_STATUS_KLARNA_SHIPPED); - $klarnaInvoiceShipped = new OrderState((int) $klarnaInvoiceShippedId); - $klarnaInvoiceShipped->invoice = $isShipped; - $klarnaInvoiceShipped->update(); + $authorizablePaymentStatusShippedId = $this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED); + $authorizablePaymentStatusShipped = new OrderState((int) $authorizablePaymentStatusShippedId); + + $authorizablePaymentStatusShipped->invoice = $isShipped; + $authorizablePaymentStatusShipped->update(); - $klarnaInvoiceAcceptedId = Configuration::get(Config::MOLLIE_STATUS_KLARNA_AUTHORIZED); - $klarnaInvoiceAccepted = new OrderState((int) $klarnaInvoiceAcceptedId); + $authorizablePaymentStatusAuthorizedId = $this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED); + $authorizablePaymentStatusAuthorized = new OrderState((int) $authorizablePaymentStatusAuthorizedId); - $klarnaInvoiceAccepted->invoice = !$isShipped; - $klarnaInvoiceAccepted->update(); + $authorizablePaymentStatusAuthorized->invoice = !$isShipped; + $authorizablePaymentStatusAuthorized->update(); } } diff --git a/src/Service/TransactionService.php b/src/Service/TransactionService.php index 7ad744dd4..6ea8e0bbc 100644 --- a/src/Service/TransactionService.php +++ b/src/Service/TransactionService.php @@ -13,10 +13,10 @@ namespace Mollie\Service; use Cart; -use Configuration; use Currency; use Db; use Mollie; +use Mollie\Adapter\ConfigurationAdapter; use Mollie\Api\Exceptions\ApiException; use Mollie\Api\Resources\Order as MollieOrderAlias; use Mollie\Api\Resources\Payment; @@ -79,6 +79,8 @@ class TransactionService private $logger; /** @var ExceptionService */ private $exceptionService; + /** @var ConfigurationAdapter */ + private $configurationAdapter; public function __construct( Mollie $module, @@ -90,7 +92,8 @@ public function __construct( OrderPaymentFeeHandler $orderPaymentFeeHandler, ShipmentSenderHandlerInterface $shipmentSenderHandler, PrestaLoggerInterface $logger, - ExceptionService $exceptionService + ExceptionService $exceptionService, + ConfigurationAdapter $configurationAdapter ) { $this->module = $module; $this->orderStatusService = $orderStatusService; @@ -102,6 +105,7 @@ public function __construct( $this->shipmentSenderHandler = $shipmentSenderHandler; $this->logger = $logger; $this->exceptionService = $exceptionService; + $this->configurationAdapter = $configurationAdapter; } /** @@ -121,7 +125,7 @@ public function __construct( public function processTransaction($apiPayment) { if (empty($apiPayment)) { - if (Configuration::get(Config::MOLLIE_DEBUG_LOG) >= Config::DEBUG_LOG_ERRORS) { + if ($this->configurationAdapter->get(Config::MOLLIE_DEBUG_LOG) >= Config::DEBUG_LOG_ERRORS) { PrestaShopLogger::addLog(__METHOD__ . ' said: Received webhook request without proper transaction ID.', Config::WARNING); } @@ -218,10 +222,10 @@ public function processTransaction($apiPayment) throw new TransactionException('Cart id is missing in transaction metadata', HttpStatusCode::HTTP_UNPROCESSABLE_ENTITY); } - $isKlarnaOrder = in_array($apiPayment->method, Config::KLARNA_PAYMENTS, false); + $isAuthorizablePayment = in_array($apiPayment->method, Config::AUTHORIZABLE_PAYMENTS, false); if (!$orderId && $isPaymentFinished) { - $orderId = $this->orderCreationHandler->createOrder($apiPayment, $cart->id, $isKlarnaOrder); + $orderId = $this->orderCreationHandler->createOrder($apiPayment, $cart->id, $isAuthorizablePayment); if (!$orderId) { throw new TransactionException('Order is already created', HttpStatusCode::HTTP_METHOD_NOT_ALLOWED); @@ -272,9 +276,16 @@ public function processTransaction($apiPayment) $this->handleOrderDescription($apiPayment); } } else { - $isKlarnaDefault = Configuration::get(Config::MOLLIE_KLARNA_INVOICE_ON) === Config::MOLLIE_STATUS_DEFAULT; - if (in_array($apiPayment->method, Config::KLARNA_PAYMENTS) && !$isKlarnaDefault && $apiPayment->status === OrderStatus::STATUS_COMPLETED) { - $this->orderStatusService->setOrderStatus($orderId, Config::MOLLIE_STATUS_KLARNA_SHIPPED); + $isAuthorizablePaymentInvoiceOnStatusDefault = + $this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS) + === Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT; + + if ( + !$isAuthorizablePaymentInvoiceOnStatusDefault + && $apiPayment->status === OrderStatus::STATUS_COMPLETED + && in_array($apiPayment->method, Config::AUTHORIZABLE_PAYMENTS, true) + ) { + $this->orderStatusService->setOrderStatus($orderId, Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED); } else { $this->orderStatusService->setOrderStatus($orderId, $apiPayment->status); } @@ -295,7 +306,7 @@ public function processTransaction($apiPayment) $this->savePaymentStatus($apiPayment->id, $apiPayment->status, $orderId); // Log successful webhook requests in extended log mode only - if (Config::DEBUG_LOG_ALL == Configuration::get(Config::MOLLIE_DEBUG_LOG)) { + if (Config::DEBUG_LOG_ALL == $this->configurationAdapter->get(Config::MOLLIE_DEBUG_LOG)) { PrestaShopLogger::addLog(__METHOD__ . ' said: Received webhook request for order ' . (int) $orderId . ' / transaction ' . $apiPayment->id, Config::NOTICE); } @@ -379,7 +390,7 @@ private function savePaymentStatus($transactionId, $status, $orderId) throw $e; } - if (!$result && Configuration::get(Config::MOLLIE_DEBUG_LOG) >= Config::DEBUG_LOG_ERRORS) { + if (!$result && $this->configurationAdapter->get(Config::MOLLIE_DEBUG_LOG) >= Config::DEBUG_LOG_ERRORS) { PrestaShopLogger::addLog(__METHOD__ . ' said: Could not save Mollie payment status for transaction "' . $transactionId . '". Reason: ' . Db::getInstance()->getMsgError(), Config::WARNING); } @@ -457,7 +468,7 @@ private function updateOrderPayments(array $transactionInfos, $orderReference) private function updateOrderDescription($apiPayment, int $orderId) { - $environment = (int) Configuration::get(Mollie\Config\Config::MOLLIE_ENVIRONMENT); + $environment = (int) $this->configurationAdapter->get(Mollie\Config\Config::MOLLIE_ENVIRONMENT); $paymentMethodId = $this->paymentMethodRepository->getPaymentMethodIdByMethodId($apiPayment->method, $environment); $paymentMethodObj = new MolPaymentMethod((int) $paymentMethodId); $orderNumber = TextGeneratorUtility::generateDescriptionFromCart($paymentMethodObj->description, $orderId); @@ -479,7 +490,7 @@ private function updatePaymentDescription(Payment $apiPayment, int $orderId): Pa if (!$orderId) { throw new TransactionException('Order does not exist', HttpStatusCode::HTTP_METHOD_NOT_ALLOWED); } - $environment = (int) Configuration::get(Mollie\Config\Config::MOLLIE_ENVIRONMENT); + $environment = (int) $this->configurationAdapter->get(Mollie\Config\Config::MOLLIE_ENVIRONMENT); $paymentMethodId = $this->paymentMethodRepository->getPaymentMethodIdByMethodId($apiPayment->method, $environment); $paymentMethodObj = new MolPaymentMethod((int) $paymentMethodId); $apiPayment->description = TextGeneratorUtility::generateDescriptionFromCart($paymentMethodObj->description, $orderId); diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php index 1a9fbc39e..9c149eb9b 100644 --- a/src/ServiceProvider/BaseServiceProvider.php +++ b/src/ServiceProvider/BaseServiceProvider.php @@ -49,6 +49,8 @@ use Mollie\Repository\CartRuleRepositoryInterface; use Mollie\Repository\CurrencyRepository; use Mollie\Repository\CurrencyRepositoryInterface; +use Mollie\Repository\CustomerRepository; +use Mollie\Repository\CustomerRepositoryInterface; use Mollie\Repository\GenderRepository; use Mollie\Repository\GenderRepositoryInterface; use Mollie\Repository\MolCustomerRepository; @@ -72,6 +74,7 @@ use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation; use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation\AmountPaymentMethodRestrictionValidator; use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation\ApplePayPaymentMethodRestrictionValidator; +use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation\B2bPaymentMethodRestrictionValidator; use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation\BasePaymentMethodRestrictionValidator; use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation\EnvironmentVersionSpecificPaymentMethodRestrictionValidator; use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidation\VoucherPaymentMethodRestrictionValidator; @@ -171,6 +174,7 @@ public function register(Container $container) $this->addService($container, CartRuleRepositoryInterface::class, $container->get(CartRuleRepository::class)); $this->addService($container, OrderRepositoryInterface::class, $container->get(OrderRepository::class)); $this->addService($container, CurrencyRepositoryInterface::class, $container->get(CurrencyRepository::class)); + $this->addService($container, CustomerRepositoryInterface::class, $container->get(CustomerRepository::class)); $this->addService($container, MolOrderPaymentFeeRepositoryInterface::class, $container->get(MolOrderPaymentFeeRepository::class)); $this->addService($container, CartRuleQuantityChangeHandlerInterface::class, $container->get(CartRuleQuantityChangeHandler::class)); @@ -192,6 +196,7 @@ public function register(Container $container) $container->get(EnvironmentVersionSpecificPaymentMethodRestrictionValidator::class), $container->get(ApplePayPaymentMethodRestrictionValidator::class), $container->get(AmountPaymentMethodRestrictionValidator::class), + $container->get(B2bPaymentMethodRestrictionValidator::class), ]); $this->addService($container, CustomLogoProviderInterface::class, $container->get(CreditCardLogoProvider::class)); diff --git a/src/Validator/OrderConfMailValidator.php b/src/Validator/OrderConfMailValidator.php index a8901029e..3823dce05 100644 --- a/src/Validator/OrderConfMailValidator.php +++ b/src/Validator/OrderConfMailValidator.php @@ -59,7 +59,7 @@ private function validateOrderState($orderStateId) return true; } - if ((int) $this->configurationAdapter->get(Config::MOLLIE_STATUS_KLARNA_AUTHORIZED) === $orderStateId) { + if ((int) $this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED) === $orderStateId) { return true; } diff --git a/tests/Integration/Factory/AddressFactory.php b/tests/Integration/Factory/AddressFactory.php new file mode 100644 index 000000000..7d3321697 --- /dev/null +++ b/tests/Integration/Factory/AddressFactory.php @@ -0,0 +1,28 @@ +firstname = $data['first_name'] ?? 'test-first-name'; + $address->lastname = $data['last_name'] ?? 'test-last-name'; + $address->country = $data['country'] ?? 'test-country'; + $address->id_country = $data['id_country'] ?? \Configuration::get('PS_COUNTRY_DEFAULT'); + $address->city = $data['city'] ?? 'test-city'; + $address->postcode = $data['postcode'] ?? '97222'; //max 12 chars + $address->address1 = $data['address1'] ?? 'test-address1'; + $address->address2 = $data['address2'] ?? 'test-address2'; + $address->phone_mobile = $data['phone_mobile'] ?? '5555555'; //letters or symbols cause errors + $address->alias = $data['alias'] ?? 'test-alias'; + $address->vat_number = $data['vat_number'] ?? 'test-vat'; + $address->company = $data['company'] ?? 'test-company'; + + $address->save(); + + return $address; + } +} diff --git a/tests/Integration/Factory/CarrierFactory.php b/tests/Integration/Factory/CarrierFactory.php new file mode 100644 index 000000000..e77ce0852 --- /dev/null +++ b/tests/Integration/Factory/CarrierFactory.php @@ -0,0 +1,55 @@ +name = $data['name'] ?? 'test-name'; + $carrier->active = $data['active'] ?? true; + $carrier->delay = $data['delay'] ?? '28 days later'; + + //NOTE to if true would add PS_SHIPPING_HANDLING from configuration to shipping price. + $carrier->shipping_handling = $data['shipping_handling'] ?? false; + + //NOTE need to do it like this because otherwise it would not show up as option. + if (isset($data['price']) && !empty((int) $data['price'])) { + $carrier->shipping_method = \Carrier::SHIPPING_METHOD_PRICE; + } else { + $carrier->shipping_method = \Carrier::SHIPPING_METHOD_FREE; + } + + $carrier->shipping_method = $data['shipping_method'] ?? $carrier->shipping_method; + + $carrier->save(); + + $rangePrice = new \RangePrice(); + $rangePrice->id_carrier = $carrier->id; + $rangePrice->delimiter1 = 0; + $rangePrice->delimiter2 = 1; + + $rangePrice->save(); + + $zones = \Zone::getZones(); + $prices = []; + + foreach ($zones as $zone) { + $carrier->addZone($zone['id_zone']); + + $prices[] = [ + 'id_range_price' => $rangePrice->id, + 'id_range_weight' => null, + 'id_carrier' => (int) $carrier->id, + 'id_zone' => (int) $zone['id_zone'], + 'price' => $data['price'] ?? 0, + ]; + } + // enable all zones + $carrier->addDeliveryPrice($prices); + + return $carrier; + } +} diff --git a/tests/Integration/Factory/CartFactory.php b/tests/Integration/Factory/CartFactory.php new file mode 100644 index 000000000..54698b77c --- /dev/null +++ b/tests/Integration/Factory/CartFactory.php @@ -0,0 +1,24 @@ +id_lang = $data['id_lang'] ?? \Configuration::get('PS_LANG_DEFAULT'); + $cart->id_currency = $data['id_currency'] ?? \Configuration::get('PS_CURRENCY_DEFAULT'); + $cart->id_carrier = $data['id_carrier'] ?? CarrierFactory::create()->id; + $cart->id_address_delivery = $data['id_address_delivery'] ?? AddressFactory::create()->id; + $cart->id_address_invoice = $data['id_address_invoice'] ?? AddressFactory::create()->id; + $cart->id_customer = $data['id_customer'] ?? CustomerFactory::create()->id; + + $cart->save(); + + \Context::getContext()->cart = $cart; + + return $cart; + } +} diff --git a/tests/Integration/Factory/CustomerFactory.php b/tests/Integration/Factory/CustomerFactory.php new file mode 100644 index 000000000..0906629b4 --- /dev/null +++ b/tests/Integration/Factory/CustomerFactory.php @@ -0,0 +1,24 @@ +firstname = $data['first_name'] ?? 'test-first-name'; + $customer->lastname = $data['last_name'] ?? 'test-last-name'; + $customer->email = $data['email'] ?? 'test-email@email.com'; + $customer->passwd = $data['passwd'] ?? 'test-passwd'; + $customer->is_guest = $data['is_guest'] ?? false; + $customer->siret = $data['siret'] ?? 'test-siret'; + + $customer->save(); + + \Context::getContext()->customer = $customer; + + return $customer; + } +} diff --git a/tests/Integration/Factory/FactoryInterface.php b/tests/Integration/Factory/FactoryInterface.php new file mode 100644 index 000000000..2b91d48c9 --- /dev/null +++ b/tests/Integration/Factory/FactoryInterface.php @@ -0,0 +1,8 @@ + false, ], [ - 'key' => Config::MOLLIE_STATUS_KLARNA_AUTHORIZED, + 'key' => Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, 'color' => '#8A2BE2', 'sendEmail' => true, 'logable' => true, @@ -97,7 +97,7 @@ public function requiredOrderStatusesDataProvider() 'pdfInvoice' => true, ], [ - 'key' => Config::MOLLIE_STATUS_KLARNA_SHIPPED, + 'key' => Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, 'color' => '#8A2BE2', 'sendEmail' => true, 'logable' => true, diff --git a/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php b/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php new file mode 100644 index 000000000..d04f1b19a --- /dev/null +++ b/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php @@ -0,0 +1,223 @@ +originalB2bValue = (int) Configuration::get('PS_B2B_ENABLE'); + + parent::setUp(); + } + + public function tearDown(): void + { + Configuration::set('PS_B2B_ENABLE', $this->originalB2bValue); + + parent::tearDown(); + } + + public function testItSuccessfullyValidatedIsValid(): void + { + Configuration::set('PS_B2B_ENABLE', 1); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = PaymentMethod::BILLIE; + + $customer = CustomerFactory::create([ + 'siret' => 'test-siret-number', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => 'vat-number', + ]); + + $this->contextBuilder->setCart(CartFactory::create()); + $this->contextBuilder->getContext()->cart->id_address_invoice = $billingAddress->id; + $this->contextBuilder->getContext()->cart->id_customer = $customer->id; + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $this->assertEquals(true, $supports); + $this->assertEquals(true, $valid); + } + + public function testItUnsuccessfullyValidatedIsValidMethodNotSupported(): void + { + Configuration::set('PS_B2B_ENABLE', 1); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = 'not-supported-method'; + + $customer = CustomerFactory::create([ + 'siret' => 'test-siret-number', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => 'vat-number', + ]); + + $this->contextBuilder->setCart(CartFactory::create()); + $this->contextBuilder->getContext()->cart->id_address_invoice = $billingAddress->id; + $this->contextBuilder->getContext()->cart->id_customer = $customer->id; + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $this->assertEquals(false, $supports); + $this->assertEquals(true, $valid); + } + + public function testItUnsuccessfullyValidatedIsValidMissingSiretNumber(): void + { + Configuration::set('PS_B2B_ENABLE', 1); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = PaymentMethod::BILLIE; + + $customer = CustomerFactory::create([ + 'siret' => '', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => 'vat-number', + ]); + + $this->contextBuilder->setCart(CartFactory::create([ + 'id_customer' => $customer->id, + 'id_address_delivery' => $billingAddress->id, + 'id_address_invoice' => $billingAddress->id, + ])); + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $this->assertEquals(true, $supports); + $this->assertEquals(false, $valid); + } + + public function testItUnsuccessfullyValidatedIsValidB2bNotEnabled(): void + { + Configuration::set('PS_B2B_ENABLE', 0); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = PaymentMethod::BILLIE; + + $customer = CustomerFactory::create([ + 'siret' => 'test-siret', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => 'vat-number', + ]); + + $this->contextBuilder->setCart(CartFactory::create([ + 'id_customer' => $customer->id, + 'id_address_delivery' => $billingAddress->id, + 'id_address_invoice' => $billingAddress->id, + ])); + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $this->assertEquals(true, $supports); + $this->assertEquals(false, $valid); + } + + public function testItUnsuccessfullyValidatedIsValidMissingVatNumberInBothAddresses(): void + { + Configuration::set('PS_B2B_ENABLE', 1); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = PaymentMethod::BILLIE; + + $customer = CustomerFactory::create([ + 'siret' => 'test-siret', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => '', + ]); + + $this->contextBuilder->setCart(CartFactory::create([ + 'id_customer' => $customer->id, + 'id_address_delivery' => $billingAddress->id, + 'id_address_invoice' => $billingAddress->id, + ])); + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $this->assertEquals(true, $supports); + $this->assertEquals(false, $valid); + } + + public function testItUnsuccessfullyValidatedIsValidMissingVatNumberInBillingAddress(): void + { + Configuration::set('PS_B2B_ENABLE', 1); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = PaymentMethod::BILLIE; + + $customer = CustomerFactory::create([ + 'siret' => 'test-siret', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => '', + ]); + + $shippingAddress = AddressFactory::create([ + 'vat_number' => 'test-vat-number', + ]); + + $this->contextBuilder->setCart(CartFactory::create([ + 'id_customer' => $customer->id, + 'id_address_delivery' => $shippingAddress->id, + 'id_address_invoice' => $billingAddress->id, + ])); + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $this->assertEquals(true, $supports); + $this->assertEquals(false, $valid); + } +} diff --git a/tests/Unit/Service/PaymentMethod/PaymentMethodRestrictionValidation/VersionSpecificPaymentRestrictionValidationTest.php b/tests/Unit/Service/PaymentMethod/PaymentMethodRestrictionValidation/VersionSpecificPaymentRestrictionValidationTest.php index 2316daf93..4e0b74863 100644 --- a/tests/Unit/Service/PaymentMethod/PaymentMethodRestrictionValidation/VersionSpecificPaymentRestrictionValidationTest.php +++ b/tests/Unit/Service/PaymentMethod/PaymentMethodRestrictionValidation/VersionSpecificPaymentRestrictionValidationTest.php @@ -52,16 +52,10 @@ protected function setUp() /** * @dataProvider getVersionSpecificPaymentRestrictionValidationDataProvider */ - public function testIsValid($isCountriesApplicable, $prestashopVersion, $countryExcluded, $countryAvailable, $expectedResult) + public function testIsValid($isCountriesApplicable, $countryExcluded, $countryAvailable, $expectedResult) { $this->paymentMethod->is_countries_applicable = $isCountriesApplicable; - $this->environmentVersionProvider - ->expects($this->any()) - ->method('getPrestashopVersion') - ->willReturn($prestashopVersion) - ; - $this->methodCountryRepository ->expects($this->any()) ->method('checkIfMethodIsAvailableInCountry') @@ -76,7 +70,6 @@ public function testIsValid($isCountriesApplicable, $prestashopVersion, $country $versionSpecificValidation = new EnvironmentVersionSpecificPaymentMethodRestrictionValidator( $this->context, - $this->environmentVersionProvider, $this->methodCountryRepository ); @@ -90,28 +83,24 @@ public function getVersionSpecificPaymentRestrictionValidationDataProvider() return [ 'All checks pass' => [ 'isCountriesApplicable' => true, - 'prestashopVersion' => '1.7.0.5', 'countryExcluded' => false, 'countryAvailable' => true, 'expectedResult' => true, ], 'Current environment version is not applicable to validation' => [ 'isCountriesApplicable' => true, - 'prestashopVersion' => '1.5.0.1', 'countryExcluded' => false, 'countryAvailable' => true, 'expectedResult' => true, ], 'Method country is not available by not being in available list' => [ 'isCountriesApplicable' => true, - 'prestashopVersion' => '1.7.0.5', 'countryExcluded' => false, 'countryAvailable' => false, 'expectedResult' => false, ], 'Method country is not available by exclusion and not being applicable' => [ 'isCountriesApplicable' => false, - 'prestashopVersion' => '1.7.0.5', 'countryExcluded' => true, 'countryAvailable' => false, 'expectedResult' => false, diff --git a/upgrade/Upgrade-4.2.0.php b/upgrade/Upgrade-4.2.0.php index 69fb17797..50e22f8e8 100644 --- a/upgrade/Upgrade-4.2.0.php +++ b/upgrade/Upgrade-4.2.0.php @@ -10,7 +10,7 @@ */ use Mollie\Config\Config; -use Mollie\Install\Installer; +use Mollie\Install\OrderStateInstaller; use Mollie\Service\OrderStateImageService; if (!defined('_PS_VERSION_')) { @@ -30,14 +30,13 @@ function upgrade_module_4_2_0($module) $segment->setMessage('Mollie upgrade 4.2.0'); $segment->track(); - /** @var Installer $installer */ - $installer = $module->getService(Installer::class); + /** @var OrderStateInstaller $orderStateInstaller */ + $orderStateInstaller = $module->getService(OrderStateInstaller::class); - $installer->klarnaPaymentAuthorizedState(); - $installer->klarnaPaymentShippedState(); + $orderStateInstaller->install(); - $acceptedStatusId = Configuration::get(Config::MOLLIE_STATUS_KLARNA_AUTHORIZED); - Configuration::updateValue(Config::MOLLIE_KLARNA_INVOICE_ON, $acceptedStatusId); + $acceptedStatusId = Configuration::get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED); + Configuration::updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, $acceptedStatusId); $module->registerHook('actionOrderGridQueryBuilderModifier'); $module->registerHook('actionOrderGridDefinitionModifier'); diff --git a/upgrade/Upgrade-6.0.3.php b/upgrade/Upgrade-6.0.3.php new file mode 100644 index 000000000..3acc28d5e --- /dev/null +++ b/upgrade/Upgrade-6.0.3.php @@ -0,0 +1,100 @@ + + * @copyright Mollie B.V. + * @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md + * + * @see https://github.com/mollie/PrestaShop + */ + +use Mollie\Adapter\ConfigurationAdapter; +use Mollie\Config\Config; + +if (!defined('_PS_VERSION_')) { + exit; +} + +function upgrade_module_6_0_3(Mollie $module): bool +{ + updateConfigurationValues603($module); + updateOrderStatusNames603($module); + + return true; +} + +function updateConfigurationValues603(Mollie $module) +{ + /** @var ConfigurationAdapter $configuration */ + $configuration = $module->getService(ConfigurationAdapter::class); + + if ( + !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED)) + && !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED)) + && !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS)) + && empty($configuration->get('MOLLIE_STATUS_KLARNA_AUTHORIZED')) + && empty($configuration->get('MOLLIE_STATUS_KLARNA_SHIPPED')) + && empty($configuration->get('MOLLIE_KLARNA_INVOICE_ON')) + ) { + return; + } + + $klarnaInvoiceOn = $configuration->get('MOLLIE_KLARNA_INVOICE_ON'); + + switch ($klarnaInvoiceOn) { + case 'MOLLIE_STATUS_KLARNA_AUTHORIZED': + $configuration->updateValue( + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED + ); + break; + case 'MOLLIE_STATUS_KLARNA_SHIPPED': + $configuration->updateValue( + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED + ); + break; + default: + $configuration->updateValue( + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT + ); + } + + $configuration->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, (int) $configuration->get('MOLLIE_STATUS_KLARNA_AUTHORIZED')); + $configuration->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, (int) $configuration->get('MOLLIE_STATUS_KLARNA_SHIPPED')); + + $configuration->delete('MOLLIE_STATUS_KLARNA_AUTHORIZED'); + $configuration->delete('MOLLIE_STATUS_KLARNA_SHIPPED'); + $configuration->delete('MOLLIE_KLARNA_INVOICE_ON'); +} + +function updateOrderStatusNames603(Mollie $module) +{ + /** @var ConfigurationAdapter $configuration */ + $configuration = $module->getService(ConfigurationAdapter::class); + + $authorizablePaymentStatusShippedId = (int) $configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED); + $authorizablePaymentStatusShipped = new OrderState((int) $authorizablePaymentStatusShippedId); + + if (is_array($authorizablePaymentStatusShipped->name)) { + foreach ($authorizablePaymentStatusShipped->name as $langId => $name) { + $authorizablePaymentStatusShipped->name[$langId] = 'Order payment shipped'; + } + } + + $authorizablePaymentStatusShipped->save(); + + $authorizablePaymentStatusAuthorizedId = (int) $configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED); + $authorizablePaymentStatusAuthorized = new OrderState((int) $authorizablePaymentStatusAuthorizedId); + + if (is_array($authorizablePaymentStatusAuthorized->name)) { + foreach ($authorizablePaymentStatusAuthorized->name as $langId => $name) { + $authorizablePaymentStatusAuthorized->name[$langId] = 'Order payment authorized'; + } + } + + $authorizablePaymentStatusAuthorized->save(); +} diff --git a/views/templates/admin/invoice_description.tpl b/views/templates/admin/invoice_description.tpl index 59a508daa..03aeeec98 100644 --- a/views/templates/admin/invoice_description.tpl +++ b/views/templates/admin/invoice_description.tpl @@ -7,10 +7,10 @@ * @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md *}

- {l s='Select when to send Klarna invoices' mod='mollie'} + {l s='Select when to create the Order invoice' mod='mollie'}

- {l s='Default: The invoice is created based on Order settings > Statuses. There is no custom status created for Klarna.' mod='mollie'} + {l s='Default: The invoice is created based on Order settings > Statuses. There is no custom status created.' mod='mollie'}

{l s='Authorised: Create a full invoice when the order is authorized. Custom status is created.' mod='mollie'} From 2b45b310c69ebaabf51ef871a5ae7a9ee2171163 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Tue, 29 Aug 2023 14:05:38 +0300 Subject: [PATCH 002/109] PIPRES-316: hookActionFrontControllerAfterInit replacement on deprecated versions (#797) --- mollie.php | 10 ++++++++++ subscription/Install/HookInstaller.php | 12 ++++++++++-- upgrade/Upgrade-6.0.4.php | 27 ++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 upgrade/Upgrade-6.0.4.php diff --git a/mollie.php b/mollie.php index 91cafbee9..3a91c3a28 100755 --- a/mollie.php +++ b/mollie.php @@ -1253,6 +1253,16 @@ public function hookActionObjectAddressDeleteAfter(array $params): void } public function hookActionFrontControllerAfterInit(): void + { + $this->frontControllerAfterInit(); + } + + public function hookActionFrontControllerInitAfter(): void + { + $this->frontControllerAfterInit(); + } + + private function frontControllerAfterInit(): void { if (!$this->context->controller instanceof OrderControllerCore) { return; diff --git a/subscription/Install/HookInstaller.php b/subscription/Install/HookInstaller.php index 26cbab9f2..3240f4585 100644 --- a/subscription/Install/HookInstaller.php +++ b/subscription/Install/HookInstaller.php @@ -5,6 +5,7 @@ namespace Mollie\Subscription\Install; use Mollie; +use Mollie\Utility\PsVersionUtility; class HookInstaller extends AbstractInstaller { @@ -19,8 +20,16 @@ public function __construct( public function install(): bool { + $hooks = $this->getHooks(); + + if (PsVersionUtility::isPsVersionGreaterOrEqualTo(_PS_VERSION_, '1.7.7.0')) { + $hooks[] = 'actionFrontControllerInitAfter'; + } else { + $hooks[] = 'actionFrontControllerAfterInit'; + } + /* @phpstan-ignore-next-line */ - $this->module->registerHook($this->getHooks()); + $this->module->registerHook($hooks); return true; } @@ -39,7 +48,6 @@ private function getHooks(): array 'actionObjectAddressDeleteAfter', 'actionBeforeCartUpdateQty', 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', - 'actionFrontControllerAfterInit', ]; } } diff --git a/upgrade/Upgrade-6.0.4.php b/upgrade/Upgrade-6.0.4.php new file mode 100644 index 000000000..e1f96951b --- /dev/null +++ b/upgrade/Upgrade-6.0.4.php @@ -0,0 +1,27 @@ + + * @copyright Mollie B.V. + * @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md + * + * @see https://github.com/mollie/PrestaShop + */ + +use Mollie\Utility\PsVersionUtility; + +if (!defined('_PS_VERSION_')) { + exit; +} + +function upgrade_module_6_0_4(Mollie $module): bool +{ + if (PsVersionUtility::isPsVersionGreaterOrEqualTo(_PS_VERSION_, '1.7.7.0')) { + $module->unregisterHook('actionFrontControllerAfterInit'); + $module->registerHook('actionFrontControllerInitAfter'); + } + + return true; +} From 2bde6b2f5e83dc2a1226ff68fb40f8211eadd4f8 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Mon, 4 Sep 2023 15:00:15 +0300 Subject: [PATCH 003/109] Version bump and upgrade file fix (#800) --- mollie.php | 2 +- upgrade/Upgrade-6.0.3.php | 100 -------------------------------------- upgrade/Upgrade-6.0.4.php | 80 ++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 101 deletions(-) delete mode 100644 upgrade/Upgrade-6.0.3.php diff --git a/mollie.php b/mollie.php index 3a91c3a28..58e6542db 100755 --- a/mollie.php +++ b/mollie.php @@ -82,7 +82,7 @@ public function __construct() { $this->name = 'mollie'; $this->tab = 'payments_gateways'; - $this->version = '6.0.3'; + $this->version = '6.0.4'; $this->author = 'Mollie B.V.'; $this->need_instance = 1; $this->bootstrap = true; diff --git a/upgrade/Upgrade-6.0.3.php b/upgrade/Upgrade-6.0.3.php deleted file mode 100644 index 3acc28d5e..000000000 --- a/upgrade/Upgrade-6.0.3.php +++ /dev/null @@ -1,100 +0,0 @@ - - * @copyright Mollie B.V. - * @license https://github.com/mollie/PrestaShop/blob/master/LICENSE.md - * - * @see https://github.com/mollie/PrestaShop - */ - -use Mollie\Adapter\ConfigurationAdapter; -use Mollie\Config\Config; - -if (!defined('_PS_VERSION_')) { - exit; -} - -function upgrade_module_6_0_3(Mollie $module): bool -{ - updateConfigurationValues603($module); - updateOrderStatusNames603($module); - - return true; -} - -function updateConfigurationValues603(Mollie $module) -{ - /** @var ConfigurationAdapter $configuration */ - $configuration = $module->getService(ConfigurationAdapter::class); - - if ( - !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED)) - && !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED)) - && !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS)) - && empty($configuration->get('MOLLIE_STATUS_KLARNA_AUTHORIZED')) - && empty($configuration->get('MOLLIE_STATUS_KLARNA_SHIPPED')) - && empty($configuration->get('MOLLIE_KLARNA_INVOICE_ON')) - ) { - return; - } - - $klarnaInvoiceOn = $configuration->get('MOLLIE_KLARNA_INVOICE_ON'); - - switch ($klarnaInvoiceOn) { - case 'MOLLIE_STATUS_KLARNA_AUTHORIZED': - $configuration->updateValue( - Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, - Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED - ); - break; - case 'MOLLIE_STATUS_KLARNA_SHIPPED': - $configuration->updateValue( - Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, - Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED - ); - break; - default: - $configuration->updateValue( - Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, - Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT - ); - } - - $configuration->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, (int) $configuration->get('MOLLIE_STATUS_KLARNA_AUTHORIZED')); - $configuration->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, (int) $configuration->get('MOLLIE_STATUS_KLARNA_SHIPPED')); - - $configuration->delete('MOLLIE_STATUS_KLARNA_AUTHORIZED'); - $configuration->delete('MOLLIE_STATUS_KLARNA_SHIPPED'); - $configuration->delete('MOLLIE_KLARNA_INVOICE_ON'); -} - -function updateOrderStatusNames603(Mollie $module) -{ - /** @var ConfigurationAdapter $configuration */ - $configuration = $module->getService(ConfigurationAdapter::class); - - $authorizablePaymentStatusShippedId = (int) $configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED); - $authorizablePaymentStatusShipped = new OrderState((int) $authorizablePaymentStatusShippedId); - - if (is_array($authorizablePaymentStatusShipped->name)) { - foreach ($authorizablePaymentStatusShipped->name as $langId => $name) { - $authorizablePaymentStatusShipped->name[$langId] = 'Order payment shipped'; - } - } - - $authorizablePaymentStatusShipped->save(); - - $authorizablePaymentStatusAuthorizedId = (int) $configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED); - $authorizablePaymentStatusAuthorized = new OrderState((int) $authorizablePaymentStatusAuthorizedId); - - if (is_array($authorizablePaymentStatusAuthorized->name)) { - foreach ($authorizablePaymentStatusAuthorized->name as $langId => $name) { - $authorizablePaymentStatusAuthorized->name[$langId] = 'Order payment authorized'; - } - } - - $authorizablePaymentStatusAuthorized->save(); -} diff --git a/upgrade/Upgrade-6.0.4.php b/upgrade/Upgrade-6.0.4.php index e1f96951b..497c98904 100644 --- a/upgrade/Upgrade-6.0.4.php +++ b/upgrade/Upgrade-6.0.4.php @@ -10,6 +10,8 @@ * @see https://github.com/mollie/PrestaShop */ +use Mollie\Adapter\ConfigurationAdapter; +use Mollie\Config\Config; use Mollie\Utility\PsVersionUtility; if (!defined('_PS_VERSION_')) { @@ -23,5 +25,83 @@ function upgrade_module_6_0_4(Mollie $module): bool $module->registerHook('actionFrontControllerInitAfter'); } + updateConfigurationValues604($module); + updateOrderStatusNames604($module); + return true; } + +function updateConfigurationValues604(Mollie $module) +{ + /** @var ConfigurationAdapter $configuration */ + $configuration = $module->getService(ConfigurationAdapter::class); + + if ( + !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED)) + && !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED)) + && !empty($configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS)) + && empty($configuration->get('MOLLIE_STATUS_KLARNA_AUTHORIZED')) + && empty($configuration->get('MOLLIE_STATUS_KLARNA_SHIPPED')) + && empty($configuration->get('MOLLIE_KLARNA_INVOICE_ON')) + ) { + return; + } + + $klarnaInvoiceOn = $configuration->get('MOLLIE_KLARNA_INVOICE_ON'); + + switch ($klarnaInvoiceOn) { + case 'MOLLIE_STATUS_KLARNA_AUTHORIZED': + $configuration->updateValue( + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED + ); + break; + case 'MOLLIE_STATUS_KLARNA_SHIPPED': + $configuration->updateValue( + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED + ); + break; + default: + $configuration->updateValue( + Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, + Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_DEFAULT + ); + } + + $configuration->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED, (int) $configuration->get('MOLLIE_STATUS_KLARNA_AUTHORIZED')); + $configuration->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED, (int) $configuration->get('MOLLIE_STATUS_KLARNA_SHIPPED')); + + $configuration->delete('MOLLIE_STATUS_KLARNA_AUTHORIZED'); + $configuration->delete('MOLLIE_STATUS_KLARNA_SHIPPED'); + $configuration->delete('MOLLIE_KLARNA_INVOICE_ON'); +} + +function updateOrderStatusNames604(Mollie $module) +{ + /** @var ConfigurationAdapter $configuration */ + $configuration = $module->getService(ConfigurationAdapter::class); + + $authorizablePaymentStatusShippedId = (int) $configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_SHIPPED); + $authorizablePaymentStatusShipped = new OrderState((int) $authorizablePaymentStatusShippedId); + + if (is_array($authorizablePaymentStatusShipped->name)) { + foreach ($authorizablePaymentStatusShipped->name as $langId => $name) { + $authorizablePaymentStatusShipped->name[$langId] = 'Order payment shipped'; + } + } + + $authorizablePaymentStatusShipped->save(); + + $authorizablePaymentStatusAuthorizedId = (int) $configuration->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_STATUS_AUTHORIZED); + $authorizablePaymentStatusAuthorized = new OrderState((int) $authorizablePaymentStatusAuthorizedId); + + if (is_array($authorizablePaymentStatusAuthorized->name)) { + foreach ($authorizablePaymentStatusAuthorized->name as $langId => $name) { + $authorizablePaymentStatusAuthorized->name[$langId] = 'Order payment authorized'; + } + } + + $authorizablePaymentStatusAuthorized->save(); +} + From d292baa7fa987c40c832568852c617a720236b6c Mon Sep 17 00:00:00 2001 From: mandan2 Date: Mon, 17 Jul 2023 15:11:04 +0300 Subject: [PATCH 004/109] release-6.0.1. --- .github/workflows/E2E_On_PR.yml | 35 +--- Makefile | 59 ++++-- cypress.config.js | 3 +- package-lock.json | 340 +++++--------------------------- package.json | 3 +- 5 files changed, 99 insertions(+), 341 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 218873e4a..5116e0941 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -1,8 +1,8 @@ -name: Cypress E2E Automation [develop branch] +name: Cypress E2E Automation on: pull_request: types: [opened, reopened] - branches: [develop] + branches: '**' concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -17,18 +17,19 @@ jobs: include: - prestashop: 'PS1784' make: 'make e2eh1784' - subdomain: 'demoshop1784' + demoshop: 'demoshop1784' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784.ngrok.io' + url: 'https://demoshop1784.eu.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 + ModuleUpgradeTest: 'make upgrading-module-test-1784' - prestashop: 'PS8' make: 'make e2eh8' - subdomain: 'demoshop8' + demoshop: 'demoshop8' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8.ngrok.io' + url: 'https://demoshop8.eu.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: @@ -42,7 +43,7 @@ jobs: shell: bash - run: ./ngrok authtoken ${{ secrets.NGROK_TOKEN }} shell: bash - - run: ./ngrok http -region=eu -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log & + - run: ./ngrok http -region=eu -subdomain=${{ matrix.demoshop }} ${{ matrix.port }} > ngrok.log & shell: bash - name: Install composer run: composer i @@ -57,22 +58,6 @@ jobs: run: | ${{ matrix.make }} - - name: Waiting for Ngrok tunnel - run: | - URL="${{ matrix.url }}" - - while true; do - response=$(curl -s -o /dev/null -w "%{http_code}" "$URL") - if [ "$response" = "302" ]; then - echo "URL is returning 302 HTTP status code, Ngrok tunnel is reached, good to go!" - break # Exit the loop if the response is 302 - else - echo "URL is not ready yet, because Ngrok sessions are all in use at the moment, please wait. Retrying to build the Ngrok tunnel again in 5 seconds..." - sleep 5 # Wait for 5 seconds before retrying - ./ngrok http -region=us -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log & - fi - done - - name: Running ${{ matrix.prestashop }} Cypress E2E tests run: | export CYPRESS_baseUrl='${{ matrix.url }}' @@ -82,7 +67,7 @@ jobs: export CYPRESS_TESTRAIL_DOMAIN='${{ secrets.TESTRAIL_DOMAIN }}' export CYPRESS_TESTRAIL_USERNAME='${{ secrets.TESTRAIL_USERNAME }}' export CYPRESS_TESTRAIL_PASSWORD='${{ secrets.TESTRAIL_PASSWORD }}' - npm install -D cypress + npm install cypress@12.15.0 npm ci npx cypress run --spec "${{ matrix.test_spec }}" --browser chrome @@ -90,7 +75,7 @@ jobs: if: ${{ always() }} uses: actions/upload-artifact@v2 with: - name: Cypress_Mollie_videos_screenshots_${{ matrix.prestashop }} + name: videos_screenshots retention-days: 2 path: | cypress/videos diff --git a/Makefile b/Makefile index 638391116..3bd83ddb1 100755 --- a/Makefile +++ b/Makefile @@ -5,46 +5,65 @@ fix-lint: docker-compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no" #PS1784 -e2eh1784: +e2eh1784: test-e2e-headless-1784 +test-e2e-headless-1784: + make e2e1784p + +e2e1784p: e2e-1784-prepare +e2e-1784-prepare: # detaching containers docker-compose -f docker-compose.1784.yml up -d --force-recreate # sees what containers are running docker-compose -f docker-compose.1784.yml ps # waits for mysql to load /bin/bash .docker/wait-for-container.sh mysql-mollie-1784 + # preloads initial data + make bps1784 + /bin/bash .docker/wait-for-container.sh prestashop-mollie-1784 + +bps1784: build-ps-1784 +build-ps-1784: # configuring your prestashop docker exec -i prestashop-mollie-1784 sh -c "rm -rf /var/www/html/install" # configuring base database mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1784_2.sql # installing module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # uninstalling module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" # installing the module again - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=3" - # enabling the module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # chmod all folders docker exec -i prestashop-mollie-1784 sh -c "chmod -R 777 /var/www/html" #PS8 -e2eh8: +e2eh8: test-e2e-headless-8 +test-e2e-headless-8: + make e2e8p + +e2e8p: e2e-8-prepare +e2e-8-prepare: # detaching containers docker-compose -f docker-compose.8.yml up -d --force-recreate # sees what containers are running docker-compose -f docker-compose.8.yml ps # waits for mysql to load /bin/bash .docker/wait-for-container.sh mysql-mollie-8 + # preloads initial data + make bps8 + +bps8: build-ps-8 +build-ps-8: # configuring your prestashop docker exec -i prestashop-mollie-8 sh -c "rm -rf /var/www/html/install" # configuring base database mysql -h 127.0.0.1 -P 9459 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_8.sql # installing module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # uninstalling module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" # installing the module again - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # enabling the module docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie --id_shop=2" # chmod all folders @@ -54,18 +73,26 @@ npm-package-install: cd views/assets && npm i && npm run build run-e2e-tests-locally: - npm install -D cypress + npm install cypress@12.15.0 npm ci npx cypress run - + # checking the module upgrading - installs older module then installs from master branch upgrading-module-test-1784: git fetch - git checkout v5.2.0 . + git checkout origin/v5.2.1 . composer install - # installing 5.2.0 module + # installing 5.2.1 module docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" - # installing develop branch module git checkout -- . - git checkout develop --force + git checkout master --force docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + +upgrading-module-test-8: + git fetch + git checkout origin/v5.2.1 . + composer install + make e2e8p + git checkout -- . + git checkout master --force + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" diff --git a/cypress.config.js b/cypress.config.js index a15ae6978..26ec284cf 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -4,7 +4,7 @@ module.exports = defineConfig({ chromeWebSecurity: false, experimentalMemoryManagement: true, experimentalSourceRewriting: true, - numTestsKeptInMemory: 0, + numTestsKeptInMemory: 3, defaultCommandTimeout: 15000, projectId: 'xb89dr', retries: 3, @@ -18,7 +18,6 @@ module.exports = defineConfig({ setupNodeEvents(on, config) { require('./cypress/plugins/index.js')(on, config) require("cypress-fail-fast/plugin")(on, config); - require('cypress-terminal-report/src/installLogsPrinter')(on); return config; }, // setupNodeEvents(on, config) { diff --git a/package-lock.json b/package-lock.json index 16dfa7d24..28b82889a 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,9 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^12.17.2", + "cypress": "^12.15.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", - "cypress-terminal-report": "^5.3.2", "cypress-testrail": "^2.7.1", "human-signals": "^3.0.1" } @@ -28,9 +27,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.10", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", + "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -46,7 +45,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", @@ -262,9 +261,9 @@ } }, "node_modules/aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, "node_modules/axios": { @@ -390,19 +389,6 @@ "node": ">=6" } }, - "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -706,13 +692,13 @@ } }, "node_modules/cypress": { - "version": "12.17.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", - "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", + "version": "12.15.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.15.0.tgz", + "integrity": "sha512-FqGbxsH+QgjStuTO9onXMIeF44eOrgVwPvlcvuzLIaePQMkl72YgBvpuHlBGRcrw3Q4SvqKfajN8iV5XWShAiQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.11", + "@cypress/request": "^2.88.10", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "8.1.1", @@ -749,7 +735,7 @@ "pretty-bytes": "^5.6.0", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.5.3", + "semver": "^7.3.2", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -786,36 +772,6 @@ "@types/cypress": "^1.1.0" } }, - "node_modules/cypress-terminal-report": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.2.tgz", - "integrity": "sha512-0Gf/pXjrYpTkf2aR3LAFGoxEM0KulWsMKCu+52YJB6l7GEP2RLAOAr32tcZHZiL2EWnS0vE4ollomMzGvCci0w==", - "dev": true, - "dependencies": { - "chalk": "^4.0.0", - "fs-extra": "^10.1.0", - "safe-json-stringify": "^1.2.0", - "semver": "^7.3.5", - "tv4": "^1.3.0" - }, - "peerDependencies": { - "cypress": ">=10.0.0" - } - }, - "node_modules/cypress-terminal-report/node_modules/fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "dependencies": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/cypress-testrail": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.7.1.tgz", @@ -1110,27 +1066,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -1205,18 +1140,6 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, - "engines": { - "node": ">= 0.4.0" - } - }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1226,30 +1149,6 @@ "node": ">=8" } }, - "node_modules/has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/http-signature": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", @@ -1660,15 +1559,6 @@ "node": ">=8" } }, - "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1788,27 +1678,21 @@ } }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true, "engines": { "node": ">=6" } }, "node_modules/qs": { - "version": "6.10.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", - "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", "dev": true, - "dependencies": { - "side-channel": "^1.0.4" - }, "engines": { "node": ">=0.6" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" } }, "node_modules/request-progress": { @@ -1883,12 +1767,6 @@ } ] }, - "node_modules/safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "dev": true - }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -1896,9 +1774,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1931,20 +1809,6 @@ "node": ">=8" } }, - "node_modules/side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -2095,15 +1959,6 @@ "node": "*" } }, - "node_modules/tv4": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", - "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", - "dev": true, - "engines": { - "node": ">= 0.8.0" - } - }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -2227,9 +2082,9 @@ "optional": true }, "@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.10", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", + "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -2245,7 +2100,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "~6.5.2", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", @@ -2409,9 +2264,9 @@ "dev": true }, "aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", + "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", "dev": true }, "axios": { @@ -2502,16 +2357,6 @@ "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", "dev": true }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -2753,12 +2598,12 @@ } }, "cypress": { - "version": "12.17.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", - "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", + "version": "12.15.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.15.0.tgz", + "integrity": "sha512-FqGbxsH+QgjStuTO9onXMIeF44eOrgVwPvlcvuzLIaePQMkl72YgBvpuHlBGRcrw3Q4SvqKfajN8iV5XWShAiQ==", "dev": true, "requires": { - "@cypress/request": "^2.88.11", + "@cypress/request": "^2.88.10", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "8.1.1", @@ -2795,7 +2640,7 @@ "pretty-bytes": "^5.6.0", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.5.3", + "semver": "^7.3.2", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -2818,32 +2663,6 @@ "dev": true, "requires": {} }, - "cypress-terminal-report": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.2.tgz", - "integrity": "sha512-0Gf/pXjrYpTkf2aR3LAFGoxEM0KulWsMKCu+52YJB6l7GEP2RLAOAr32tcZHZiL2EWnS0vE4ollomMzGvCci0w==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "fs-extra": "^10.1.0", - "safe-json-stringify": "^1.2.0", - "semver": "^7.3.5", - "tv4": "^1.3.0" - }, - "dependencies": { - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - } - } - }, "cypress-testrail": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.7.1.tgz", @@ -3064,24 +2883,6 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" - } - }, "get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -3138,33 +2939,12 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, - "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, "http-signature": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", @@ -3463,12 +3243,6 @@ "path-key": "^3.0.0" } }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true - }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -3561,19 +3335,16 @@ } }, "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, "qs": { - "version": "6.10.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", - "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", - "dev": true, - "requires": { - "side-channel": "^1.0.4" - } + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "dev": true }, "request-progress": { "version": "3.0.0", @@ -3624,12 +3395,6 @@ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, - "safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "dev": true - }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -3637,9 +3402,9 @@ "dev": true }, "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.8", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", + "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -3660,17 +3425,6 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -3786,12 +3540,6 @@ "safe-buffer": "^5.0.1" } }, - "tv4": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", - "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", - "dev": true - }, "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", diff --git a/package.json b/package.json index 1c5ed70ab..fc3ecf856 100755 --- a/package.json +++ b/package.json @@ -20,10 +20,9 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { - "cypress": "^12.17.2", + "cypress": "^12.15.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", - "cypress-terminal-report": "^5.3.2", "cypress-testrail": "^2.7.1", "human-signals": "^3.0.1" } From 68b18401fe26ec8e064b7252ffe0baa139603b29 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 17 Jul 2023 15:46:34 +0300 Subject: [PATCH 005/109] updating the e2e on PR yml targeting `develop` branch for E2E testing --- .github/workflows/E2E_On_PR.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 5116e0941..206930792 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -1,8 +1,8 @@ -name: Cypress E2E Automation +name: Cypress E2E Automation [develop branch] on: pull_request: types: [opened, reopened] - branches: '**' + branches: [develop] concurrency: group: ${{ github.workflow }}-${{ github.ref }} @@ -23,7 +23,6 @@ jobs: url: 'https://demoshop1784.eu.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - ModuleUpgradeTest: 'make upgrading-module-test-1784' - prestashop: 'PS8' make: 'make e2eh8' demoshop: 'demoshop8' @@ -67,7 +66,7 @@ jobs: export CYPRESS_TESTRAIL_DOMAIN='${{ secrets.TESTRAIL_DOMAIN }}' export CYPRESS_TESTRAIL_USERNAME='${{ secrets.TESTRAIL_USERNAME }}' export CYPRESS_TESTRAIL_PASSWORD='${{ secrets.TESTRAIL_PASSWORD }}' - npm install cypress@12.15.0 + npm install -D cypress npm ci npx cypress run --spec "${{ matrix.test_spec }}" --browser chrome @@ -75,7 +74,7 @@ jobs: if: ${{ always() }} uses: actions/upload-artifact@v2 with: - name: videos_screenshots + name: Cypress_Mollie_videos_screenshots_${{ matrix.prestashop }} retention-days: 2 path: | cypress/videos From de5ab2bdccfa5789381ae1e16e67a5ec8ee863c8 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 13:16:54 +0300 Subject: [PATCH 006/109] adding Ngrok launch fix preventing the failing CI, while Ngrok is busy --- .github/workflows/E2E_On_PR.yml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 206930792..8a8c53a45 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -17,7 +17,7 @@ jobs: include: - prestashop: 'PS1784' make: 'make e2eh1784' - demoshop: 'demoshop1784' + subdomain: 'demoshop1784' port: '8002' yml: 'docker-compose.1784.yml' url: 'https://demoshop1784.eu.ngrok.io' @@ -25,7 +25,7 @@ jobs: TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' - demoshop: 'demoshop8' + subdomain: 'demoshop8' port: '8142' yml: 'docker-compose.8.yml' url: 'https://demoshop8.eu.ngrok.io' @@ -57,6 +57,22 @@ jobs: run: | ${{ matrix.make }} + - name: Waiting for Ngrok tunnel + run: | + URL="${{ matrix.url }}" + + while true; do + response=$(curl -s -o /dev/null -w "%{http_code}" "$URL") + if [ "$response" = "302" ]; then + echo "URL is returning 302 HTTP status code, Ngrok tunnel is reached, good to go!" + break # Exit the loop if the response is 302 + else + echo "URL is not ready yet, because Ngrok sessions are all in use at the moment, please wait. Retrying to build the Ngrok tunnel again in 5 seconds..." + sleep 5 # Wait for 5 seconds before retrying + ./ngrok http -region=us -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log & + fi + done + - name: Running ${{ matrix.prestashop }} Cypress E2E tests run: | export CYPRESS_baseUrl='${{ matrix.url }}' From a43261d581ce1d501bfb0b7620477f6a332173c8 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 13:24:15 +0300 Subject: [PATCH 007/109] small yml fix --- .github/workflows/E2E_On_PR.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 8a8c53a45..218873e4a 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -20,7 +20,7 @@ jobs: subdomain: 'demoshop1784' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784.eu.ngrok.io' + url: 'https://demoshop1784.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - prestashop: 'PS8' @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8.eu.ngrok.io' + url: 'https://demoshop8.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: @@ -42,7 +42,7 @@ jobs: shell: bash - run: ./ngrok authtoken ${{ secrets.NGROK_TOKEN }} shell: bash - - run: ./ngrok http -region=eu -subdomain=${{ matrix.demoshop }} ${{ matrix.port }} > ngrok.log & + - run: ./ngrok http -region=eu -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log & shell: bash - name: Install composer run: composer i From 1a5344436940747180dfcccb2d41d931b2f86b1d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 13:38:54 +0300 Subject: [PATCH 008/109] fixing the module upgrade CI testing --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 3bd83ddb1..39836c509 100755 --- a/Makefile +++ b/Makefile @@ -73,26 +73,26 @@ npm-package-install: cd views/assets && npm i && npm run build run-e2e-tests-locally: - npm install cypress@12.15.0 + npm install -D cypress npm ci npx cypress run - + # checking the module upgrading - installs older module then installs from master branch upgrading-module-test-1784: git fetch - git checkout origin/v5.2.1 . + git checkout origin/v5.2.0 . composer install - # installing 5.2.1 module + # installing 5.2.0 module docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" git checkout -- . - git checkout master --force + git checkout develop --force docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" upgrading-module-test-8: git fetch - git checkout origin/v5.2.1 . + git checkout origin/v5.2.0 . composer install make e2e8p git checkout -- . - git checkout master --force + git checkout develop --force docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" From 3897dfdc5a686e89ad19f7f4d1480eb8ddd0ca24 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 13:51:13 +0300 Subject: [PATCH 009/109] small fix --- Makefile | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 39836c509..3f044e201 100755 --- a/Makefile +++ b/Makefile @@ -5,24 +5,13 @@ fix-lint: docker-compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no" #PS1784 -e2eh1784: test-e2e-headless-1784 -test-e2e-headless-1784: - make e2e1784p - -e2e1784p: e2e-1784-prepare -e2e-1784-prepare: +e2eh1784: # detaching containers docker-compose -f docker-compose.1784.yml up -d --force-recreate # sees what containers are running docker-compose -f docker-compose.1784.yml ps # waits for mysql to load /bin/bash .docker/wait-for-container.sh mysql-mollie-1784 - # preloads initial data - make bps1784 - /bin/bash .docker/wait-for-container.sh prestashop-mollie-1784 - -bps1784: build-ps-1784 -build-ps-1784: # configuring your prestashop docker exec -i prestashop-mollie-1784 sh -c "rm -rf /var/www/html/install" # configuring base database @@ -37,23 +26,13 @@ build-ps-1784: docker exec -i prestashop-mollie-1784 sh -c "chmod -R 777 /var/www/html" #PS8 -e2eh8: test-e2e-headless-8 -test-e2e-headless-8: - make e2e8p - -e2e8p: e2e-8-prepare -e2e-8-prepare: +e2eh8: # detaching containers docker-compose -f docker-compose.8.yml up -d --force-recreate # sees what containers are running docker-compose -f docker-compose.8.yml ps # waits for mysql to load /bin/bash .docker/wait-for-container.sh mysql-mollie-8 - # preloads initial data - make bps8 - -bps8: build-ps-8 -build-ps-8: # configuring your prestashop docker exec -i prestashop-mollie-8 sh -c "rm -rf /var/www/html/install" # configuring base database From 71b827ef02fd375231c6bd7af3e247480b94dc8d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 13:54:23 +0300 Subject: [PATCH 010/109] upgrading text fix --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3f044e201..391c399b0 100755 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ run-e2e-tests-locally: # checking the module upgrading - installs older module then installs from master branch upgrading-module-test-1784: git fetch - git checkout origin/v5.2.0 . + git checkout v5.2.0 . composer install # installing 5.2.0 module docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" @@ -69,7 +69,7 @@ upgrading-module-test-1784: upgrading-module-test-8: git fetch - git checkout origin/v5.2.0 . + git checkout v5.2.0 . composer install make e2e8p git checkout -- . From 15a29a3b821f9f14e4dfe332e96d26acfde385a9 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 14:13:08 +0300 Subject: [PATCH 011/109] test fixes --- Makefile | 1 - cypress/e2e/ps1784/02_mollie.ps1784.specs.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 391c399b0..698d7723b 100755 --- a/Makefile +++ b/Makefile @@ -71,7 +71,6 @@ upgrading-module-test-8: git fetch git checkout v5.2.0 . composer install - make e2e8p git checkout -- . git checkout develop --force docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js index 323d9917c..8ff42df27 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js @@ -263,7 +263,7 @@ it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { it('C339353: 16 Klarna Pay Now Order BO Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) -it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { +it('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Enabling the Single-Click for now cy.visit('/admin1/') cy.OpenModuleDashboard() From ef325711297606106b98cf55733ca66ea75546e7 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 14:31:25 +0300 Subject: [PATCH 012/109] small fix --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 698d7723b..aa34d94dc 100755 --- a/Makefile +++ b/Makefile @@ -63,6 +63,7 @@ upgrading-module-test-1784: composer install # installing 5.2.0 module docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + # installing develop branch module git checkout -- . git checkout develop --force docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" @@ -71,6 +72,9 @@ upgrading-module-test-8: git fetch git checkout v5.2.0 . composer install + # installing 5.2.0 module + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + # installing develop branch module git checkout -- . git checkout develop --force docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" From 74421a8f8d989efcd5689439325e4ac35c0c71d6 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 24 Jul 2023 17:23:43 +0300 Subject: [PATCH 013/109] removing the PS8 CI upgrading test because 5.2.0 was incompatible with PS8x --- Makefile | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Makefile b/Makefile index aa34d94dc..7fefb0edd 100755 --- a/Makefile +++ b/Makefile @@ -67,14 +67,3 @@ upgrading-module-test-1784: git checkout -- . git checkout develop --force docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" - -upgrading-module-test-8: - git fetch - git checkout v5.2.0 . - composer install - # installing 5.2.0 module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" - # installing develop branch module - git checkout -- . - git checkout develop --force - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" From ec97be4016dba4e143a8b8796a1e886d9fd9f90c Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 31 Jul 2023 12:09:18 +0300 Subject: [PATCH 014/109] cypress upgrading --- package-lock.json | 256 ++++++++++++++++++++++++++++++++++++++-------- package.json | 2 +- 2 files changed, 213 insertions(+), 45 deletions(-) diff --git a/package-lock.json b/package-lock.json index 28b82889a..3264e378c 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^12.15.0", + "cypress": "^12.17.2", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-testrail": "^2.7.1", @@ -27,9 +27,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.10", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", - "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", + "version": "2.88.11", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", + "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -45,7 +45,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.5.2", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", @@ -261,9 +261,9 @@ } }, "node_modules/aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", "dev": true }, "node_modules/axios": { @@ -389,6 +389,19 @@ "node": ">=6" } }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -692,13 +705,13 @@ } }, "node_modules/cypress": { - "version": "12.15.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.15.0.tgz", - "integrity": "sha512-FqGbxsH+QgjStuTO9onXMIeF44eOrgVwPvlcvuzLIaePQMkl72YgBvpuHlBGRcrw3Q4SvqKfajN8iV5XWShAiQ==", + "version": "12.17.2", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", + "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^2.88.11", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "8.1.1", @@ -735,7 +748,7 @@ "pretty-bytes": "^5.6.0", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -1066,6 +1079,27 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "node_modules/get-intrinsic": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -1140,6 +1174,18 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -1149,6 +1195,30 @@ "node": ">=8" } }, + "node_modules/has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/http-signature": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", @@ -1559,6 +1629,15 @@ "node": ">=8" } }, + "node_modules/object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -1678,21 +1757,27 @@ } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true, "engines": { "node": ">=6" } }, "node_modules/qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", + "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, "engines": { "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/request-progress": { @@ -1774,9 +1859,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" @@ -1809,6 +1894,20 @@ "node": ">=8" } }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -2082,9 +2181,9 @@ "optional": true }, "@cypress/request": { - "version": "2.88.10", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz", - "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==", + "version": "2.88.11", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", + "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -2100,7 +2199,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.5.2", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", @@ -2264,9 +2363,9 @@ "dev": true }, "aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", + "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", "dev": true }, "axios": { @@ -2357,6 +2456,16 @@ "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", "dev": true }, + "call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + } + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -2598,12 +2707,12 @@ } }, "cypress": { - "version": "12.15.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.15.0.tgz", - "integrity": "sha512-FqGbxsH+QgjStuTO9onXMIeF44eOrgVwPvlcvuzLIaePQMkl72YgBvpuHlBGRcrw3Q4SvqKfajN8iV5XWShAiQ==", + "version": "12.17.2", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", + "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", "dev": true, "requires": { - "@cypress/request": "^2.88.10", + "@cypress/request": "^2.88.11", "@cypress/xvfb": "^1.2.4", "@types/node": "^14.14.31", "@types/sinonjs__fake-timers": "8.1.1", @@ -2640,7 +2749,7 @@ "pretty-bytes": "^5.6.0", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", - "semver": "^7.3.2", + "semver": "^7.5.3", "supports-color": "^8.1.1", "tmp": "~0.2.1", "untildify": "^4.0.0", @@ -2883,6 +2992,24 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", + "dev": true + }, + "get-intrinsic": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", + "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-proto": "^1.0.1", + "has-symbols": "^1.0.3" + } + }, "get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -2939,12 +3066,33 @@ "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "dev": true }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, "has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "has-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", + "dev": true + }, + "has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true + }, "http-signature": { "version": "1.3.6", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", @@ -3243,6 +3391,12 @@ "path-key": "^3.0.0" } }, + "object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "dev": true + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -3335,16 +3489,19 @@ } }, "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", + "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", "dev": true }, "qs": { - "version": "6.5.3", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", - "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", - "dev": true + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", + "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } }, "request-progress": { "version": "3.0.0", @@ -3402,9 +3559,9 @@ "dev": true }, "semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "requires": { "lru-cache": "^6.0.0" @@ -3425,6 +3582,17 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", diff --git a/package.json b/package.json index fc3ecf856..9b21c423d 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { - "cypress": "^12.15.0", + "cypress": "^12.17.2", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-testrail": "^2.7.1", From 0f3fdcbdbb2d7654b912bc92ac585db3ff844b93 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 31 Jul 2023 14:53:53 +0300 Subject: [PATCH 015/109] useful E2E test spec updates --- Makefile | 14 ++++++++------ cypress.config.js | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 7fefb0edd..638391116 100755 --- a/Makefile +++ b/Makefile @@ -17,11 +17,13 @@ e2eh1784: # configuring base database mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1784_2.sql # installing module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=3" # uninstalling module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie --id_shop=3" # installing the module again - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=3" + # enabling the module + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie --id_shop=3" # chmod all folders docker exec -i prestashop-mollie-1784 sh -c "chmod -R 777 /var/www/html" @@ -38,11 +40,11 @@ e2eh8: # configuring base database mysql -h 127.0.0.1 -P 9459 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_8.sql # installing module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=2" # uninstalling module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie --id_shop=2" # installing the module again - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=2" # enabling the module docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie --id_shop=2" # chmod all folders diff --git a/cypress.config.js b/cypress.config.js index 26ec284cf..f0988a6c9 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -4,7 +4,7 @@ module.exports = defineConfig({ chromeWebSecurity: false, experimentalMemoryManagement: true, experimentalSourceRewriting: true, - numTestsKeptInMemory: 3, + numTestsKeptInMemory: 0, defaultCommandTimeout: 15000, projectId: 'xb89dr', retries: 3, From d5ce019c4ea5029869f1a7eb670f8900ca133865 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 1 Aug 2023 09:30:43 +0300 Subject: [PATCH 016/109] adding improved Cypress terminal logs --- cypress.config.js | 1 + package-lock.json | 84 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 1 + 3 files changed, 86 insertions(+) diff --git a/cypress.config.js b/cypress.config.js index f0988a6c9..a15ae6978 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -18,6 +18,7 @@ module.exports = defineConfig({ setupNodeEvents(on, config) { require('./cypress/plugins/index.js')(on, config) require("cypress-fail-fast/plugin")(on, config); + require('cypress-terminal-report/src/installLogsPrinter')(on); return config; }, // setupNodeEvents(on, config) { diff --git a/package-lock.json b/package-lock.json index 3264e378c..16dfa7d24 100755 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "cypress": "^12.17.2", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", + "cypress-terminal-report": "^5.3.2", "cypress-testrail": "^2.7.1", "human-signals": "^3.0.1" } @@ -785,6 +786,36 @@ "@types/cypress": "^1.1.0" } }, + "node_modules/cypress-terminal-report": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.2.tgz", + "integrity": "sha512-0Gf/pXjrYpTkf2aR3LAFGoxEM0KulWsMKCu+52YJB6l7GEP2RLAOAr32tcZHZiL2EWnS0vE4ollomMzGvCci0w==", + "dev": true, + "dependencies": { + "chalk": "^4.0.0", + "fs-extra": "^10.1.0", + "safe-json-stringify": "^1.2.0", + "semver": "^7.3.5", + "tv4": "^1.3.0" + }, + "peerDependencies": { + "cypress": ">=10.0.0" + } + }, + "node_modules/cypress-terminal-report/node_modules/fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/cypress-testrail": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.7.1.tgz", @@ -1852,6 +1883,12 @@ } ] }, + "node_modules/safe-json-stringify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", + "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", + "dev": true + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -2058,6 +2095,15 @@ "node": "*" } }, + "node_modules/tv4": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", + "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", + "dev": true, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -2772,6 +2818,32 @@ "dev": true, "requires": {} }, + "cypress-terminal-report": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.2.tgz", + "integrity": "sha512-0Gf/pXjrYpTkf2aR3LAFGoxEM0KulWsMKCu+52YJB6l7GEP2RLAOAr32tcZHZiL2EWnS0vE4ollomMzGvCci0w==", + "dev": true, + "requires": { + "chalk": "^4.0.0", + "fs-extra": "^10.1.0", + "safe-json-stringify": "^1.2.0", + "semver": "^7.3.5", + "tv4": "^1.3.0" + }, + "dependencies": { + "fs-extra": { + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", + "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + } + } + }, "cypress-testrail": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.7.1.tgz", @@ -3552,6 +3624,12 @@ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true }, + "safe-json-stringify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", + "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", + "dev": true + }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -3708,6 +3786,12 @@ "safe-buffer": "^5.0.1" } }, + "tv4": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", + "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", + "dev": true + }, "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", diff --git a/package.json b/package.json index 9b21c423d..1c5ed70ab 100755 --- a/package.json +++ b/package.json @@ -23,6 +23,7 @@ "cypress": "^12.17.2", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", + "cypress-terminal-report": "^5.3.2", "cypress-testrail": "^2.7.1", "human-signals": "^3.0.1" } From 94b712be54b56cbcd0d20686369d4041b10b1208 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 1 Aug 2023 10:41:33 +0300 Subject: [PATCH 017/109] debug mode enabling --- .docker/.htaccess1784 | 56 +++--- .docker/.htaccess8 | 56 +++--- .github/workflows/E2E_On_PR.yml | 8 +- docker-compose.1784.yml | 2 +- docker-compose.8.yml | 2 +- docker-compose.e2e.1784.yml | 2 +- tests/seed/database/prestashop_1784_2.sql | 68 ++++---- tests/seed/database/prestashop_8.sql | 204 +++++++++++----------- 8 files changed, 199 insertions(+), 199 deletions(-) diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1784 index f73e2e24f..54450e1ca 100644 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1784 @@ -10,75 +10,75 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1784.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +#Domain: demoshop1784debug.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1784.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +#Domain: demoshop1784debug.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^.*$ - [NC,L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L] diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index 1b771126d..8e216b1ad 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,77 +10,77 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +#Domain: demoshop8debug.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop8.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +#Domain: demoshop8debug.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^shop2$ /shop2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^shop2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^.*$ - [NC,L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 218873e4a..fe3d85f7c 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -17,18 +17,18 @@ jobs: include: - prestashop: 'PS1784' make: 'make e2eh1784' - subdomain: 'demoshop1784' + subdomain: 'demoshop1784debug' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784.ngrok.io' + url: 'https://demoshop1784debug.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' - subdomain: 'demoshop8' + subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8.ngrok.io' + url: 'https://demoshop8debug.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.1784.yml b/docker-compose.1784.yml index 4bfa923c9..7523dd711 100755 --- a/docker-compose.1784.yml +++ b/docker-compose.1784.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1784.ngrok.io:8002 + PS_DOMAIN: demoshop1784debug.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 2a06a79bc..8a482483a 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8.ngrok.io:8142 + PS_DOMAIN: demoshop8debug.ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.e2e.1784.yml b/docker-compose.e2e.1784.yml index 76715f054..9da5f92c6 100644 --- a/docker-compose.e2e.1784.yml +++ b/docker-compose.e2e.1784.yml @@ -6,7 +6,7 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1784.ngrok.io + - CYPRESS_baseUrl=https://demoshop1784debug.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 entrypoint: cypress run --spec "**/cypress/integration/ps1784/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index 214c35d15..bcffdf8b3 100755 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -3939,8 +3939,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4607,36 +4607,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1784.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1784.ngrok.io/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1784.ngrok.io/__/', 'demoshop1784.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1784debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1784debug.ngrok.io/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1784debug.ngrok.io/__/', 'demoshop1784debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -23924,8 +23924,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 41f86b2be..cb56f86d8 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3278,8 +3278,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3758,56 +3758,56 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8.ngrok.io/', '', '2023-05-02 12:19:12'), -(2, 3, '', 'demoshop8.ngrok.io/', '', '2023-05-08 16:44:27'), -(3, 3, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(4, 3, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(5, 4, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), -(6, 5, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), -(7, 6, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), -(8, 11, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), -(9, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), -(10, 11, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), -(11, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), -(12, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), -(13, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), -(14, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), -(15, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), -(16, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), -(17, 11, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), -(18, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), -(19, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), -(20, 11, 'https://demoshop8.ngrok.io/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), -(21, 11, 'https://demoshop8.ngrok.io/__/', 'demoshop8.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), -(22, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), -(23, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), -(24, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), -(25, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), -(26, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), -(27, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), -(28, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), -(29, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), -(30, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), -(31, 19, '', 'demoshop8.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), -(32, 19, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), -(33, 20, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), -(34, 21, '', 'demoshop8.ngrok.io/en/', '', '2023-05-15 10:12:52'), -(35, 22, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), -(36, 27, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), -(37, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), -(38, 27, 'https://demoshop8.ngrok.io/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), -(39, 27, 'https://demoshop8.ngrok.io/__/', 'demoshop8.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), -(40, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), -(41, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), -(42, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), -(43, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), -(44, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), -(45, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), -(46, 27, 'https://demoshop8.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), -(47, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), -(48, 27, 'https://demoshop8.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), -(49, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), -(50, 44, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); +(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-05-02 12:19:12'), +(2, 3, '', 'demoshop8debug.ngrok.io/', '', '2023-05-08 16:44:27'), +(3, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), +(4, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), +(5, 4, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), +(6, 5, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), +(7, 6, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), +(8, 11, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), +(9, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), +(10, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), +(11, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), +(12, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), +(13, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), +(14, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), +(15, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), +(16, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), +(17, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), +(18, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), +(19, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), +(20, 11, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), +(21, 11, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), +(22, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), +(23, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), +(24, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), +(25, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), +(26, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), +(27, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), +(28, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), +(29, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), +(30, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), +(31, 19, '', 'demoshop8debug.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), +(32, 19, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), +(33, 20, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), +(34, 21, '', 'demoshop8debug.ngrok.io/en/', '', '2023-05-15 10:12:52'), +(35, 22, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), +(36, 27, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), +(37, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), +(38, 27, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), +(39, 27, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), +(40, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), +(41, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), +(42, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), +(43, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), +(44, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), +(45, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), +(46, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), +(47, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), +(48, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), +(49, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), +(50, 44, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -13415,55 +13415,55 @@ CREATE TABLE `ps_pagenotfound` ( INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES (1, 1, 1, '/robots.txt', '', '2023-05-08 14:44:32'), (2, 1, 1, '/robots.txt', '', '2023-05-08 14:44:33'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), -(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), -(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), -(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), -(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), -(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), -(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), -(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), -(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), -(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), -(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), -(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), -(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), -(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), -(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), -(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), -(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), +(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), +(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), +(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), +(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), +(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), +(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), +(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), +(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), +(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), +(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), +(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), +(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), +(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), +(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), +(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), +(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), (28, 1, 1, '/robots.txt', '', '2023-05-15 08:12:52'), -(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), -(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), -(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), -(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), -(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), -(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), -(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), -(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), -(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), -(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), -(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), -(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), -(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), -(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), -(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), -(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), -(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), -(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), -(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); +(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), +(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), +(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), +(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), +(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), +(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), +(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), +(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), +(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), +(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), +(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), +(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), +(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), +(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), +(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), +(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), +(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), +(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), +(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), +(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), +(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), +(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), +(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -17470,8 +17470,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1), -(2, 2, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', 'shop2/', 1, 1); +(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1), +(2, 2, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', 'shop2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 865520682929b53f19f5b0003b806bc65040b7fb Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 09:44:27 +0300 Subject: [PATCH 018/109] Update prestashop_1784_2.sql --- tests/seed/database/prestashop_1784_2.sql | 216 ++++++++++++++++++---- 1 file changed, 179 insertions(+), 37 deletions(-) mode change 100755 => 100644 tests/seed/database/prestashop_1784_2.sql diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql old mode 100755 new mode 100644 index bcffdf8b3..5013091cc --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -1,4 +1,4 @@ --- Adminer 4.8.1 MySQL 5.7.41 dump +-- Adminer 4.8.1 MySQL 5.7.43 dump SET NAMES utf8; SET time_zone = '+00:00'; @@ -631,6 +631,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 882), (1, 883), (1, 884), +(1, 885), +(1, 886), +(1, 887), +(1, 888), (1, 889), (1, 890), (1, 891), @@ -639,6 +643,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 894), (1, 895), (1, 896), +(1, 897), +(1, 898), +(1, 899), +(1, 900), (1, 901), (1, 902), (1, 903), @@ -647,6 +655,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 906), (1, 907), (1, 908), +(1, 909), +(1, 910), +(1, 911), +(1, 912), (1, 913), (1, 914), (1, 915), @@ -655,6 +667,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 918), (1, 919), (1, 920), +(1, 921), +(1, 922), +(1, 923), +(1, 924), (1, 925), (1, 926), (1, 927), @@ -663,6 +679,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 930), (1, 931), (1, 932), +(1, 933), +(1, 934), +(1, 935), +(1, 936), (1, 937), (1, 938), (1, 939), @@ -671,6 +691,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 942), (1, 943), (1, 944), +(1, 945), +(1, 946), +(1, 947), +(1, 948), (1, 949), (1, 950), (1, 951), @@ -679,6 +703,10 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 954), (1, 955), (1, 956), +(1, 957), +(1, 958), +(1, 959), +(1, 960), (1, 961), (1, 962), (1, 963), @@ -3021,7 +3049,8 @@ INSERT INTO `ps_cart` (`id_cart`, `id_shop_group`, `id_shop`, `id_carrier`, `del (102, 1, 3, 1, '{\"10\":\"1,\"}', 5, 10, 10, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:08:25', '2023-04-05 11:08:32', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"0efa7a0cdf679bec4e45a381e28e87a5f2ed318a\"}'), (103, 1, 3, 1, '{\"9\":\"1,\"}', 5, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:09:12', '2023-04-05 11:09:18', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"77001047173e0075371114d50dac23c31e9f64de\"}'), (104, 1, 3, 1, '{\"9\":\"1,\"}', 5, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:09:50', '2023-04-05 11:09:56', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"77001047173e0075371114d50dac23c31e9f64de\"}'), -(105, 1, 3, 0, '', 6, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:12:06', '2023-04-05 11:12:06', NULL); +(105, 1, 3, 0, '', 6, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:12:06', '2023-04-05 11:12:06', NULL), +(106, 1, 1, 1, '{\"8\":\"1,\"}', 5, 8, 8, 2, 4, 777, '2a2e13b68c1848dd39c9421bab31b01b', 0, 0, '', 0, 0, '2023-08-21 07:27:00', '2023-08-21 07:34:04', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"ea17cf1aa50fc85327eee2165d3954f47828a98a\"}'); DROP TABLE IF EXISTS `ps_cart_cart_rule`; CREATE TABLE `ps_cart_cart_rule` ( @@ -3116,7 +3145,8 @@ INSERT INTO `ps_cart_product` (`id_cart`, `id_product`, `id_address_delivery`, ` (101, 1, 10, 3, 1, 0, 1, '2023-04-05 11:07:33'), (102, 1, 10, 3, 1, 0, 1, '2023-04-05 11:08:25'), (103, 1, 9, 3, 1, 0, 1, '2023-04-05 11:09:12'), -(104, 1, 9, 3, 1, 0, 1, '2023-04-05 11:09:50'); +(104, 1, 9, 3, 1, 0, 1, '2023-04-05 11:09:50'), +(106, 4, 8, 1, 16, 0, 1, '2023-08-21 07:32:59'); DROP TABLE IF EXISTS `ps_cart_rule`; CREATE TABLE `ps_cart_rule` ( @@ -3713,7 +3743,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (5, NULL, NULL, 'PS_GROUP_FEATURE_ACTIVE', '1', '2022-03-18 13:44:54', '2022-03-18 13:44:54'), (6, NULL, NULL, 'PS_CURRENCY_DEFAULT', '2', '0000-00-00 00:00:00', '2022-03-22 09:44:04'), (7, NULL, NULL, 'PS_COUNTRY_DEFAULT', '1', '0000-00-00 00:00:00', '2022-03-22 08:37:17'), -(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2022-09-19 08:56:34'), +(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-08-21 07:28:11'), (9, NULL, NULL, 'PS_ORDER_OUT_OF_STOCK', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (10, NULL, NULL, 'PS_LAST_QTIES', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (11, NULL, NULL, 'PS_CONDITIONS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3734,7 +3764,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (26, NULL, NULL, 'PS_TAX', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (27, NULL, NULL, 'PS_SHOP_ENABLE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (28, NULL, NULL, 'PS_NB_DAYS_NEW_PRODUCT', '20', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(29, NULL, NULL, 'PS_SSL_ENABLED', '1', '0000-00-00 00:00:00', '2022-03-22 07:50:06'), +(29, NULL, NULL, 'PS_SSL_ENABLED', '1', '0000-00-00 00:00:00', '2023-08-21 07:36:34'), (30, NULL, NULL, 'PS_WEIGHT_UNIT', 'kg', '0000-00-00 00:00:00', '2022-06-17 10:53:16'), (31, NULL, NULL, 'PS_BLOCK_CART_AJAX', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (32, NULL, NULL, 'PS_ORDER_RETURN', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3811,9 +3841,9 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (103, NULL, NULL, 'PS_SMARTY_CACHE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (104, NULL, NULL, 'PS_DIMENSION_UNIT', 'cm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), (105, NULL, NULL, 'PS_GUEST_CHECKOUT_ENABLED', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(106, NULL, NULL, 'PS_DISPLAY_SUPPLIERS', NULL, '0000-00-00 00:00:00', '2022-03-22 07:50:06'), -(107, NULL, NULL, 'PS_DISPLAY_MANUFACTURERS', '1', '0000-00-00 00:00:00', '2022-03-22 07:50:06'), -(108, NULL, NULL, 'PS_DISPLAY_BEST_SELLERS', '1', '0000-00-00 00:00:00', '2022-03-22 07:50:06'), +(106, NULL, NULL, 'PS_DISPLAY_SUPPLIERS', NULL, '0000-00-00 00:00:00', '2023-08-21 07:36:34'), +(107, NULL, NULL, 'PS_DISPLAY_MANUFACTURERS', '1', '0000-00-00 00:00:00', '2023-08-21 07:36:34'), +(108, NULL, NULL, 'PS_DISPLAY_BEST_SELLERS', '1', '0000-00-00 00:00:00', '2023-08-21 07:36:34'), (109, NULL, NULL, 'PS_CATALOG_MODE', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (110, NULL, NULL, 'PS_GEOLOCATION_WHITELIST', '127;::1;188.165.122;209.185.108;209.185.253;209.85.238;209.85.238.11;209.85.238.4;216.239.33.96;216.239.33.97;216.239.33.98;216.239.33.99;216.239.37.98;216.239.37.99;216.239.39.98;216.239.39.99;216.239.41.96;216.239.41.97;216.239.41.98;216.239.41.99;216.239.45.4;216.239.46;216.239.51.96;216.239.51.97;216.239.51.98;216.239.51.99;216.239.53.98;216.239.53.99;216.239.57.96;91.240.109;216.239.57.97;216.239.57.98;216.239.57.99;216.239.59.98;216.239.59.99;216.33.229.163;64.233.173.193;64.233.173.194;64.233.173.195;64.233.173.196;64.233.173.197;64.233.173.198;64.233.173.199;64.233.173.200;64.233.173.201;64.233.173.202;64.233.173.203;64.233.173.204;64.233.173.205;64.233.173.206;64.233.173.207;64.233.173.208;64.233.173.209;64.233.173.210;64.233.173.211;64.233.173.212;64.233.173.213;64.233.173.214;64.233.173.215;64.233.173.216;64.233.173.217;64.233.173.218;64.233.173.219;64.233.173.220;64.233.173.221;64.233.173.222;64.233.173.223;64.233.173.224;64.233.173.225;64.233.173.226;64.233.173.227;64.233.173.228;64.233.173.229;64.233.173.230;64.233.173.231;64.233.173.232;64.233.173.233;64.233.173.234;64.233.173.235;64.233.173.236;64.233.173.237;64.233.173.238;64.233.173.239;64.233.173.240;64.233.173.241;64.233.173.242;64.233.173.243;64.233.173.244;64.233.173.245;64.233.173.246;64.233.173.247;64.233.173.248;64.233.173.249;64.233.173.250;64.233.173.251;64.233.173.252;64.233.173.253;64.233.173.254;64.233.173.255;64.68.80;64.68.81;64.68.82;64.68.83;64.68.84;64.68.85;64.68.86;64.68.87;64.68.88;64.68.89;64.68.90.1;64.68.90.10;64.68.90.11;64.68.90.12;64.68.90.129;64.68.90.13;64.68.90.130;64.68.90.131;64.68.90.132;64.68.90.133;64.68.90.134;64.68.90.135;64.68.90.136;64.68.90.137;64.68.90.138;64.68.90.139;64.68.90.14;64.68.90.140;64.68.90.141;64.68.90.142;64.68.90.143;64.68.90.144;64.68.90.145;64.68.90.146;64.68.90.147;64.68.90.148;64.68.90.149;64.68.90.15;64.68.90.150;64.68.90.151;64.68.90.152;64.68.90.153;64.68.90.154;64.68.90.155;64.68.90.156;64.68.90.157;64.68.90.158;64.68.90.159;64.68.90.16;64.68.90.160;64.68.90.161;64.68.90.162;64.68.90.163;64.68.90.164;64.68.90.165;64.68.90.166;64.68.90.167;64.68.90.168;64.68.90.169;64.68.90.17;64.68.90.170;64.68.90.171;64.68.90.172;64.68.90.173;64.68.90.174;64.68.90.175;64.68.90.176;64.68.90.177;64.68.90.178;64.68.90.179;64.68.90.18;64.68.90.180;64.68.90.181;64.68.90.182;64.68.90.183;64.68.90.184;64.68.90.185;64.68.90.186;64.68.90.187;64.68.90.188;64.68.90.189;64.68.90.19;64.68.90.190;64.68.90.191;64.68.90.192;64.68.90.193;64.68.90.194;64.68.90.195;64.68.90.196;64.68.90.197;64.68.90.198;64.68.90.199;64.68.90.2;64.68.90.20;64.68.90.200;64.68.90.201;64.68.90.202;64.68.90.203;64.68.90.204;64.68.90.205;64.68.90.206;64.68.90.207;64.68.90.208;64.68.90.21;64.68.90.22;64.68.90.23;64.68.90.24;64.68.90.25;64.68.90.26;64.68.90.27;64.68.90.28;64.68.90.29;64.68.90.3;64.68.90.30;64.68.90.31;64.68.90.32;64.68.90.33;64.68.90.34;64.68.90.35;64.68.90.36;64.68.90.37;64.68.90.38;64.68.90.39;64.68.90.4;64.68.90.40;64.68.90.41;64.68.90.42;64.68.90.43;64.68.90.44;64.68.90.45;64.68.90.46;64.68.90.47;64.68.90.48;64.68.90.49;64.68.90.5;64.68.90.50;64.68.90.51;64.68.90.52;64.68.90.53;64.68.90.54;64.68.90.55;64.68.90.56;64.68.90.57;64.68.90.58;64.68.90.59;64.68.90.6;64.68.90.60;64.68.90.61;64.68.90.62;64.68.90.63;64.68.90.64;64.68.90.65;64.68.90.66;64.68.90.67;64.68.90.68;64.68.90.69;64.68.90.7;64.68.90.70;64.68.90.71;64.68.90.72;64.68.90.73;64.68.90.74;64.68.90.75;64.68.90.76;64.68.90.77;64.68.90.78;64.68.90.79;64.68.90.8;64.68.90.80;64.68.90.9;64.68.91;64.68.92;66.249.64;66.249.65;66.249.66;66.249.67;66.249.68;66.249.69;66.249.70;66.249.71;66.249.72;66.249.73;66.249.78;66.249.79;72.14.199;8.6.48', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (111, NULL, NULL, 'PS_LOGS_BY_EMAIL', '4', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3897,7 +3927,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (189, NULL, NULL, 'MANUFACTURER_DISPLAY_TEXT', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (190, NULL, NULL, 'MANUFACTURER_DISPLAY_TEXT_NB', '5', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (191, NULL, NULL, 'NEW_PRODUCTS_NBR', '5', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(192, NULL, NULL, 'PS_TOKEN_ENABLE', '1', '0000-00-00 00:00:00', '2022-03-22 07:50:06'), +(192, NULL, NULL, 'PS_TOKEN_ENABLE', '1', '0000-00-00 00:00:00', '2023-08-21 07:36:34'), (193, NULL, NULL, 'PS_STATS_RENDER', 'graphnvd3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (194, NULL, NULL, 'PS_STATS_OLD_CONNECT_AUTO_CLEAN', 'never', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (195, NULL, NULL, 'PS_STATS_GRID_RENDER', 'gridhtml', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3944,7 +3974,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(239, NULL, NULL, 'PS_SHOP_ACTIVITY', NULL, '0000-00-00 00:00:00', '2022-03-22 07:50:06'), +(239, NULL, NULL, 'PS_SHOP_ACTIVITY', NULL, '0000-00-00 00:00:00', '2023-08-21 07:36:34'), (240, NULL, NULL, 'PS_LOGO', 'logo.png', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (241, NULL, NULL, 'PS_FAVICON', 'favicon.ico', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (242, NULL, NULL, 'PS_STORES_ICON', 'logo_stores.png', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3969,7 +3999,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (261, NULL, NULL, 'PS_ATTRIBUTE_ANCHOR_SEPARATOR', '-', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (262, NULL, NULL, 'CONF_AVERAGE_PRODUCT_MARGIN', '40', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (263, NULL, NULL, 'PS_DASHBOARD_SIMULATION', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(264, NULL, NULL, 'PS_USE_HTMLPURIFIER', '1', '0000-00-00 00:00:00', '2022-03-22 07:50:06'), +(264, NULL, NULL, 'PS_USE_HTMLPURIFIER', '1', '0000-00-00 00:00:00', '2023-08-21 07:36:34'), (265, NULL, NULL, 'PS_SMARTY_CACHING_TYPE', 'filesystem', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (266, NULL, NULL, 'PS_SMARTY_LOCAL', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (267, NULL, NULL, 'PS_SMARTY_CLEAR_CACHE', 'everytime', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3997,7 +4027,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (289, NULL, NULL, 'PS_LOGS_EMAIL_RECEIVERS', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (290, NULL, NULL, 'PS_SHOW_LABEL_OOS_LISTING_PAGES', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (291, NULL, NULL, 'ADDONS_API_MODULE_CHANNEL', 'stable', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(292, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', '2022-03-18 13:44:55', '2022-03-22 07:50:06'), +(292, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', '2022-03-18 13:44:55', '2023-08-21 07:36:34'), (293, NULL, NULL, 'blockwishlist_WishlistPageName', NULL, '2022-03-18 13:44:59', '2022-03-18 13:44:59'), (294, NULL, NULL, 'blockwishlist_WishlistDefaultTitle', NULL, '2022-03-18 13:44:59', '2022-03-18 13:44:59'), (295, NULL, NULL, 'blockwishlist_CreateButtonLabel', NULL, '2022-03-18 13:44:59', '2022-03-18 13:44:59'), @@ -4149,9 +4179,9 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (470, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_ID', '3', '2022-03-21 16:46:11', '2022-03-21 16:46:11'), (491, NULL, NULL, 'ONBOARDINGV2_SHUT_DOWN', '1', '2022-03-21 16:51:05', '2022-03-21 16:51:05'), (492, NULL, NULL, 'ONBOARDINGV2_CURRENT_STEP', '11', '2022-03-21 16:51:07', '2022-03-21 16:51:07'), -(533, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', '1', '2022-03-22 07:50:06', '2022-03-22 07:50:06'), -(534, NULL, NULL, 'PS_CCCJS_VERSION', '4', '2022-03-22 07:51:23', '2022-09-19 08:56:34'), -(535, NULL, NULL, 'PS_CCCCSS_VERSION', '4', '2022-03-22 07:51:23', '2022-09-19 08:56:34'), +(533, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', NULL, '2022-03-22 07:50:06', '2023-08-21 07:36:34'), +(534, NULL, NULL, 'PS_CCCJS_VERSION', '5', '2022-03-22 07:51:23', '2023-08-21 07:28:11'), +(535, NULL, NULL, 'PS_CCCCSS_VERSION', '5', '2022-03-22 07:51:23', '2023-08-21 07:28:11'), (536, 1, 1, 'BANNER_IMG', NULL, '2022-03-22 07:52:25', '2022-03-22 07:52:25'), (537, 1, 1, 'BANNER_LINK', NULL, '2022-03-22 07:52:25', '2022-03-22 07:52:25'), (538, 1, 1, 'BANNER_DESC', NULL, '2022-03-22 07:52:25', '2022-03-22 07:52:25'), @@ -4162,15 +4192,15 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (623, 1, 3, 'MOLLIE_KLARNA_INVOICE_ON', 'MOLLIE_STATUS_DEFAULT', '2022-03-22 12:23:21', '2022-09-19 08:58:19'), (625, 1, 3, 'MOLLIE_SHOW_CUSTOM_LOGO', '0', '2022-03-22 12:32:04', '2023-04-05 11:06:29'), (627, 1, 3, 'MOLLIE_SINGLE_CLICK_PAYMENT', NULL, '2022-03-22 12:32:04', '2022-09-19 08:57:37'), -(628, 1, 3, 'MOLLIE_VOUCHER_CATEGORY', 'null', '2022-03-22 12:32:04', '2022-09-19 08:58:19'), -(831, 1, 1, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2022-06-17 09:20:45', '2023-04-05 11:01:59'), -(832, 1, 3, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2022-06-17 09:20:45', '2023-04-05 11:06:29'), -(833, 1, 1, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2022-06-17 09:20:45', '2023-04-05 11:01:59'), -(834, 1, 3, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2022-06-17 09:20:45', '2023-04-05 11:01:59'), -(961, 1, 1, 'MOLLIE_STATUS_CHARGEBACK', '26', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), +(628, 1, 3, 'MOLLIE_VOUCHER_CATEGORY', 'null', '2022-03-22 12:32:04', '2023-08-21 07:29:29'), +(831, 1, 1, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2022-06-17 09:20:45', '2023-08-21 07:34:18'), +(832, 1, 3, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2022-06-17 09:20:45', '2023-08-21 07:34:18'), +(833, 1, 1, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2022-06-17 09:20:45', '2023-08-21 07:18:06'), +(834, 1, 3, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2022-06-17 09:20:45', '2023-08-21 07:18:06'), +(961, 1, 1, 'MOLLIE_STATUS_CHARGEBACK', '26', '2023-04-05 10:56:03', '2023-08-21 07:34:18'), (962, 1, 3, 'MOLLIE_STATUS_CHARGEBACK', '26', '2023-04-05 10:56:03', '2023-04-05 11:06:29'), -(987, 1, 1, 'MOLLIE_STATUS_PARTIAL_REFUND', NULL, '2023-04-05 10:56:03', '2023-04-05 11:01:59'), -(988, 1, 3, 'MOLLIE_STATUS_PARTIAL_REFUND', NULL, '2023-04-05 10:56:03', '2023-04-05 11:01:59'), +(987, 1, 1, 'MOLLIE_STATUS_PARTIAL_REFUND', '29', '2023-04-05 10:56:03', '2023-08-21 07:17:30'), +(988, 1, 3, 'MOLLIE_STATUS_PARTIAL_REFUND', '29', '2023-04-05 10:56:03', '2023-08-21 07:17:30'), (1007, 1, 1, 'SUBSCRIPTION_ATTRIBUTE_GROUP', '5', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), (1008, 1, 3, 'SUBSCRIPTION_ATTRIBUTE_GROUP', '5', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), (1009, 1, 1, 'SUBSCRIPTION_ATTRIBUTE_NONE', '26', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), @@ -4182,7 +4212,18 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (1015, 1, 1, 'SUBSCRIPTION_ATTRIBUTE_MONTHLY', '29', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), (1016, 1, 3, 'SUBSCRIPTION_ATTRIBUTE_MONTHLY', '29', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), (1017, 1, 1, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '30', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), -(1018, 1, 3, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '30', '2023-04-05 10:56:03', '2023-04-05 10:56:03'); +(1018, 1, 3, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '30', '2023-04-05 10:56:03', '2023-04-05 10:56:03'), +(1103, 1, 1, 'MOLLIE_KLARNA_INVOICE_ON', 'MOLLIE_STATUS_DEFAULT', '2023-08-21 07:29:12', '2023-08-21 07:29:29'), +(1106, 1, 1, 'MOLLIE_SHOW_CUSTOM_LOGO', '0', '2023-08-21 07:29:29', '2023-08-21 07:34:18'), +(1107, 1, 1, 'MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT', '1', '2023-08-21 07:29:29', '2023-08-21 07:34:18'), +(1108, 1, 3, 'MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT', '1', '2023-08-21 07:29:29', '2023-08-21 07:34:18'), +(1109, 1, 1, 'MOLLIE_VOUCHER_CATEGORY', 'null', '2023-08-21 07:29:29', '2023-08-21 07:29:29'), +(1110, 1, 1, 'MOLLIE_APPLE_PAY_DIRECT_PRODUCT', '0', '2023-08-21 07:30:55', '2023-08-21 07:34:18'), +(1111, 1, 3, 'MOLLIE_APPLE_PAY_DIRECT_PRODUCT', '0', '2023-08-21 07:30:55', '2023-08-21 07:34:18'), +(1112, 1, 1, 'MOLLIE_APPLE_PAY_DIRECT_CART', '0', '2023-08-21 07:30:55', '2023-08-21 07:34:18'), +(1113, 1, 3, 'MOLLIE_APPLE_PAY_DIRECT_CART', '0', '2023-08-21 07:30:55', '2023-08-21 07:34:18'), +(1114, 1, 1, 'MOLLIE_AS_MAIN', '0', '2023-08-21 07:32:37', '2023-08-21 07:34:18'), +(1115, 1, 3, 'MOLLIE_AS_MAIN', '0', '2023-08-21 07:32:37', '2023-08-21 07:34:18'); DROP TABLE IF EXISTS `ps_configuration_kpi`; CREATE TABLE `ps_configuration_kpi` ( @@ -4579,7 +4620,8 @@ INSERT INTO `ps_connections` (`id_connections`, `id_shop_group`, `id_shop`, `id_ (173, 1, 3, 2650, 4, 1474943475, '2023-04-05 11:20:15', ''), (174, 1, 3, 2651, 4, 1474943477, '2023-04-05 11:20:15', ''), (175, 1, 3, 2663, 4, 1474943477, '2023-04-05 11:22:15', ''), -(176, 1, 3, 2664, 4, 1474943475, '2023-04-05 11:22:16', ''); +(176, 1, 3, 2664, 4, 1474943475, '2023-04-05 11:22:16', ''), +(177, 1, 1, 777, 2, 1404794126, '2023-08-21 07:26:48', ''); DROP TABLE IF EXISTS `ps_connections_page`; CREATE TABLE `ps_connections_page` ( @@ -6521,7 +6563,7 @@ INSERT INTO `ps_customer` (`id_customer`, `id_shop_group`, `id_shop`, `id_gender (1, 1, 1, 1, 3, 1, 0, '', '', '', 'Anonymous', 'Anonymous', 'anonymous@psgdpr.com', 'prestashop', '2022-03-18 05:46:19', '0000-00-00', 0, '', '0000-00-00 00:00:00', 1, '', 0.000000, 0, 0, '3a4b0cf34ebfc312864d223e16b1933b', '', 0, 0, 0, '2022-03-18 13:46:19', '2022-03-18 13:46:19', '', '0000-00-00 00:00:00'), (2, 1, 1, 1, 3, 1, 0, '', '', '', 'John', 'DOE', 'pub@prestashop.com', '4ca759021832aa869edb52c32e3505bf', '2022-03-18 05:46:59', '1970-01-15', 1, '', '2013-12-13 08:19:15', 1, '', 0.000000, 0, 0, '6abc5fd172e577f03982d4897dbd80dd', '', 1, 0, 0, '2022-03-18 13:46:59', '2022-03-18 13:46:59', '', '0000-00-00 00:00:00'), (3, 1, 3, 1, 3, 6, 0, NULL, NULL, NULL, 'TEST', 'TEST', 'demo@demo.com', '$2y$10$lX.QL.p2B9gZ3Gp3tLNGf.RBECHobOwmxWINL2OLdI2ZTwlKpyUeC', '2022-03-22 04:21:30', '0000-00-00', 0, NULL, '0000-00-00 00:00:00', 0, NULL, 0.000000, 0, 0, 'c87361b275fdc73622d49fd9819156e4', NULL, 1, 0, 0, '2022-03-22 10:21:30', '2023-04-05 11:11:51', NULL, '0000-00-00 00:00:00'), -(4, 1, 1, 1, 3, 6, 0, NULL, NULL, NULL, 'TEST', 'TEST', 'demo@demo.com', '$2y$10$DlSF.ajwpzcMajQyrYx7QuXuynJZ.5zElY73CQyfmA4kvHVljTBKi', '2022-03-22 04:28:08', '0000-00-00', 0, NULL, '0000-00-00 00:00:00', 0, NULL, 0.000000, 0, 0, '2a2e13b68c1848dd39c9421bab31b01b', NULL, 1, 0, 0, '2022-03-22 10:28:08', '2022-09-19 08:53:28', NULL, '0000-00-00 00:00:00'), +(4, 1, 1, 1, 3, 5, 0, NULL, NULL, NULL, 'TEST', 'TEST', 'demo@demo.com', '$2y$10$DlSF.ajwpzcMajQyrYx7QuXuynJZ.5zElY73CQyfmA4kvHVljTBKi', '2022-03-22 04:28:08', '0000-00-00', 0, NULL, '0000-00-00 00:00:00', 0, NULL, 0.000000, 0, 0, '2a2e13b68c1848dd39c9421bab31b01b', NULL, 1, 0, 0, '2022-03-22 10:28:08', '2023-08-21 07:26:46', NULL, '0000-00-00 00:00:00'), (5, 1, 1, 1, 3, 5, 0, '', '', '', 'AUT', 'AUT', 'testemail582761@testing.com', '$2y$10$m.K/Ai4igZ9wtG10ePK1fuWDOYsYlVgIWMn399fXy2y86AmG8vxMy', '2022-03-23 02:24:05', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, 'ab7f21e4aa47d691761ba425f9328070', '', 1, 0, 0, '2022-03-23 08:24:05', '2022-03-23 08:24:05', '', '0000-00-00 00:00:00'), (6, 1, 1, 1, 3, 5, 0, '', '', '', 'AUT', 'AUT', 'testemail569040@testing.com', '$2y$10$neU.cusyV.dHSG6O8FcQtuCNne4GSNqKvlwx62vjrAU8Dlz0D44Xy', '2022-03-23 02:24:40', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, 'df2d197e4c2645bbea847426c6c8192f', '', 1, 0, 0, '2022-03-23 08:24:40', '2022-03-23 08:24:40', '', '0000-00-00 00:00:00'), (7, 1, 1, 1, 3, 5, 0, '', '', '', 'AUT', 'AUT', 'testemail697645@testing.com', '$2y$10$4TUCxAqGhmn11YiyrIhtPOWeoeJALq.34opKHo/97TNFcgmTqoHJy', '2022-03-23 02:25:02', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, '073a1016cef8b45ab2e8d038ecdd9497', '', 1, 0, 0, '2022-03-23 08:25:02', '2022-03-23 08:25:02', '', '0000-00-00 00:00:00'), @@ -6653,7 +6695,8 @@ INSERT INTO `ps_customer_session` (`id_customer_session`, `id_customer`, `token` (53, 3, 'c775b90d23671cc34ee59fd3c0c8c4fb76c3f464'), (54, 3, 'b2bd8b1d4dcbd7af237da8288ea79d257d6713eb'), (55, 3, 'fd19d3ad25f2845d92ae90cf1a28f752ac7e12a9'), -(56, 3, 'dd77f79431391f1b1332ea0f2cfb7de9f07dab68'); +(56, 3, 'dd77f79431391f1b1332ea0f2cfb7de9f07dab68'), +(57, 4, '545fbc9b7abffae9676bb7979f8c2a51ad1fd485'); DROP TABLE IF EXISTS `ps_customer_thread`; CREATE TABLE `ps_customer_thread` ( @@ -6840,7 +6883,7 @@ CREATE TABLE `ps_employee` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_employee` (`id_employee`, `id_profile`, `id_lang`, `lastname`, `firstname`, `email`, `passwd`, `last_passwd_gen`, `stats_date_from`, `stats_date_to`, `stats_compare_from`, `stats_compare_to`, `stats_compare_option`, `preselect_date_range`, `bo_color`, `bo_theme`, `bo_css`, `default_tab`, `bo_width`, `bo_menu`, `active`, `optin`, `id_last_order`, `id_last_customer_message`, `id_last_customer`, `last_connection_date`, `reset_password_token`, `reset_password_validity`, `has_enabled_gravatar`) VALUES -(1, 1, 1, 'DOCKERTEST', 'DOCKERTEST', 'demo@demo.com', '$2y$10$uBqV01rbU9HfTOavWJBO1.V9yF1CDKHXR8qhcCreYZhBSnn..X8uy', '2022-03-18 05:44:56', '2022-02-18', '2022-03-18', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-04-05', NULL, '0000-00-00 00:00:00', 0); +(1, 1, 1, 'DOCKERTEST', 'DOCKERTEST', 'demo@demo.com', '$2y$10$uBqV01rbU9HfTOavWJBO1.V9yF1CDKHXR8qhcCreYZhBSnn..X8uy', '2022-03-18 05:44:56', '2022-02-18', '2022-03-18', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-08-21', NULL, '0000-00-00 00:00:00', 0); DROP TABLE IF EXISTS `ps_employee_session`; CREATE TABLE `ps_employee_session` ( @@ -6877,7 +6920,8 @@ INSERT INTO `ps_employee_session` (`id_employee_session`, `id_employee`, `token` (31, 1, 'f65582dc760fdc68e4b1b6171a8d76c18e3d3773'), (32, 1, 'd62c390c12e079ab0bbc5193cbd54f9f97be4307'), (33, 1, '9d36eafff20e95bf20932a6ddc59e7dcfc93fa0b'), -(34, 1, '471603853984dc736b3c105e01eef2d0bfb24c31'); +(34, 1, '471603853984dc736b3c105e01eef2d0bfb24c31'), +(35, 1, '7b8ba5063f812577b765acd62661794b34e5acfe'); DROP TABLE IF EXISTS `ps_employee_shop`; CREATE TABLE `ps_employee_shop` ( @@ -9851,7 +9895,89 @@ INSERT INTO `ps_guest` (`id_guest`, `id_operating_system`, `id_web_browser`, `id (2667, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (2668, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (2669, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(2670, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); +(2670, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2671, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2673, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2674, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2675, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2676, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2677, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2678, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2679, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2680, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2681, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2682, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2683, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2684, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2685, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2686, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2687, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2689, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2690, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2691, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2692, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2693, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2694, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2695, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2696, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2697, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2698, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2699, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2701, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2702, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2703, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2705, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2706, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2707, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2708, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2709, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2710, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2711, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2712, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2713, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2714, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2715, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2716, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2717, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2718, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2719, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2720, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2721, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2722, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2723, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2724, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2725, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2726, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2727, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2728, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2729, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2730, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2731, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2732, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2733, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2734, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2735, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2736, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2737, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2738, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2739, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2740, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2741, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2742, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2743, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2744, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2745, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2746, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2747, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2748, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2749, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2751, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2752, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); DROP TABLE IF EXISTS `ps_homeslider`; CREATE TABLE `ps_homeslider` ( @@ -10679,7 +10805,11 @@ INSERT INTO `ps_hook` (`id_hook`, `name`, `title`, `description`, `active`, `pos (757, 'actionAdminOrdersListingFieldsModifier', 'actionAdminOrdersListingFieldsModifier', '', 1, 1), (758, 'actionObjectCurrencyUpdateAfter', 'actionObjectCurrencyUpdateAfter', '', 1, 1), (759, 'actionObjectAddressAddAfter', 'actionObjectAddressAddAfter', '', 1, 1), -(760, 'actionObjectAddressUpdateAfter', 'actionObjectAddressUpdateAfter', '', 1, 1); +(760, 'actionObjectAddressUpdateAfter', 'actionObjectAddressUpdateAfter', '', 1, 1), +(761, 'actionObjectAddressDeleteAfter', 'actionObjectAddressDeleteAfter', '', 1, 1), +(762, 'actionBeforeCartUpdateQty', 'actionBeforeCartUpdateQty', '', 1, 1), +(763, 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', '', 1, 1), +(764, 'actionFrontControllerAfterInit', 'actionFrontControllerAfterInit', '', 1, 1); DROP TABLE IF EXISTS `ps_hook_alias`; CREATE TABLE `ps_hook_alias` ( @@ -13650,7 +13780,13 @@ INSERT INTO `ps_log` (`id_log`, `severity`, `error_code`, `message`, `object_typ (1648, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 3, NULL, 5, 0, 0, '2023-04-05 11:10:05', '2023-04-05 11:10:05'), (1649, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 104, 3, NULL, 5, 0, 0, '2023-04-05 11:10:06', '2023-04-05 11:10:06'), (1650, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 104, 3, NULL, 5, 0, 0, '2023-04-05 11:10:06', '2023-04-05 11:10:06'), -(1651, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 5, 1, 1, '2023-04-05 11:10:49', '2023-04-05 11:10:49'); +(1651, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 5, 1, 1, '2023-04-05 11:10:49', '2023-04-05 11:10:49'), +(1652, 1, 0, 'Protect vendor folder in module mollie', '', 0, 3, NULL, 5, 0, 0, '2023-08-21 07:17:31', '2023-08-21 07:17:31'), +(1653, 1, 0, 'Protect vendor folder in module mollie', '', 0, 3, NULL, 5, 0, 0, '2023-08-21 07:18:07', '2023-08-21 07:18:07'), +(1654, 1, 0, 'Protect vendor folder in module mollie', '', 0, 3, NULL, 5, 0, 0, '2023-08-21 07:18:20', '2023-08-21 07:18:20'), +(1655, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 5, 1, 1, '2023-08-21 07:27:31', '2023-08-21 07:27:31'), +(1656, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 1, '2023-08-21 07:30:55', '2023-08-21 07:30:55'), +(1657, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 1, '2023-08-21 07:31:13', '2023-08-21 07:31:13'); DROP TABLE IF EXISTS `ps_mail`; CREATE TABLE `ps_mail` ( @@ -15805,7 +15941,8 @@ CREATE TABLE `ps_module_history` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `ps_module_history` (`id`, `id_employee`, `id_module`, `date_add`, `date_upd`) VALUES -(1, 1, 80, '2023-04-05 11:04:15', '2023-04-05 11:05:48'); +(1, 1, 80, '2023-04-05 11:04:15', '2023-04-05 11:05:48'), +(2, 1, 65, '2023-08-21 07:31:36', '2023-08-21 07:31:36'); DROP TABLE IF EXISTS `ps_module_preference`; CREATE TABLE `ps_module_preference` ( @@ -16672,7 +16809,8 @@ INSERT INTO `ps_order_state` (`id_order_state`, `invoice`, `send_email`, `module (25, 0, 1, 'mollie', '#8A2BE2', 0, 0, 1, 1, 1, 1, 1, 0, 0), (26, 0, 0, 'mollie', '#E74C3C', 0, 0, 0, 0, 0, 0, 0, 0, 0), (27, 0, 0, 'mollie', '#6F8C9F', 0, 0, 0, 0, 0, 0, 0, 0, 0), -(28, 0, 0, 'mollie', '#6F8C9F', 0, 0, 0, 0, 0, 0, 0, 0, 0); +(28, 0, 0, 'mollie', '#6F8C9F', 0, 0, 0, 0, 0, 0, 0, 0, 0), +(29, 0, 0, 'mollie', '#6F8C9F', 0, 0, 0, 0, 0, 0, 0, 0, 0); DROP TABLE IF EXISTS `ps_order_state_lang`; CREATE TABLE `ps_order_state_lang` ( @@ -16795,7 +16933,11 @@ INSERT INTO `ps_order_state_lang` (`id_order_state`, `id_lang`, `name`, `templat (28, 1, 'Partially refunded by Mollie', ''), (28, 5, 'Partially refunded by Mollie', ''), (28, 6, 'Partially refunded by Mollie', ''), -(28, 7, 'Partially refunded by Mollie', ''); +(28, 7, 'Partially refunded by Mollie', ''), +(29, 1, 'Partially refunded by Mollie', ''), +(29, 5, 'Partially refunded by Mollie', ''), +(29, 6, 'Partially refunded by Mollie', ''), +(29, 7, 'Partially refunded by Mollie', ''); DROP TABLE IF EXISTS `ps_pack`; CREATE TABLE `ps_pack` ( @@ -25122,7 +25264,7 @@ INSERT INTO `ps_tab` (`id_tab`, `id_parent`, `position`, `module`, `class_name`, (115, 113, 1, NULL, 'AdminBackup', NULL, 1, 1, 0, '', 'DB Backup', 'Admin.Navigation.Menu'), (116, 103, 7, NULL, 'AdminLogs', NULL, 1, 1, 0, '', 'Logs', 'Admin.Navigation.Menu'), (117, 103, 8, NULL, 'AdminWebservice', NULL, 1, 1, 0, '', 'Webservice', 'Admin.Navigation.Menu'), -(118, 103, 9, NULL, 'AdminShopGroup', NULL, 1, 1, 0, '', 'Multistore', 'Admin.Navigation.Menu'), +(118, 103, 9, NULL, 'AdminShopGroup', NULL, 0, 1, 0, '', 'Multistore', 'Admin.Navigation.Menu'), (119, 103, 10, NULL, 'AdminShopUrl', NULL, 0, 1, 0, '', 'Multistore', 'Admin.Navigation.Menu'), (120, 103, 11, NULL, 'AdminFeatureFlag', NULL, 1, 1, 0, '', 'Experimental Features', 'Admin.Navigation.Menu'), (121, -1, 0, NULL, 'AdminQuickAccesses', NULL, 1, 1, 0, '', 'Quick Access', 'Admin.Navigation.Menu'), @@ -27837,4 +27979,4 @@ INSERT INTO `ps_zone_shop` (`id_zone`, `id_shop`) VALUES (7, 3), (8, 3); --- 2023-04-05 10:23:20 +-- 2023-08-21 06:41:36 From 40a53b485b41460da6abbda3aa098d211df8b986 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 11:01:28 +0300 Subject: [PATCH 019/109] useful cypress updates --- ...mollie.ps1784.ModuleConfiguration.specs.js | 20 +-- cypress/e2e/ps1784/02_mollie.ps1784.specs.js | 84 ++++------ .../03_mollie.ps1784.Subscriptions.WIP.js | 19 +-- cypress/support/commands.js | 56 ++----- package-lock.json | 154 ++++++++++++++---- package.json | 2 +- 6 files changed, 173 insertions(+), 162 deletions(-) diff --git a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js index 973759fcb..da74b834e 100755 --- a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js @@ -31,24 +31,8 @@ function prepareCookie() }); } - //Caching the BO and FO session - const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) - cy.get('#passwd').type('demodemo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - //switching the multistore PS1784 - cy.get('#header_shop > .dropdown').click() - cy.get('.open > .dropdown-menu').find('[class="shop"]').eq(1).find('[href]').eq(0).click() - cy.visit('/SHOP2/index.php?controller=my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('demodemo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } + +cy.CachingBOFOPS1784() //Checking the console for errors let windowConsoleError; diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js index 8ff42df27..7fb2d5b61 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js @@ -31,24 +31,8 @@ function prepareCookie() }); } - //Caching the BO and FO session - const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) - cy.get('#passwd').type('demodemo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - //switching the multistore PS1784 - cy.get('#header_shop > .dropdown').click() - cy.get('.open > .dropdown-menu').find('[class="shop"]').eq(1).find('[href]').eq(0).click() - cy.visit('/SHOP2/index.php?controller=my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('demodemo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } + +cy.CachingBOFOPS1784() //Checing the console for errors let windowConsoleError; @@ -71,7 +55,7 @@ it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.get('[class="alert alert-success"]').should('be.visible') }) it('C339342: 05 Vouchers Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('LT').click() @@ -107,7 +91,7 @@ it('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders A cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('LT').click() @@ -138,7 +122,7 @@ it('C339345: 08 Bancontact Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339346: 09 iDEAL Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -169,7 +153,7 @@ it('C339347: 10 iDEAL Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339348: 11 Klarna Slice It Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -200,7 +184,7 @@ it('C339349: 12 Klarna Slice It Order BO Shipping, Refunding [Orders API]', () = cy.OrderShippingRefundingOrdersAPI() }) it('C339350: 13 Klarna Pay Later Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -232,7 +216,7 @@ it('C339351: 14 Klarna Pay Later Order BO Shipping, Refunding [Orders API]', () cy.OrderShippingRefundingOrdersAPI() }) it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -270,7 +254,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_on').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -300,7 +284,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -333,7 +317,7 @@ it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339357: 20 IN3 Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -365,7 +349,7 @@ it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { - cy.visit('/SHOP2/de/') + cy.visit('/de/') cy.contains('Hummingbird printed sweater').click() cy.get('[class="btn btn-primary add-to-cart"]').click() cy.get('.cart-content-btn > .btn-primary').click() @@ -405,7 +389,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[class="alert alert-success"]').should('be.visible') }) it('C339361: 24 Paypal Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -436,7 +420,7 @@ it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -479,7 +463,7 @@ it('C339364: 27 SOFORT Order Shipping, Refunding [Orders API]', () => { //Refunding not possible because "We haven't received the payment on our bank accounts yet" message from Mollie Dashboard }) it('C339365: 28 Przelewy24 Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -510,7 +494,7 @@ it('C339366: 29 Przelewy24 Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339367: 30 Giropay Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -541,7 +525,7 @@ it('C339368: 31 Giropay Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339369: 32 EPS Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -572,7 +556,7 @@ it('C339370: 33 EPS Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339371: 34 KBC/CBC Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -604,7 +588,7 @@ it('C339372: 35 KBC/CBC Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339373: 36 Belfius Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -635,7 +619,7 @@ it('C339374: 37 Belfius Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339375: 38 Bank Transfer Checkouting [Orders API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -668,7 +652,7 @@ it('C339376: 39 Bank Transfer Order Shipping, Refunding [Orders API]', () => { }) // Temporary disabled, Payment Method disables automatically in My Mollie Dashboard, because of the fake testing account... it.skip('40 Gift Card Checkouting [Orders API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -715,7 +699,7 @@ it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') }) it('C339379: 44 Bancontact Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -747,7 +731,7 @@ it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]' cy.OrderRefundingPartialPaymentsAPI() }) it('C339381: 46 iDEAL Checkouting [Payments API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -778,7 +762,7 @@ it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () cy.OrderRefundingPartialPaymentsAPI() }) it('C339383: 48 Credit Card Checkouting [Payments API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -812,7 +796,7 @@ it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API] it('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { cy.clearCookies() //Payments API item - cy.visit('/SHOP2/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) cy.get('[class="h3 product-title"]').eq(0).click() cy.get('.add > .btn').click() cy.get('.cart-content-btn > .btn-primary').click() @@ -863,7 +847,7 @@ it('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { cy.clearCookies() //Payments API item - cy.visit('/SHOP2/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) cy.get('[class="h3 product-title"]').eq(0).click() cy.get('.add > .btn').click() cy.get('.cart-content-btn > .btn-primary').click() @@ -897,7 +881,7 @@ it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) it('C339387: 52 Paypal Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -936,7 +920,7 @@ it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { cy.get('#mollie_order > :nth-child(1) > .alert').contains('Refund was made successfully!') }); it('C339389: 54 SOFORT Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -971,7 +955,7 @@ it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { //Refunding is unavailable - information from Mollie Dashboard - but checking the UI itself }); it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -1005,7 +989,7 @@ it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () = cy.OrderRefundingPartialPaymentsAPI() }); it('C339393: 58 Giropay Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -1037,7 +1021,7 @@ it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339395: 60 EPS Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -1069,7 +1053,7 @@ it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -1102,7 +1086,7 @@ it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339399: 64 Belfius Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() @@ -1134,7 +1118,7 @@ it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.get('a').click() // cy.contains('Reorder').click() diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js index 33999addf..eb28d63ec 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js @@ -1,21 +1,4 @@ -//Caching the BO and FO session -const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) - cy.get('#passwd').type('demodemo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - //switching the multistore PS1784 - cy.get('#header_shop > .dropdown').click() - cy.get('.open > .dropdown-menu').find('[class="shop"]').eq(1).find('[href]').eq(0).click() - cy.visit('/SHOP2/index.php?controller=my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('demodemo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } +cy.CachingBOFOPS1784() //Checking the console for errors let windowConsoleError; diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 8d447c062..53814a27f 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -462,45 +462,6 @@ Cypress.Commands.add("ConfPaymentsAPI1784", () => { //applepay cy.get('[name="MOLLIE_METHOD_API_applepay"]').select('Payments API', {force: true}) }) -Cypress.Commands.add("login_mollie17_test", () => { - Cypress.env() - cy.get('#email').type((Cypress.env('demousername')),{delay: 0, log: false}) - cy.get('#passwd').type((Cypress.env('demopassword')),{delay: 0, log: false}) - cy.get('#submit_login').click() - cy.get('#header_shop > .dropdown').click() - cy.get('.list-dropdown-menu > :nth-child(3)').click() - }) -Cypress.Commands.add("ps16_random_user", (randomuser) => { - // Creating random user all the time - const uuid = () => Cypress._.random(0, 1e6) - const id = uuid() - const testname = `testemail${id}@testing.com` - cy.get('#email_create').type(testname, {delay: 0}) - cy.get('#SubmitCreate > span').click() - cy.get('#id_gender1').check() - cy.get('#customer_firstname').type('AUT',{delay:0}).as('firstname') - cy.get('#customer_lastname').type('AUT',{delay:0}).as('lastname') - cy.get('#passwd').type('123456',{delay:0}).as('pasw') - cy.get('#submitAccount > span').click() - cy.get('#company').type('123456',{delay:0}).as('company') - cy.get('#vat-number').type('123456',{delay:0}).as('vat number') - cy.get('#address1').type('ADDR',{delay:0}).as('address') - cy.get('#address2').type('ADDR',{delay:0}).as('address2') - cy.get('#postcode').type('54469',{delay:0}).as('zip') - cy.get('#city').type('CIT',{delay:0}).as('city') - cy.get('#id_country').select('Lithuania').as('country') - cy.get('#phone').type('+085',{delay:0}).as('telephone') - cy.get('#phone_mobile').type('+000',{delay:0}).as('telephone2') - }) -Cypress.Commands.add("mollie_1752_test_login", () => { - Cypress.env() - cy.get('#email').type((Cypress.env('demousername')),{delay: 0, log: false}) - cy.get('#passwd').type((Cypress.env('demopassword')),{delay: 0, log: false}) - cy.get('#submit_login').click().wait(3000) - cy.get('.selected-item > .arrow-down').click() - cy.get('#shop-list > .dropdown-menu > .items-list > :nth-child(3)').click(5,5) - cy.get('#subtab-AdminMollieModule > .link').click() -}) Cypress.Commands.add("OrderRefundingShippingOrdersAPI", () => { cy.visit('/admin1/index.php?controller=AdminOrders') cy.get(':nth-child(1) > .column-payment').click() @@ -623,3 +584,20 @@ Cypress.Commands.add("OpeningModuleDashboardURL", () => { cy.visit('/admin1/index.php?controller=AdminModules&configure=mollie') cy.get('.btn-continue').click() }) +Cypress.Commands.add("CachingBOFOPS1784", () => { +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } +}) diff --git a/package-lock.json b/package-lock.json index 16dfa7d24..5ef0a14da 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^12.17.2", + "cypress": "^12.17.4", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", @@ -28,9 +28,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -48,7 +48,7 @@ "performance-now": "^2.1.0", "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" }, @@ -87,9 +87,9 @@ } }, "node_modules/@types/node": { - "version": "14.18.34", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.34.tgz", - "integrity": "sha512-hcU9AIQVHmPnmjRK+XUUYlILlr9pQrsqSrwov/JK1pnf3GTQowVBhx54FbvM0AU/VXGH4i3+vgXS5EguR7fysA==", + "version": "16.18.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", + "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==", "dev": true }, "node_modules/@types/sinonjs__fake-timers": { @@ -706,15 +706,15 @@ } }, "node_modules/cypress": { - "version": "12.17.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", - "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^2.88.11", + "@cypress/request": "2.88.12", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -747,6 +747,7 @@ "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", "semver": "^7.5.3", @@ -1765,6 +1766,15 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true, + "engines": { + "node": ">= 0.6.0" + } + }, "node_modules/proxy-from-env": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", @@ -1811,6 +1821,12 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, "node_modules/request-progress": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", @@ -1820,6 +1836,12 @@ "throttleit": "^1.0.0" } }, + "node_modules/requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, "node_modules/restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -2065,16 +2087,27 @@ } }, "node_modules/tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "dependencies": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" }, "engines": { - "node": ">=0.8" + "node": ">=6" + } + }, + "node_modules/tough-cookie/node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" } }, "node_modules/tslib": { @@ -2140,6 +2173,16 @@ "node": ">=8" } }, + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "node_modules/uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", @@ -2227,9 +2270,9 @@ "optional": true }, "@cypress/request": { - "version": "2.88.11", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz", - "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -2247,7 +2290,7 @@ "performance-now": "^2.1.0", "qs": "~6.10.3", "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", + "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", "uuid": "^8.3.2" } @@ -2284,9 +2327,9 @@ } }, "@types/node": { - "version": "14.18.34", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.34.tgz", - "integrity": "sha512-hcU9AIQVHmPnmjRK+XUUYlILlr9pQrsqSrwov/JK1pnf3GTQowVBhx54FbvM0AU/VXGH4i3+vgXS5EguR7fysA==", + "version": "16.18.41", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", + "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==", "dev": true }, "@types/sinonjs__fake-timers": { @@ -2753,14 +2796,14 @@ } }, "cypress": { - "version": "12.17.2", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.2.tgz", - "integrity": "sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==", + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", "dev": true, "requires": { - "@cypress/request": "^2.88.11", + "@cypress/request": "2.88.12", "@cypress/xvfb": "^1.2.4", - "@types/node": "^14.14.31", + "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -2793,6 +2836,7 @@ "minimist": "^1.2.8", "ospath": "^1.2.2", "pretty-bytes": "^5.6.0", + "process": "^0.11.10", "proxy-from-env": "1.0.0", "request-progress": "^3.0.0", "semver": "^7.5.3", @@ -3538,6 +3582,12 @@ "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", "dev": true }, + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "dev": true + }, "proxy-from-env": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", @@ -3575,6 +3625,12 @@ "side-channel": "^1.0.4" } }, + "querystringify": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true + }, "request-progress": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", @@ -3584,6 +3640,12 @@ "throttleit": "^1.0.0" } }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true + }, "restore-cursor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", @@ -3762,13 +3824,23 @@ } }, "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "dependencies": { + "universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", + "dev": true + } } }, "tslib": { @@ -3816,6 +3888,16 @@ "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", "dev": true }, + "url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", + "dev": true, + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, "uuid": { "version": "8.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", diff --git a/package.json b/package.json index 1c5ed70ab..e0a19bd71 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { - "cypress": "^12.17.2", + "cypress": "^12.17.4", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", From c7ef7a95289e6e746e8b54c59b4cc7c0d62eb4f4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 11:26:20 +0300 Subject: [PATCH 020/109] useful test code updates --- .../01_mollie.ps1784.ModuleConfiguration.specs.js | 12 +++++------- cypress/e2e/ps1784/02_mollie.ps1784.specs.js | 6 ++---- cypress/support/commands.js | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js index da74b834e..1e58df46e 100755 --- a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js @@ -32,8 +32,6 @@ function prepareCookie() }); } -cy.CachingBOFOPS1784() - //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -50,11 +48,11 @@ afterEach(function() { describe('PS1784 Module initial configuration setup', () => { beforeEach(() => { cy.viewport(1920,1080) - login('MollieBOFOLoggingIn') + cy.CachingBOFOPS1784() }) it('C339305: 01 Connecting test API successsfully', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('#MOLLIE_ACCOUNT_SWITCH_on').click({force:true}) cy.get('#MOLLIE_API_KEY_TEST').type((Cypress.env('MOLLIE_TEST_API_KEY')),{delay: 0, log: false}) cy.get('#module_form_submit_btn').click() @@ -67,7 +65,7 @@ it('C339338: 02 Enabling Mollie carriers in Prestashop successfully', () => { }) it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end components, Saving the form, checking if there are no Errors in Console', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[id="MOLLIE_PAYMENTSCREEN_LOCALE"]').should('be.visible') cy.get('[id="MOLLIE_SEND_ORDER_CONFIRMATION"]').should('be.visible') @@ -101,13 +99,13 @@ it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end comp }); it('C688472 Checking the Subscriptions tab, and console errors', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('#subtab-AdminMollieSubscriptionOrders').click() cy.get('[id="invertus_mollie_subscription_grid_panel"]').should('be.visible') }); it('C688473 Checking the Subscriptions FAQ, and console errors', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('#subtab-AdminMollieSubscriptionFAQ').click() cy.get(':nth-child(2) > .col-lg-12 > .card').should('be.visible') cy.get(':nth-child(3) > .col-lg-12 > .card').should('be.visible') diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js index 7fb2d5b61..b71cca3a1 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js @@ -32,9 +32,7 @@ function prepareCookie() }); } -cy.CachingBOFOPS1784() - -//Checing the console for errors +//Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { windowConsoleError = cy.spy(win.console, 'error'); @@ -45,7 +43,7 @@ afterEach(() => { describe('PS1784 Tests Suite', () => { beforeEach(() => { cy.viewport(1920,1080) - login('MollieBOFOLoggingIn') + cy.CachingBOFOPS1784() }) it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 53814a27f..d72169af9 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -600,4 +600,5 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#history-link > .link-item').click() }) } + login('MollieBOFOLoggingIn') }) From e1bd86793288366129ed6678678a9ba426e87f33 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 11:29:29 +0300 Subject: [PATCH 021/109] specs updates --- cypress/e2e/ps1784/02_mollie.ps1784.specs.js | 2 +- cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js index b71cca3a1..dce4f009f 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js @@ -47,7 +47,7 @@ describe('PS1784 Tests Suite', () => { }) it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.ConfOrdersAPI1784() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js index eb28d63ec..72167c610 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js @@ -1,5 +1,3 @@ -cy.CachingBOFOPS1784() - //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -12,6 +10,7 @@ describe('PS1784 Subscriptions Test Suit', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') + cy.CachingBOFOPS1784() }) it('C176305 Check if Subscription options added in Product BO', () => { cy.visit('/admin1/') From 2eea085f809238b8bfbe8e44f7eb66790cfdecc3 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 12:27:32 +0300 Subject: [PATCH 022/109] ps8 test spec updates --- cypress/e2e/ps1784/02_mollie.ps1784.specs.js | 16 ++-- .../03_mollie.ps1784.Subscriptions.WIP.js | 1 + ...01_mollie.ps8.ModuleConfiguration.specs.js | 21 +---- cypress/e2e/ps8/02_mollie.ps8.specs.js | 87 ++++++++----------- cypress/support/commands.js | 18 ++++ 5 files changed, 63 insertions(+), 80 deletions(-) diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js index dce4f009f..8001a270d 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js @@ -52,7 +52,7 @@ it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) -it('C339342: 05 Vouchers Checkouting [Orders API]', () => { +it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() @@ -84,7 +84,7 @@ it('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { +it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist }) @@ -248,7 +248,7 @@ it('C339353: 16 Klarna Pay Now Order BO Shipping, Refunding [Orders API]', () => it('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Enabling the Single-Click for now cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_on').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') @@ -306,7 +306,7 @@ it('C339355: 18 Check if customerId is passed during the 2nd payment using Singl cy.reload(); cy.visit('/admin1/') //Disabling the single-click - no need again - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('#MOLLIE_SINGLE_CLICK_PAYMENT_off').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') @@ -364,7 +364,7 @@ it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { }) it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[name="MOLLIE_IMAGES"]').select('big') cy.get('[type="submit"]').first().click({force:true}) @@ -380,7 +380,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('html').should('contain.html','src="https://www.mollie.com/external/icons/payment-methods/in3%402x.png"') //todo finish cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[name="MOLLIE_IMAGES"]').select('hide') cy.get('[type="submit"]').first().click({force:true}) @@ -686,14 +686,14 @@ it.skip('41 Gift Card Order Shipping, Refunding [Orders API]', () => { }) it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.ConfPaymentsAPI1784() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', () => { cy.visit('/admin1/') - cy.OpenModuleDashboard() + cy.OpeningModuleDashboardURL() cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') }) it('C339379: 44 Bancontact Checkouting [Payments API]', () => { diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js index 72167c610..9b17d8c2a 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js @@ -1,3 +1,4 @@ +/// //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index 43055196d..d9c50b141 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -1,23 +1,4 @@ /// - //Caching the BO and FO session - const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) - cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - //switching the multistore PS8 - cy.get('#header_shop > .dropdown').click() - cy.get('.open > .dropdown-menu').find('[class="shop"]').eq(1).find('[href]').eq(0).click() - cy.visit('/SHOP2/index.php?controller=my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } - //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -34,7 +15,7 @@ afterEach(function() { describe('PS8 Module initial configuration setup', () => { beforeEach(() => { cy.viewport(1920,1080) - login('MollieBOFOLoggingIn') + cy.CachingBOFOPS8() }) it('C339305: Connecting test API successsfully', () => { cy.visit('/admin1/') diff --git a/cypress/e2e/ps8/02_mollie.ps8.specs.js b/cypress/e2e/ps8/02_mollie.ps8.specs.js index 7e285d7a5..e7257e75c 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.specs.js @@ -31,28 +31,11 @@ function prepareCookie() }); } - //Catching the BO and FO session - const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) - cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - //switching the multistore PS8 - cy.get('#header_shop > .dropdown').click() - cy.get('.open > .dropdown-menu').find('[class="shop"]').eq(1).find('[href]').eq(0).click() - cy.visit('/SHOP2/index.php?controller=my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } + describe('PS8 Tests Suite', () => { beforeEach(() => { cy.viewport(1920,1080) - login('MollieBOFOLoggingIn') + cy.CachingBOFOPS8() }) it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') @@ -64,7 +47,7 @@ it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { }) // Somehow the Payment is not appearing in the ecommerce frontend...needs to be checked...TODO it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('DE').click() //Billing country LT, DE etc. @@ -99,7 +82,7 @@ it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Ord cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('DE').click() //Billing country LT, DE etc. @@ -129,7 +112,7 @@ it('C339345: 08 Bancontact Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339346: 09 iDEAL Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -159,7 +142,7 @@ it('C339347: 10 iDEAL Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339348: 11 Klarna Slice It Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() //Billing country LT, DE etc. cy.contains('DE').click() @@ -189,7 +172,7 @@ it('C339349: 12 Klarna Slice It Order BO Shipping, Refunding [Orders API]', () = cy.OrderShippingRefundingOrdersAPI() }) it('C339350: 13 Klarna Pay Later Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -220,7 +203,7 @@ it('C339351: 14 Klarna Pay Later Order BO Shipping, Refunding [Orders API]', () cy.OrderShippingRefundingOrdersAPI() }) it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -258,7 +241,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_on').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -287,7 +270,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -320,7 +303,7 @@ it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339357: 20 IN3 Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -351,7 +334,7 @@ it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.get('.logo').click() cy.get('.blockcart').click() @@ -376,7 +359,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[name="MOLLIE_IMAGES"]').select('big',{force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -394,7 +377,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[class="alert alert-success"]').should('be.visible') }) it('C339361: 24 Paypal Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -424,7 +407,7 @@ it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -466,7 +449,7 @@ it('C339364: 27 SOFORT Order Shipping, Refunding [Orders API]', () => { //Refunding not possible because "We haven't received the payment on our bank accounts yet" message from Mollie Dashboard }) it('C339365: 28 Przelewy24 Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -496,7 +479,7 @@ it('C339366: 29 Przelewy24 Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339367: 30 Giropay Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -526,7 +509,7 @@ it('C339368: 31 Giropay Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339369: 32 EPS Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -556,7 +539,7 @@ it('C339370: 33 EPS Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339371: 34 KBC/CBC Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -587,7 +570,7 @@ it('C339372: 35 KBC/CBC Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339373: 36 Belfius Checkouting [Orders API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -617,7 +600,7 @@ it('C339374: 37 Belfius Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339375: 38 Bank Transfer Checkouting [Orders API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -649,7 +632,7 @@ it('C339376: 39 Bank Transfer Order Shipping, Refunding [Orders API]', () => { }) // Temporary disabled, Payment Method disables automatically in My Mollie Dashboard, because of the fake testing account... it.skip('40 Gift Card Checkouting [Orders API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -697,7 +680,7 @@ it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') }) it('C339379: 44 Bancontact Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -728,7 +711,7 @@ it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]' cy.OrderRefundingPartialPaymentsAPI() }) it('C339381: 46 iDEAL Checkouting [Payments API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -758,7 +741,7 @@ it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () cy.OrderRefundingPartialPaymentsAPI() }) it('C339383: 48 Credit Card Checkouting [Payments API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -792,7 +775,7 @@ it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API] it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { cy.clearCookies() //Payments API item - cy.visit('/SHOP2/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) cy.get('[class="h3 product-title"]').eq(0).click() cy.get('.add > .btn').click() cy.get('.cart-content-btn > .btn-primary').click() @@ -844,7 +827,7 @@ it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { cy.clearCookies() //Payments API item - cy.visit('/SHOP2/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) cy.get('[class="h3 product-title"]').eq(0).click() cy.get('.add > .btn').click() cy.get('.cart-content-btn > .btn-primary').click() @@ -878,7 +861,7 @@ it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Pay cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) it('C339387: 52 Paypal Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -916,7 +899,7 @@ it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { cy.get('#mollie_order > :nth-child(1) > .alert').contains('Refund was made successfully!') }); it('C339389: 54 SOFORT Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -950,7 +933,7 @@ it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { //Refunding is unavailable - information from Mollie Dashboard - but checking the UI itself }); it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -983,7 +966,7 @@ it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () = cy.OrderRefundingPartialPaymentsAPI() }); it('C339393: 58 Giropay Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -1014,7 +997,7 @@ it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339395: 60 EPS Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -1045,7 +1028,7 @@ it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -1077,7 +1060,7 @@ it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339399: 64 Belfius Checkouting [Payments API]', () => { - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() @@ -1108,7 +1091,7 @@ it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { - cy.visit('/SHOP2/en/index.php?controller=history') + cy.visit('/en/index.php?controller=history') // cy.contains('Reorder').click() cy.contains('DE').click() diff --git a/cypress/support/commands.js b/cypress/support/commands.js index d72169af9..26e8673a8 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -602,3 +602,21 @@ const login = (MollieBOFOLoggingIn) => { } login('MollieBOFOLoggingIn') }) +Cypress.Commands.add("CachingBOFOPS8", () => { + //Caching the BO and FO session + const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } + login('MollieBOFOLoggingIn') + }) From fe7bbcdab9ee651e52b601163c70ba1ac5b49d5c Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 13:24:26 +0300 Subject: [PATCH 023/109] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 638391116..7d2d87bed 100755 --- a/Makefile +++ b/Makefile @@ -17,13 +17,13 @@ e2eh1784: # configuring base database mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1784_2.sql # installing module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # uninstalling module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" # installing the module again - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # enabling the module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie --id_shop=3" + docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie" # chmod all folders docker exec -i prestashop-mollie-1784 sh -c "chmod -R 777 /var/www/html" From d90bc303af16bd8c0f57a7a3dfe6b46d91e47d9c Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 14:30:16 +0300 Subject: [PATCH 024/109] test spec updates --- ...mollie.ps1784.ModuleConfiguration.specs.js | 18 +++++++++++-- cypress/e2e/ps1784/02_mollie.ps1784.specs.js | 26 +++++++++++++++---- .../03_mollie.ps1784.Subscriptions.WIP.js | 16 +++++++++++- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js index 1e58df46e..7ef59bad0 100755 --- a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js @@ -31,7 +31,21 @@ function prepareCookie() }); } - +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -48,7 +62,7 @@ afterEach(function() { describe('PS1784 Module initial configuration setup', () => { beforeEach(() => { cy.viewport(1920,1080) - cy.CachingBOFOPS1784() + login('MollieBOFOLoggingIn') }) it('C339305: 01 Connecting test API successsfully', () => { cy.visit('/admin1/') diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js index 8001a270d..c74394744 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.specs.js @@ -31,7 +31,21 @@ function prepareCookie() }); } - +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -42,10 +56,10 @@ afterEach(() => { }) describe('PS1784 Tests Suite', () => { beforeEach(() => { + login('MollieBOFOLoggingIn') cy.viewport(1920,1080) - cy.CachingBOFOPS1784() }) -it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { +it.only('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() cy.ConfOrdersAPI1784() @@ -245,7 +259,7 @@ it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { it('C339353: 16 Klarna Pay Now Order BO Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) -it('C339354: 17 Credit Card Checkouting [Orders API]', () => { +it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Enabling the Single-Click for now cy.visit('/admin1/') cy.OpeningModuleDashboardURL() @@ -277,11 +291,13 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { } ); // reload current page to activate cookie cy.reload(); + cy.CreditCardFillingIframe() + cy.get('[id="submit-button"]').click() cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { +it.only('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js index 9b17d8c2a..b238af467 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js @@ -1,4 +1,19 @@ /// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -11,7 +26,6 @@ describe('PS1784 Subscriptions Test Suit', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') - cy.CachingBOFOPS1784() }) it('C176305 Check if Subscription options added in Product BO', () => { cy.visit('/admin1/') From c751d650b8e96f4fc5a7a29ab03dac935870531f Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 14:45:29 +0300 Subject: [PATCH 025/109] updates for test specs --- ....ps1784.EnablingPaymentsOrdersAPI.specs.js | 129 ++++++++++++++++++ ...784.specs.js => 03_mollie.ps1784.specs.js} | 0 ... => 04_mollie.ps1784.Subscriptions.WIP.js} | 0 3 files changed, 129 insertions(+) create mode 100755 cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js rename cypress/e2e/ps1784/{02_mollie.ps1784.specs.js => 03_mollie.ps1784.specs.js} (100%) rename cypress/e2e/ps1784/{03_mollie.ps1784.Subscriptions.WIP.js => 04_mollie.ps1784.Subscriptions.WIP.js} (100%) diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js new file mode 100755 index 000000000..7ef59bad0 --- /dev/null +++ b/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js @@ -0,0 +1,129 @@ +/// +function prepareCookie() + { + const name = 'PrestaShop-'; + + cy.request( + { + url: '/' + } + ).then((res) => { + + const cookies = res.requestHeaders.cookie.split(/; */); + + cookies.forEach(cookie => { + + const parts = cookie.split('='); + const key = parts[0] + const value = parts[1]; + + if (key.startsWith(name)) { + cy.setCookie( + key, + value, + { + sameSite: 'None', + secure: true + } + ); + } + }); + + }); + } +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +let failEarly = false; +afterEach(() => { + expect(windowConsoleError).to.not.be.called; + if (failEarly) throw new Error("Failing Early due to an API or other module configuration problem. If running on CI, please check Cypress VIDEOS/SCREENSHOTS in the Artifacts for more details.") +}) +afterEach(function() { + if (this.currentTest.state === "failed") failEarly = true +}); +describe('PS1784 Module initial configuration setup', () => { + beforeEach(() => { + cy.viewport(1920,1080) + login('MollieBOFOLoggingIn') + }) +it('C339305: 01 Connecting test API successsfully', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.get('#MOLLIE_ACCOUNT_SWITCH_on').click({force:true}) + cy.get('#MOLLIE_API_KEY_TEST').type((Cypress.env('MOLLIE_TEST_API_KEY')),{delay: 0, log: false}) + cy.get('#module_form_submit_btn').click() +}) +it('C339338: 02 Enabling Mollie carriers in Prestashop successfully', () => { + cy.visit('/admin1/') + cy.get('[id="subtab-AdminPaymentPreferences"]').find('[href]').eq(0).click({force:true}) + cy.get('[class="js-multiple-choice-table-select-column"]').eq(6).click() + cy.get('[class="btn btn-primary"]').eq(3).click() +}) +it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end components, Saving the form, checking if there are no Errors in Console', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.get('[href="#advanced_settings"]').click({force:true}) + cy.get('[id="MOLLIE_PAYMENTSCREEN_LOCALE"]').should('be.visible') + cy.get('[id="MOLLIE_SEND_ORDER_CONFIRMATION"]').should('be.visible') + cy.get('[id="MOLLIE_KLARNA_INVOICE_ON"]').should('be.visible') + cy.get('[class="help-block"]').should('be.visible') + cy.get('[id="MOLLIE_STATUS_AWAITING"]').should('be.visible') + cy.get('[id="MOLLIE_STATUS_PAID"]').should('be.visible') + cy.get('[name="MOLLIE_MAIL_WHEN_PAID"]').should('exist') + cy.get('[name="MOLLIE_MAIL_WHEN_COMPLETED"]').should('exist') + cy.get('[name="MOLLIE_STATUS_COMPLETED"]').should('exist') + cy.get('[name="MOLLIE_MAIL_WHEN_CANCELED"]').should('exist') + cy.get('[name="MOLLIE_STATUS_CANCELED"]').should('exist') + cy.get('[name="MOLLIE_MAIL_WHEN_EXPIRED"]').should('exist') + cy.get('[name="MOLLIE_STATUS_EXPIRED"]').should('exist') + cy.get('[name="MOLLIE_MAIL_WHEN_REFUNDED"]').should('exist') + cy.get('[name="MOLLIE_STATUS_REFUNDED"]').should('exist') + cy.get('[name="MOLLIE_STATUS_OPEN"]').should('exist') + cy.get('[name="MOLLIE_MAIL_WHEN_SHIPPING"]').should('exist') + cy.get('[name="MOLLIE_STATUS_SHIPPING"]').should('exist') + cy.get('[name="MOLLIE_STATUS_PARTIAL_REFUND"]').should('exist') + cy.get('[name="MOLLIE_IMAGES"]').should('exist') + cy.get('[name="MOLLIE_CSS"]').should('exist') + cy.get('[id="MOLLIE_TRACKING_URLS__container"]').should('exist') + cy.get('[id="MOLLIE_AS_MAIN_info"]').should('exist') + cy.get('[id="MOLLIE_AS_STATUSES_info"]').should('exist') + cy.get('[name="MOLLIE_DISPLAY_ERRORS"]').should('exist') + cy.get('[name="MOLLIE_DEBUG_LOG"]').should('exist') + cy.get('#module_form_submit_btn').click({force:true}) //checking the saving + cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert + //cy.window() will check if there are no Errors in console +}); +it('C688472 Checking the Subscriptions tab, and console errors', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.get('#subtab-AdminMollieSubscriptionOrders').click() + cy.get('[id="invertus_mollie_subscription_grid_panel"]').should('be.visible') +}); +it('C688473 Checking the Subscriptions FAQ, and console errors', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.get('#subtab-AdminMollieSubscriptionFAQ').click() + cy.get(':nth-child(2) > .col-lg-12 > .card').should('be.visible') + cy.get(':nth-child(3) > .col-lg-12 > .card').should('be.visible') + cy.get(':nth-child(4) > .col-lg-12 > .card').should('be.visible') + cy.get(':nth-child(5) > .col-lg-12 > .card').should('be.visible') +}); +}) diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.specs.js b/cypress/e2e/ps1784/03_mollie.ps1784.specs.js similarity index 100% rename from cypress/e2e/ps1784/02_mollie.ps1784.specs.js rename to cypress/e2e/ps1784/03_mollie.ps1784.specs.js diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js similarity index 100% rename from cypress/e2e/ps1784/03_mollie.ps1784.Subscriptions.WIP.js rename to cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js From 7da8736923a03ea22b7e98765323acc1f03046e8 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 14:47:24 +0300 Subject: [PATCH 026/109] updates for test specs --- ....ps1784.specs.js => 03_mollie.ps1784.PaymentTests.js} | 9 --------- 1 file changed, 9 deletions(-) rename cypress/e2e/ps1784/{03_mollie.ps1784.specs.js => 03_mollie.ps1784.PaymentTests.js} (99%) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.specs.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js similarity index 99% rename from cypress/e2e/ps1784/03_mollie.ps1784.specs.js rename to cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index c74394744..d34797858 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.specs.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -59,13 +59,6 @@ describe('PS1784 Tests Suite', () => { login('MollieBOFOLoggingIn') cy.viewport(1920,1080) }) -it.only('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.ConfOrdersAPI1784() - cy.get('[type="submit"]').first().click({force:true}) - cy.get('[class="alert alert-success"]').should('be.visible') -}) it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() @@ -291,8 +284,6 @@ it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { } ); // reload current page to activate cookie cy.reload(); - cy.CreditCardFillingIframe() - cy.get('[id="submit-button"]').click() cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') From c0e6c6331b725cf0028b06ec4b6d18d26190f872 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 14:51:49 +0300 Subject: [PATCH 027/109] Update 02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js --- ....ps1784.EnablingPaymentsOrdersAPI.specs.js | 106 ++---------------- 1 file changed, 7 insertions(+), 99 deletions(-) diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js index 7ef59bad0..b195fb8e2 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js @@ -1,36 +1,4 @@ /// -function prepareCookie() - { - const name = 'PrestaShop-'; - - cy.request( - { - url: '/' - } - ).then((res) => { - - const cookies = res.requestHeaders.cookie.split(/; */); - - cookies.forEach(cookie => { - - const parts = cookie.split('='); - const key = parts[0] - const value = parts[1]; - - if (key.startsWith(name)) { - cy.setCookie( - key, - value, - { - sameSite: 'None', - secure: true - } - ); - } - }); - - }); - } //Caching the BO and FO session const login = (MollieBOFOLoggingIn) => { cy.session(MollieBOFOLoggingIn,() => { @@ -39,11 +7,6 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) cy.get('#passwd').type('demodemo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') - cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('demodemo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() }) } //Checking the console for errors @@ -59,71 +22,16 @@ afterEach(() => { afterEach(function() { if (this.currentTest.state === "failed") failEarly = true }); -describe('PS1784 Module initial configuration setup', () => { +describe('PS1784 Enabling Payments', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') }) -it('C339305: 01 Connecting test API successsfully', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.get('#MOLLIE_ACCOUNT_SWITCH_on').click({force:true}) - cy.get('#MOLLIE_API_KEY_TEST').type((Cypress.env('MOLLIE_TEST_API_KEY')),{delay: 0, log: false}) - cy.get('#module_form_submit_btn').click() +it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.ConfOrdersAPI1784() + cy.get('[type="submit"]').first().click({force:true}) + cy.get('[class="alert alert-success"]').should('be.visible') }) -it('C339338: 02 Enabling Mollie carriers in Prestashop successfully', () => { - cy.visit('/admin1/') - cy.get('[id="subtab-AdminPaymentPreferences"]').find('[href]').eq(0).click({force:true}) - cy.get('[class="js-multiple-choice-table-select-column"]').eq(6).click() - cy.get('[class="btn btn-primary"]').eq(3).click() -}) -it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end components, Saving the form, checking if there are no Errors in Console', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.get('[href="#advanced_settings"]').click({force:true}) - cy.get('[id="MOLLIE_PAYMENTSCREEN_LOCALE"]').should('be.visible') - cy.get('[id="MOLLIE_SEND_ORDER_CONFIRMATION"]').should('be.visible') - cy.get('[id="MOLLIE_KLARNA_INVOICE_ON"]').should('be.visible') - cy.get('[class="help-block"]').should('be.visible') - cy.get('[id="MOLLIE_STATUS_AWAITING"]').should('be.visible') - cy.get('[id="MOLLIE_STATUS_PAID"]').should('be.visible') - cy.get('[name="MOLLIE_MAIL_WHEN_PAID"]').should('exist') - cy.get('[name="MOLLIE_MAIL_WHEN_COMPLETED"]').should('exist') - cy.get('[name="MOLLIE_STATUS_COMPLETED"]').should('exist') - cy.get('[name="MOLLIE_MAIL_WHEN_CANCELED"]').should('exist') - cy.get('[name="MOLLIE_STATUS_CANCELED"]').should('exist') - cy.get('[name="MOLLIE_MAIL_WHEN_EXPIRED"]').should('exist') - cy.get('[name="MOLLIE_STATUS_EXPIRED"]').should('exist') - cy.get('[name="MOLLIE_MAIL_WHEN_REFUNDED"]').should('exist') - cy.get('[name="MOLLIE_STATUS_REFUNDED"]').should('exist') - cy.get('[name="MOLLIE_STATUS_OPEN"]').should('exist') - cy.get('[name="MOLLIE_MAIL_WHEN_SHIPPING"]').should('exist') - cy.get('[name="MOLLIE_STATUS_SHIPPING"]').should('exist') - cy.get('[name="MOLLIE_STATUS_PARTIAL_REFUND"]').should('exist') - cy.get('[name="MOLLIE_IMAGES"]').should('exist') - cy.get('[name="MOLLIE_CSS"]').should('exist') - cy.get('[id="MOLLIE_TRACKING_URLS__container"]').should('exist') - cy.get('[id="MOLLIE_AS_MAIN_info"]').should('exist') - cy.get('[id="MOLLIE_AS_STATUSES_info"]').should('exist') - cy.get('[name="MOLLIE_DISPLAY_ERRORS"]').should('exist') - cy.get('[name="MOLLIE_DEBUG_LOG"]').should('exist') - cy.get('#module_form_submit_btn').click({force:true}) //checking the saving - cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert - //cy.window() will check if there are no Errors in console -}); -it('C688472 Checking the Subscriptions tab, and console errors', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.get('#subtab-AdminMollieSubscriptionOrders').click() - cy.get('[id="invertus_mollie_subscription_grid_panel"]').should('be.visible') -}); -it('C688473 Checking the Subscriptions FAQ, and console errors', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.get('#subtab-AdminMollieSubscriptionFAQ').click() - cy.get(':nth-child(2) > .col-lg-12 > .card').should('be.visible') - cy.get(':nth-child(3) > .col-lg-12 > .card').should('be.visible') - cy.get(':nth-child(4) > .col-lg-12 > .card').should('be.visible') - cy.get(':nth-child(5) > .col-lg-12 > .card').should('be.visible') -}); }) From 7c9fc8f79a915eb4a5307b3c01ad96a30ba21d6d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 15:17:56 +0300 Subject: [PATCH 028/109] ps8 test code updates --- .../ps1784/03_mollie.ps1784.PaymentTests.js | 2 +- cypress/e2e/ps8/02_mollie.ps8.specs.js | 18 ++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index d34797858..de310bccf 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -270,7 +270,7 @@ it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Credit card inputing cy.CreditCardFillingIframe() cy.get('.condition-label > .js-terms').click({force:true}) - cy.get('#mollie-save-card').check({force:true}) + cy.get('#mollie-save-card').check({force:true}).check({force:true}) prepareCookie(); cy.get('.ps-shown-by-js > .btn').click({force: true}) cy.setCookie( diff --git a/cypress/e2e/ps8/02_mollie.ps8.specs.js b/cypress/e2e/ps8/02_mollie.ps8.specs.js index e7257e75c..fe9fcbf4b 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.specs.js @@ -31,11 +31,25 @@ function prepareCookie() }); } - + //Caching the BO and FO session + const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } describe('PS8 Tests Suite', () => { beforeEach(() => { cy.viewport(1920,1080) - cy.CachingBOFOPS8() + login('MollieBOFOLoggingIn') }) it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') From 86363373096fcaaf5fc9538546ebad3392aeb7e9 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 19:21:21 +0300 Subject: [PATCH 029/109] ps1784 test spec updates --- cypress.config.js | 2 +- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index a15ae6978..804bb33e0 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -4,7 +4,7 @@ module.exports = defineConfig({ chromeWebSecurity: false, experimentalMemoryManagement: true, experimentalSourceRewriting: true, - numTestsKeptInMemory: 0, + numTestsKeptInMemory: 5, defaultCommandTimeout: 15000, projectId: 'xb89dr', retries: 3, diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index de310bccf..c713ec3bc 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -269,8 +269,8 @@ it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.contains('Card').click({force:true}) //Credit card inputing cy.CreditCardFillingIframe() + cy.contains('Use saved card').click() cy.get('.condition-label > .js-terms').click({force:true}) - cy.get('#mollie-save-card').check({force:true}).check({force:true}) prepareCookie(); cy.get('.ps-shown-by-js > .btn').click({force: true}) cy.setCookie( @@ -311,10 +311,11 @@ it.only('C339355: 18 Check if customerId is passed during the 2nd payment using } ); // reload current page to activate cookie cy.reload(); + cy.get('#container').should('be.visible') cy.visit('/admin1/') //Disabling the single-click - no need again cy.OpeningModuleDashboardURL() - cy.get('#MOLLIE_SINGLE_CLICK_PAYMENT_off').click({force:true}) + cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_off').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) From 39badac44aeba4e74c279f5b078aa5eb3e1f4e93 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 19:53:54 +0300 Subject: [PATCH 030/109] in3 payment wip --- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index c713ec3bc..77c7c58e1 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -252,7 +252,7 @@ it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { it('C339353: 16 Klarna Pay Now Order BO Shipping, Refunding [Orders API]', () => { cy.OrderShippingRefundingOrdersAPI() }) -it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { +it('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Enabling the Single-Click for now cy.visit('/admin1/') cy.OpeningModuleDashboardURL() @@ -288,7 +288,7 @@ it.only('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it.only('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { +it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { cy.visit('/en/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() @@ -322,11 +322,11 @@ it.only('C339355: 18 Check if customerId is passed during the 2nd payment using it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it('C339357: 20 IN3 Checkouting [Orders API]', () => { +it.only('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() - cy.contains('NL').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() From 2fc8b22dc2bb148983ec6035d78104a0cdafaecb Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 21 Aug 2023 19:55:08 +0300 Subject: [PATCH 031/109] Update 03_mollie.ps8.Subscriptions.WIP.js --- .../ps8/03_mollie.ps8.Subscriptions.WIP.js | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) mode change 100644 => 100755 cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js diff --git a/cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js old mode 100644 new mode 100755 index efa705bb8..1a04e9a7b --- a/cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js +++ b/cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js @@ -1,22 +1,19 @@ -//Caching the BO and FO session -const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) - cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - //switching the multistore PS1784 - cy.get('#header_shop > .dropdown').click() - cy.get('.open > .dropdown-menu').find('[class="shop"]').eq(1).find('[href]').eq(0).click() - cy.visit('/SHOP2/index.php?controller=my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } - +/// + //Caching the BO and FO session + const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { From 1a1475eaa9ce12a1297a2b74b71cc38f9fc6e43a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 09:38:15 +0300 Subject: [PATCH 032/109] Update .htaccess1784 --- .docker/.htaccess1784 | 6 ------ 1 file changed, 6 deletions(-) mode change 100644 => 100755 .docker/.htaccess1784 diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1784 old mode 100644 new mode 100755 index 54450e1ca..1db9638d9 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1784 @@ -11,7 +11,6 @@ RewriteEngine on #Domain: demoshop1784debug.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] @@ -35,12 +34,10 @@ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBAS RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] #Domain: demoshop1784debug.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] @@ -69,16 +66,13 @@ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBAS RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^.*$ - [NC,L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L] From eab976d214ab1aa7c99af8dd7650295d505c6c12 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 09:42:30 +0300 Subject: [PATCH 033/109] Update prestashop_1784_2.sql --- tests/seed/database/prestashop_1784_2.sql | 63 ++++++++++++++++++----- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index 5013091cc..719d1941e 100644 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -1184,7 +1184,8 @@ INSERT INTO `ps_address` (`id_address`, `id_country`, `id_state`, `id_customer`, (10, 130, 0, 3, 0, 0, 0, 'LT', 'TEST COMP', 'TEST', 'TEST', 'TEST 123-123', 'TEST', '54467', 'Kaunas', '', '+37067300000', '', '987654321', '', '2022-03-22 12:57:39', '2022-03-22 12:57:39', 1, 0), (11, 130, 0, 14, 0, 0, 0, 'My Address', '123456', 'AUT', 'AUT', 'ADDR', '', '54469', 'CIT', '', '+370 000', '', '123456', '', '2022-03-23 08:38:12', '2022-03-23 08:38:12', 1, 0), (12, 130, 0, 17, 0, 0, 0, 'My Address', '123456', 'AUT', 'AUT', 'ADDR', '', '54469', 'CIT', '', '+370 000', '', '123456', '', '2022-03-23 16:14:51', '2022-03-23 16:14:51', 1, 0), -(13, 13, 0, 3, 0, 0, 0, 'NL', 'NL123', 'TEST', 'TEST', 'Ackerweg 30', 'TEST', '5975 PL', 'Sevenum', '', '06-14522222', '', '23423523', '', '2022-06-17 10:55:24', '2022-06-17 10:55:24', 1, 0); +(13, 13, 0, 3, 0, 0, 0, 'NL', 'NL123', 'TEST', 'TEST', 'Ackerweg 30', 'TEST', '5975 PL', 'Sevenum', '', '06-14522222', '', '23423523', '', '2022-06-17 10:55:24', '2022-06-17 10:55:24', 1, 0), +(14, 13, 0, 4, 0, 0, 0, 'NL', 'TEST COMP', 'TEST', 'TEST', 'Biltstraat 467', 'TEST123-312', '3572 AX', 'Utrecht', '', '030 276 4970', '', '23423523', '', '2023-08-22 07:39:58', '2023-08-22 07:39:58', 1, 0); DROP TABLE IF EXISTS `ps_address_format`; CREATE TABLE `ps_address_format` ( @@ -3050,7 +3051,8 @@ INSERT INTO `ps_cart` (`id_cart`, `id_shop_group`, `id_shop`, `id_carrier`, `del (103, 1, 3, 1, '{\"9\":\"1,\"}', 5, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:09:12', '2023-04-05 11:09:18', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"77001047173e0075371114d50dac23c31e9f64de\"}'), (104, 1, 3, 1, '{\"9\":\"1,\"}', 5, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:09:50', '2023-04-05 11:09:56', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"77001047173e0075371114d50dac23c31e9f64de\"}'), (105, 1, 3, 0, '', 6, 9, 9, 2, 3, 559, 'c87361b275fdc73622d49fd9819156e4', 0, 0, '', 0, 0, '2023-04-05 11:12:06', '2023-04-05 11:12:06', NULL), -(106, 1, 1, 1, '{\"8\":\"1,\"}', 5, 8, 8, 2, 4, 777, '2a2e13b68c1848dd39c9421bab31b01b', 0, 0, '', 0, 0, '2023-08-21 07:27:00', '2023-08-21 07:34:04', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"ea17cf1aa50fc85327eee2165d3954f47828a98a\"}'); +(106, 1, 1, 1, '{\"8\":\"1,\"}', 5, 8, 8, 2, 4, 777, '2a2e13b68c1848dd39c9421bab31b01b', 0, 0, '', 0, 0, '2023-08-21 07:27:00', '2023-08-21 07:34:04', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"ea17cf1aa50fc85327eee2165d3954f47828a98a\"}'), +(107, 1, 1, 0, '', 1, 7, 7, 2, 4, 777, '2a2e13b68c1848dd39c9421bab31b01b', 0, 0, '', 0, 0, '2023-08-22 07:38:42', '2023-08-22 07:38:42', NULL); DROP TABLE IF EXISTS `ps_cart_cart_rule`; CREATE TABLE `ps_cart_cart_rule` ( @@ -3743,7 +3745,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (5, NULL, NULL, 'PS_GROUP_FEATURE_ACTIVE', '1', '2022-03-18 13:44:54', '2022-03-18 13:44:54'), (6, NULL, NULL, 'PS_CURRENCY_DEFAULT', '2', '0000-00-00 00:00:00', '2022-03-22 09:44:04'), (7, NULL, NULL, 'PS_COUNTRY_DEFAULT', '1', '0000-00-00 00:00:00', '2022-03-22 08:37:17'), -(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-08-21 07:28:11'), +(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-08-22 07:37:11'), (9, NULL, NULL, 'PS_ORDER_OUT_OF_STOCK', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (10, NULL, NULL, 'PS_LAST_QTIES', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (11, NULL, NULL, 'PS_CONDITIONS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4180,8 +4182,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (491, NULL, NULL, 'ONBOARDINGV2_SHUT_DOWN', '1', '2022-03-21 16:51:05', '2022-03-21 16:51:05'), (492, NULL, NULL, 'ONBOARDINGV2_CURRENT_STEP', '11', '2022-03-21 16:51:07', '2022-03-21 16:51:07'), (533, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', NULL, '2022-03-22 07:50:06', '2023-08-21 07:36:34'), -(534, NULL, NULL, 'PS_CCCJS_VERSION', '5', '2022-03-22 07:51:23', '2023-08-21 07:28:11'), -(535, NULL, NULL, 'PS_CCCCSS_VERSION', '5', '2022-03-22 07:51:23', '2023-08-21 07:28:11'), +(534, NULL, NULL, 'PS_CCCJS_VERSION', '6', '2022-03-22 07:51:23', '2023-08-22 07:37:11'), +(535, NULL, NULL, 'PS_CCCCSS_VERSION', '6', '2022-03-22 07:51:23', '2023-08-22 07:37:11'), (536, 1, 1, 'BANNER_IMG', NULL, '2022-03-22 07:52:25', '2022-03-22 07:52:25'), (537, 1, 1, 'BANNER_LINK', NULL, '2022-03-22 07:52:25', '2022-03-22 07:52:25'), (538, 1, 1, 'BANNER_DESC', NULL, '2022-03-22 07:52:25', '2022-03-22 07:52:25'), @@ -4621,7 +4623,8 @@ INSERT INTO `ps_connections` (`id_connections`, `id_shop_group`, `id_shop`, `id_ (174, 1, 3, 2651, 4, 1474943477, '2023-04-05 11:20:15', ''), (175, 1, 3, 2663, 4, 1474943477, '2023-04-05 11:22:15', ''), (176, 1, 3, 2664, 4, 1474943475, '2023-04-05 11:22:16', ''), -(177, 1, 1, 777, 2, 1404794126, '2023-08-21 07:26:48', ''); +(177, 1, 1, 777, 2, 1404794126, '2023-08-21 07:26:48', ''), +(178, 1, 1, 777, 2, 1404794126, '2023-08-22 07:36:07', ''); DROP TABLE IF EXISTS `ps_connections_page`; CREATE TABLE `ps_connections_page` ( @@ -6563,7 +6566,7 @@ INSERT INTO `ps_customer` (`id_customer`, `id_shop_group`, `id_shop`, `id_gender (1, 1, 1, 1, 3, 1, 0, '', '', '', 'Anonymous', 'Anonymous', 'anonymous@psgdpr.com', 'prestashop', '2022-03-18 05:46:19', '0000-00-00', 0, '', '0000-00-00 00:00:00', 1, '', 0.000000, 0, 0, '3a4b0cf34ebfc312864d223e16b1933b', '', 0, 0, 0, '2022-03-18 13:46:19', '2022-03-18 13:46:19', '', '0000-00-00 00:00:00'), (2, 1, 1, 1, 3, 1, 0, '', '', '', 'John', 'DOE', 'pub@prestashop.com', '4ca759021832aa869edb52c32e3505bf', '2022-03-18 05:46:59', '1970-01-15', 1, '', '2013-12-13 08:19:15', 1, '', 0.000000, 0, 0, '6abc5fd172e577f03982d4897dbd80dd', '', 1, 0, 0, '2022-03-18 13:46:59', '2022-03-18 13:46:59', '', '0000-00-00 00:00:00'), (3, 1, 3, 1, 3, 6, 0, NULL, NULL, NULL, 'TEST', 'TEST', 'demo@demo.com', '$2y$10$lX.QL.p2B9gZ3Gp3tLNGf.RBECHobOwmxWINL2OLdI2ZTwlKpyUeC', '2022-03-22 04:21:30', '0000-00-00', 0, NULL, '0000-00-00 00:00:00', 0, NULL, 0.000000, 0, 0, 'c87361b275fdc73622d49fd9819156e4', NULL, 1, 0, 0, '2022-03-22 10:21:30', '2023-04-05 11:11:51', NULL, '0000-00-00 00:00:00'), -(4, 1, 1, 1, 3, 5, 0, NULL, NULL, NULL, 'TEST', 'TEST', 'demo@demo.com', '$2y$10$DlSF.ajwpzcMajQyrYx7QuXuynJZ.5zElY73CQyfmA4kvHVljTBKi', '2022-03-22 04:28:08', '0000-00-00', 0, NULL, '0000-00-00 00:00:00', 0, NULL, 0.000000, 0, 0, '2a2e13b68c1848dd39c9421bab31b01b', NULL, 1, 0, 0, '2022-03-22 10:28:08', '2023-08-21 07:26:46', NULL, '0000-00-00 00:00:00'), +(4, 1, 1, 1, 3, 1, 0, NULL, NULL, NULL, 'TEST', 'TEST', 'demo@demo.com', '$2y$10$DlSF.ajwpzcMajQyrYx7QuXuynJZ.5zElY73CQyfmA4kvHVljTBKi', '2022-03-22 04:28:08', '0000-00-00', 0, NULL, '0000-00-00 00:00:00', 0, NULL, 0.000000, 0, 0, '2a2e13b68c1848dd39c9421bab31b01b', NULL, 1, 0, 0, '2022-03-22 10:28:08', '2023-08-22 07:36:03', NULL, '0000-00-00 00:00:00'), (5, 1, 1, 1, 3, 5, 0, '', '', '', 'AUT', 'AUT', 'testemail582761@testing.com', '$2y$10$m.K/Ai4igZ9wtG10ePK1fuWDOYsYlVgIWMn399fXy2y86AmG8vxMy', '2022-03-23 02:24:05', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, 'ab7f21e4aa47d691761ba425f9328070', '', 1, 0, 0, '2022-03-23 08:24:05', '2022-03-23 08:24:05', '', '0000-00-00 00:00:00'), (6, 1, 1, 1, 3, 5, 0, '', '', '', 'AUT', 'AUT', 'testemail569040@testing.com', '$2y$10$neU.cusyV.dHSG6O8FcQtuCNne4GSNqKvlwx62vjrAU8Dlz0D44Xy', '2022-03-23 02:24:40', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, 'df2d197e4c2645bbea847426c6c8192f', '', 1, 0, 0, '2022-03-23 08:24:40', '2022-03-23 08:24:40', '', '0000-00-00 00:00:00'), (7, 1, 1, 1, 3, 5, 0, '', '', '', 'AUT', 'AUT', 'testemail697645@testing.com', '$2y$10$4TUCxAqGhmn11YiyrIhtPOWeoeJALq.34opKHo/97TNFcgmTqoHJy', '2022-03-23 02:25:02', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, '073a1016cef8b45ab2e8d038ecdd9497', '', 1, 0, 0, '2022-03-23 08:25:02', '2022-03-23 08:25:02', '', '0000-00-00 00:00:00'), @@ -6696,7 +6699,8 @@ INSERT INTO `ps_customer_session` (`id_customer_session`, `id_customer`, `token` (54, 3, 'b2bd8b1d4dcbd7af237da8288ea79d257d6713eb'), (55, 3, 'fd19d3ad25f2845d92ae90cf1a28f752ac7e12a9'), (56, 3, 'dd77f79431391f1b1332ea0f2cfb7de9f07dab68'), -(57, 4, '545fbc9b7abffae9676bb7979f8c2a51ad1fd485'); +(57, 4, '545fbc9b7abffae9676bb7979f8c2a51ad1fd485'), +(58, 4, '2d8aa2662afb94688393eec10ad162e7a452fa5b'); DROP TABLE IF EXISTS `ps_customer_thread`; CREATE TABLE `ps_customer_thread` ( @@ -6883,7 +6887,7 @@ CREATE TABLE `ps_employee` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_employee` (`id_employee`, `id_profile`, `id_lang`, `lastname`, `firstname`, `email`, `passwd`, `last_passwd_gen`, `stats_date_from`, `stats_date_to`, `stats_compare_from`, `stats_compare_to`, `stats_compare_option`, `preselect_date_range`, `bo_color`, `bo_theme`, `bo_css`, `default_tab`, `bo_width`, `bo_menu`, `active`, `optin`, `id_last_order`, `id_last_customer_message`, `id_last_customer`, `last_connection_date`, `reset_password_token`, `reset_password_validity`, `has_enabled_gravatar`) VALUES -(1, 1, 1, 'DOCKERTEST', 'DOCKERTEST', 'demo@demo.com', '$2y$10$uBqV01rbU9HfTOavWJBO1.V9yF1CDKHXR8qhcCreYZhBSnn..X8uy', '2022-03-18 05:44:56', '2022-02-18', '2022-03-18', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-08-21', NULL, '0000-00-00 00:00:00', 0); +(1, 1, 1, 'DOCKERTEST', 'DOCKERTEST', 'demo@demo.com', '$2y$10$uBqV01rbU9HfTOavWJBO1.V9yF1CDKHXR8qhcCreYZhBSnn..X8uy', '2022-03-18 05:44:56', '2022-02-18', '2022-03-18', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-08-22', NULL, '0000-00-00 00:00:00', 0); DROP TABLE IF EXISTS `ps_employee_session`; CREATE TABLE `ps_employee_session` ( @@ -6921,7 +6925,8 @@ INSERT INTO `ps_employee_session` (`id_employee_session`, `id_employee`, `token` (32, 1, 'd62c390c12e079ab0bbc5193cbd54f9f97be4307'), (33, 1, '9d36eafff20e95bf20932a6ddc59e7dcfc93fa0b'), (34, 1, '471603853984dc736b3c105e01eef2d0bfb24c31'), -(35, 1, '7b8ba5063f812577b765acd62661794b34e5acfe'); +(35, 1, '7b8ba5063f812577b765acd62661794b34e5acfe'), +(36, 1, 'd9141415d2567c42f919c175cacbd5e34124f286'); DROP TABLE IF EXISTS `ps_employee_shop`; CREATE TABLE `ps_employee_shop` ( @@ -9977,7 +9982,38 @@ INSERT INTO `ps_guest` (`id_guest`, `id_operating_system`, `id_web_browser`, `id (2749, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (2750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (2751, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(2752, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); +(2752, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2753, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2754, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2755, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2756, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2758, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2759, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2760, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2761, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2762, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2763, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2764, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2765, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2766, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2769, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2770, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2771, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2772, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2773, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2774, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2775, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2776, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2777, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2778, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2779, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2780, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2781, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2782, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(2783, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); DROP TABLE IF EXISTS `ps_homeslider`; CREATE TABLE `ps_homeslider` ( @@ -13786,7 +13822,8 @@ INSERT INTO `ps_log` (`id_log`, `severity`, `error_code`, `message`, `object_typ (1654, 1, 0, 'Protect vendor folder in module mollie', '', 0, 3, NULL, 5, 0, 0, '2023-08-21 07:18:20', '2023-08-21 07:18:20'), (1655, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 5, 1, 1, '2023-08-21 07:27:31', '2023-08-21 07:27:31'), (1656, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 1, '2023-08-21 07:30:55', '2023-08-21 07:30:55'), -(1657, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 1, '2023-08-21 07:31:13', '2023-08-21 07:31:13'); +(1657, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 1, '2023-08-21 07:31:13', '2023-08-21 07:31:13'), +(1658, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 5, 1, 1, '2023-08-22 07:36:36', '2023-08-22 07:36:36'); DROP TABLE IF EXISTS `ps_mail`; CREATE TABLE `ps_mail` ( @@ -27979,4 +28016,4 @@ INSERT INTO `ps_zone_shop` (`id_zone`, `id_shop`) VALUES (7, 3), (8, 3); --- 2023-08-21 06:41:36 +-- 2023-08-22 06:41:39 From ee798cff42c7c68ab2493b7083d91e5de0d37d4c Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 10:11:53 +0300 Subject: [PATCH 034/109] ps1784 test updates --- cypress.config.js | 2 +- .../e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 14 +++++++------- tests/seed/database/prestashop_1784_2.sql | 0 3 files changed, 8 insertions(+), 8 deletions(-) mode change 100644 => 100755 tests/seed/database/prestashop_1784_2.sql diff --git a/cypress.config.js b/cypress.config.js index 804bb33e0..a15ae6978 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -4,7 +4,7 @@ module.exports = defineConfig({ chromeWebSecurity: false, experimentalMemoryManagement: true, experimentalSourceRewriting: true, - numTestsKeptInMemory: 5, + numTestsKeptInMemory: 0, defaultCommandTimeout: 15000, projectId: 'xb89dr', retries: 3, diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index 77c7c58e1..caa46116b 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -322,11 +322,11 @@ it('C339355: 18 Check if customerId is passed during the 2nd payment using Singl it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it.only('C339357: 20 IN3 Checkouting [Orders API]', () => { +it('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('NL').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -351,7 +351,7 @@ it.only('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { +it.skip('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { @@ -370,14 +370,14 @@ it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { cy.get('.blockcart').click() cy.get('.remove-from-cart > .material-icons').click() }) -it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { +it.only('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[name="MOLLIE_IMAGES"]').select('big') cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') - cy.visit('/SHOP2/de/index.php?controller=history') + cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() @@ -394,7 +394,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) -it('C339361: 24 Paypal Checkouting [Orders API]', () => { +it.only('C339361: 24 Paypal Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() @@ -422,7 +422,7 @@ it('C339361: 24 Paypal Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { +it.only('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql old mode 100644 new mode 100755 From c1b5a4ea147797c134373175564428fa83313339 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 10:27:35 +0300 Subject: [PATCH 035/109] Update 03_mollie.ps1784.PaymentTests.js --- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index caa46116b..acf47f21c 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -370,7 +370,7 @@ it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { cy.get('.blockcart').click() cy.get('.remove-from-cart > .material-icons').click() }) -it.only('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { +it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) @@ -394,7 +394,7 @@ it.only('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) -it.only('C339361: 24 Paypal Checkouting [Orders API]', () => { +it('C339361: 24 Paypal Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() @@ -422,7 +422,7 @@ it.only('C339361: 24 Paypal Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.only('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { +it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { From c959d406ff7abfa9d54a8fd138c0bd2f96df4e8d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 12:51:42 +0300 Subject: [PATCH 036/109] ps1784 test updates --- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 2 -- cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index acf47f21c..9ad83ce1d 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -269,7 +269,6 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.contains('Card').click({force:true}) //Credit card inputing cy.CreditCardFillingIframe() - cy.contains('Use saved card').click() cy.get('.condition-label > .js-terms').click({force:true}) prepareCookie(); cy.get('.ps-shown-by-js > .btn').click({force: true}) @@ -311,7 +310,6 @@ it('C339355: 18 Check if customerId is passed during the 2nd payment using Singl } ); // reload current page to activate cookie cy.reload(); - cy.get('#container').should('be.visible') cy.visit('/admin1/') //Disabling the single-click - no need again cy.OpeningModuleDashboardURL() diff --git a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js index b238af467..1deff0fd6 100755 --- a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js @@ -45,12 +45,12 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('#submit').click() cy.get('.growl-message').contains('Settings updated.') //Check if Subscription options are in Product Page FO - cy.visit('/SHOP2/de/') + cy.visit('/de/') cy.get('[data-id-product="8"]').click() //possible PS1784 notice exception, checking with dev... cy.get('a').click() //wip ... //Check if Subscription options are implemented in My Account FO - cy.visit('/SHOP2/') + cy.visit('/en/') cy.get('[class="account"]').click() cy.contains('Subscriptions').click() cy.get('[class="page-content"]').should('be.visible') From ed26c59bf3b9e0cef342f14a7030dac76de5cd85 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 13:44:53 +0300 Subject: [PATCH 037/109] Update 03_mollie.ps1784.PaymentTests.js --- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index 9ad83ce1d..5af1b618a 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -1089,7 +1089,7 @@ it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); -it('C339399: 64 Belfius Checkouting [Payments API]', () => { +it.only('C339399: 64 Belfius Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') cy.get('a').click() // @@ -1118,10 +1118,10 @@ it('C339399: 64 Belfius Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { +it.only('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); -it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { +it.only('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') cy.get('a').click() // @@ -1150,7 +1150,7 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { +it.only('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); }) From 5e68c81a0f1962bd6838a755a73a0a82b8b7c8d1 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 13:47:05 +0300 Subject: [PATCH 038/109] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 .gitignore diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 index 1db9cf7d4..61aa94509 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ cypress/screenshots vendor node_modules composer.lock +ngrok From bcbd5c082e36cdb1873301c23b74b960facf3752 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 22 Aug 2023 15:51:58 +0300 Subject: [PATCH 039/109] ps1784 finalized updates --- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 8 ++++---- cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index 5af1b618a..1a1dfdbf3 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -1089,7 +1089,7 @@ it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); -it.only('C339399: 64 Belfius Checkouting [Payments API]', () => { +it('C339399: 64 Belfius Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') cy.get('a').click() // @@ -1118,10 +1118,10 @@ it.only('C339399: 64 Belfius Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.only('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { +it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); -it.only('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { +it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') cy.get('a').click() // @@ -1150,7 +1150,7 @@ it.only('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.only('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { +it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why cy.OrderRefundingPartialPaymentsAPI() }); }) diff --git a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js index 1deff0fd6..fa6f3de02 100755 --- a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js @@ -47,7 +47,6 @@ it('C176305 Check if Subscription options added in Product BO', () => { //Check if Subscription options are in Product Page FO cy.visit('/de/') cy.get('[data-id-product="8"]').click() //possible PS1784 notice exception, checking with dev... - cy.get('a').click() //wip ... //Check if Subscription options are implemented in My Account FO cy.visit('/en/') From f5eeaf35d2d96610343685d7230baaf3ef946c8b Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 09:45:27 +0300 Subject: [PATCH 040/109] disabling debug mode --- .docker/.htaccess1784 | 44 ++--- .docker/.htaccess8 | 56 +++--- .github/workflows/E2E_On_PR.yml | 4 +- docker-compose.1784.yml | 2 +- docker-compose.8.yml | 2 +- docker-compose.e2e.1784.yml | 2 +- tests/seed/database/prestashop_1784_2.sql | 68 ++++---- tests/seed/database/prestashop_8.sql | 204 +++++++++++----------- 8 files changed, 191 insertions(+), 191 deletions(-) diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1784 index 1db9638d9..3be87fcb8 100755 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1784 @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1784debug.ngrok.io +#Domain: demoshop1784.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1784debug.ngrok.io +#Domain: demoshop1784.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index 8e216b1ad..1b771126d 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,77 +10,77 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8debug.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +#Domain: demoshop8.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop8debug.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +#Domain: demoshop8.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^shop2$ /shop2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^shop2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^.*$ - [NC,L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index fe3d85f7c..d0dcbe2a3 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -20,7 +20,7 @@ jobs: subdomain: 'demoshop1784debug' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784debug.ngrok.io' + url: 'https://demoshop1784.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - prestashop: 'PS8' @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8debug.ngrok.io' + url: 'https://demoshop8.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.1784.yml b/docker-compose.1784.yml index 7523dd711..4bfa923c9 100755 --- a/docker-compose.1784.yml +++ b/docker-compose.1784.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1784debug.ngrok.io:8002 + PS_DOMAIN: demoshop1784.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 8a482483a..2a06a79bc 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8debug.ngrok.io:8142 + PS_DOMAIN: demoshop8.ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.e2e.1784.yml b/docker-compose.e2e.1784.yml index 9da5f92c6..76715f054 100644 --- a/docker-compose.e2e.1784.yml +++ b/docker-compose.e2e.1784.yml @@ -6,7 +6,7 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1784debug.ngrok.io + - CYPRESS_baseUrl=https://demoshop1784.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 entrypoint: cypress run --spec "**/cypress/integration/ps1784/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index 719d1941e..ad281f977 100755 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -3971,8 +3971,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4652,36 +4652,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1784debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1784debug.ngrok.io/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1784debug.ngrok.io/__/', 'demoshop1784debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1784.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1784.ngrok.io/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1784.ngrok.io/__/', 'demoshop1784.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -24103,8 +24103,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index cb56f86d8..41f86b2be 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3278,8 +3278,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3758,56 +3758,56 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-05-02 12:19:12'), -(2, 3, '', 'demoshop8debug.ngrok.io/', '', '2023-05-08 16:44:27'), -(3, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(4, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(5, 4, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), -(6, 5, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), -(7, 6, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), -(8, 11, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), -(9, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), -(10, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), -(11, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), -(12, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), -(13, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), -(14, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), -(15, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), -(16, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), -(17, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), -(18, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), -(19, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), -(20, 11, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), -(21, 11, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), -(22, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), -(23, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), -(24, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), -(25, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), -(26, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), -(27, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), -(28, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), -(29, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), -(30, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), -(31, 19, '', 'demoshop8debug.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), -(32, 19, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), -(33, 20, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), -(34, 21, '', 'demoshop8debug.ngrok.io/en/', '', '2023-05-15 10:12:52'), -(35, 22, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), -(36, 27, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), -(37, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), -(38, 27, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), -(39, 27, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), -(40, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), -(41, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), -(42, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), -(43, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), -(44, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), -(45, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), -(46, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), -(47, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), -(48, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), -(49, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), -(50, 44, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); +(1, 2, '', 'demoshop8.ngrok.io/', '', '2023-05-02 12:19:12'), +(2, 3, '', 'demoshop8.ngrok.io/', '', '2023-05-08 16:44:27'), +(3, 3, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), +(4, 3, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), +(5, 4, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), +(6, 5, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), +(7, 6, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), +(8, 11, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), +(9, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), +(10, 11, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), +(11, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), +(12, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), +(13, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), +(14, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), +(15, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), +(16, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), +(17, 11, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), +(18, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), +(19, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), +(20, 11, 'https://demoshop8.ngrok.io/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), +(21, 11, 'https://demoshop8.ngrok.io/__/', 'demoshop8.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), +(22, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), +(23, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), +(24, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), +(25, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), +(26, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), +(27, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), +(28, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), +(29, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), +(30, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), +(31, 19, '', 'demoshop8.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), +(32, 19, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), +(33, 20, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), +(34, 21, '', 'demoshop8.ngrok.io/en/', '', '2023-05-15 10:12:52'), +(35, 22, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), +(36, 27, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), +(37, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), +(38, 27, 'https://demoshop8.ngrok.io/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), +(39, 27, 'https://demoshop8.ngrok.io/__/', 'demoshop8.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), +(40, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), +(41, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), +(42, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), +(43, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), +(44, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), +(45, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), +(46, 27, 'https://demoshop8.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), +(47, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), +(48, 27, 'https://demoshop8.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), +(49, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), +(50, 44, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -13415,55 +13415,55 @@ CREATE TABLE `ps_pagenotfound` ( INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES (1, 1, 1, '/robots.txt', '', '2023-05-08 14:44:32'), (2, 1, 1, '/robots.txt', '', '2023-05-08 14:44:33'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), -(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), -(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), -(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), -(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), -(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), -(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), -(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), -(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), -(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), -(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), -(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), -(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), -(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), -(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), -(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), -(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), +(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), +(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), +(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), +(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), +(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), +(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), +(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), +(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), +(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), +(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), +(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), +(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), +(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), +(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), +(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), +(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), (28, 1, 1, '/robots.txt', '', '2023-05-15 08:12:52'), -(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), -(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), -(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), -(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), -(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), -(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), -(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), -(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), -(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), -(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), -(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), -(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), -(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), -(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), -(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), -(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), -(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), -(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), -(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); +(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), +(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), +(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), +(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), +(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), +(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), +(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), +(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), +(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), +(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), +(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), +(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), +(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), +(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), +(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), +(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), +(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), +(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), +(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), +(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), +(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), +(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), +(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -17470,8 +17470,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1), -(2, 2, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', 'shop2/', 1, 1); +(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1), +(2, 2, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', 'shop2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 6b110d13e05aef78ebb1c9988dd1f834b5452b4f Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 09:46:00 +0300 Subject: [PATCH 041/109] Revert "disabling debug mode" This reverts commit 0f70ace441713f89a3bc9111ad6201bc3c89df60. --- .docker/.htaccess1784 | 44 ++--- .docker/.htaccess8 | 56 +++--- .github/workflows/E2E_On_PR.yml | 4 +- docker-compose.1784.yml | 2 +- docker-compose.8.yml | 2 +- docker-compose.e2e.1784.yml | 2 +- tests/seed/database/prestashop_1784_2.sql | 68 ++++---- tests/seed/database/prestashop_8.sql | 204 +++++++++++----------- 8 files changed, 191 insertions(+), 191 deletions(-) diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1784 index 3be87fcb8..1db9638d9 100755 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1784 @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1784.ngrok.io +#Domain: demoshop1784debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1784.ngrok.io +#Domain: demoshop1784debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index 1b771126d..8e216b1ad 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,77 +10,77 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +#Domain: demoshop8debug.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop8.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +#Domain: demoshop8debug.ngrok.io +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^shop2$ /shop2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^shop2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^.*$ - [NC,L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index d0dcbe2a3..fe3d85f7c 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -20,7 +20,7 @@ jobs: subdomain: 'demoshop1784debug' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784.ngrok.io' + url: 'https://demoshop1784debug.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - prestashop: 'PS8' @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8.ngrok.io' + url: 'https://demoshop8debug.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.1784.yml b/docker-compose.1784.yml index 4bfa923c9..7523dd711 100755 --- a/docker-compose.1784.yml +++ b/docker-compose.1784.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1784.ngrok.io:8002 + PS_DOMAIN: demoshop1784debug.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 2a06a79bc..8a482483a 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8.ngrok.io:8142 + PS_DOMAIN: demoshop8debug.ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.e2e.1784.yml b/docker-compose.e2e.1784.yml index 76715f054..9da5f92c6 100644 --- a/docker-compose.e2e.1784.yml +++ b/docker-compose.e2e.1784.yml @@ -6,7 +6,7 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1784.ngrok.io + - CYPRESS_baseUrl=https://demoshop1784debug.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 entrypoint: cypress run --spec "**/cypress/integration/ps1784/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index ad281f977..719d1941e 100755 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -3971,8 +3971,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4652,36 +4652,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1784.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1784.ngrok.io/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1784.ngrok.io/__/', 'demoshop1784.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1784debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1784debug.ngrok.io/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1784debug.ngrok.io/__/', 'demoshop1784debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -24103,8 +24103,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 41f86b2be..cb56f86d8 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3278,8 +3278,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3758,56 +3758,56 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8.ngrok.io/', '', '2023-05-02 12:19:12'), -(2, 3, '', 'demoshop8.ngrok.io/', '', '2023-05-08 16:44:27'), -(3, 3, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(4, 3, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(5, 4, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), -(6, 5, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), -(7, 6, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), -(8, 11, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), -(9, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), -(10, 11, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), -(11, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), -(12, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), -(13, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), -(14, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), -(15, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), -(16, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), -(17, 11, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), -(18, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), -(19, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), -(20, 11, 'https://demoshop8.ngrok.io/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), -(21, 11, 'https://demoshop8.ngrok.io/__/', 'demoshop8.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), -(22, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), -(23, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), -(24, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), -(25, 11, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), -(26, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), -(27, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), -(28, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), -(29, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), -(30, 19, '', 'demoshop8.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), -(31, 19, '', 'demoshop8.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), -(32, 19, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), -(33, 20, '', 'demoshop8.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), -(34, 21, '', 'demoshop8.ngrok.io/en/', '', '2023-05-15 10:12:52'), -(35, 22, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), -(36, 27, 'https://demoshop8.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), -(37, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), -(38, 27, 'https://demoshop8.ngrok.io/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), -(39, 27, 'https://demoshop8.ngrok.io/__/', 'demoshop8.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), -(40, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), -(41, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), -(42, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), -(43, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), -(44, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), -(45, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), -(46, 27, 'https://demoshop8.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), -(47, 27, 'https://www.mollie.com/', 'demoshop8.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), -(48, 27, 'https://demoshop8.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), -(49, 27, 'https://demoshop8.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), -(50, 44, '', 'demoshop8.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); +(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-05-02 12:19:12'), +(2, 3, '', 'demoshop8debug.ngrok.io/', '', '2023-05-08 16:44:27'), +(3, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), +(4, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), +(5, 4, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), +(6, 5, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), +(7, 6, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), +(8, 11, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), +(9, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), +(10, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), +(11, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), +(12, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), +(13, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), +(14, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), +(15, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), +(16, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), +(17, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), +(18, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), +(19, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), +(20, 11, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), +(21, 11, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), +(22, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), +(23, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), +(24, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), +(25, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), +(26, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), +(27, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), +(28, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), +(29, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), +(30, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), +(31, 19, '', 'demoshop8debug.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), +(32, 19, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), +(33, 20, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), +(34, 21, '', 'demoshop8debug.ngrok.io/en/', '', '2023-05-15 10:12:52'), +(35, 22, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), +(36, 27, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), +(37, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), +(38, 27, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), +(39, 27, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), +(40, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), +(41, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), +(42, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), +(43, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), +(44, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), +(45, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), +(46, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), +(47, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), +(48, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), +(49, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), +(50, 44, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -13415,55 +13415,55 @@ CREATE TABLE `ps_pagenotfound` ( INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES (1, 1, 1, '/robots.txt', '', '2023-05-08 14:44:32'), (2, 1, 1, '/robots.txt', '', '2023-05-08 14:44:33'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), -(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), -(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), -(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), -(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), -(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), -(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), -(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), -(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), -(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), -(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), -(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), -(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), -(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), -(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), -(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), -(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), +(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), +(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), +(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), +(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), +(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), +(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), +(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), +(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), +(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), +(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), +(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), +(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), +(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), +(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), +(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), +(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), (28, 1, 1, '/robots.txt', '', '2023-05-15 08:12:52'), -(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), -(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), -(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), -(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), -(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), -(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), -(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), -(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), -(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), -(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), -(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), -(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), -(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), -(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), -(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), -(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), -(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), -(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), -(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); +(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), +(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), +(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), +(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), +(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), +(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), +(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), +(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), +(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), +(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), +(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), +(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), +(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), +(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), +(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), +(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), +(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), +(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), +(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), +(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), +(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), +(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), +(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -17470,8 +17470,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1), -(2, 2, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', 'shop2/', 1, 1); +(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1), +(2, 2, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', 'shop2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 1f98f246a522a44a042236afa36542a1d374fdf1 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 11:29:40 +0300 Subject: [PATCH 042/109] spec update --- ...P.js => 04_mollie.ps1784.Subscriptions.js} | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) rename cypress/e2e/ps1784/{04_mollie.ps1784.Subscriptions.WIP.js => 04_mollie.ps1784.Subscriptions.js} (69%) diff --git a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.js similarity index 69% rename from cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js rename to cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.js index fa6f3de02..976c8ca5d 100755 --- a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.WIP.js +++ b/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.js @@ -44,15 +44,29 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('[class="attribute-quantity"]').last().find('[type="text"]').clear().type('999') cy.get('#submit').click() cy.get('.growl-message').contains('Settings updated.') - //Check if Subscription options are in Product Page FO + //Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it cy.visit('/de/') - cy.get('[data-id-product="8"]').click() //possible PS1784 notice exception, checking with dev... - //wip ... + cy.get('[data-id-product="8"]').click() + cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page + cy.contains('Add to cart').click() + cy.contains('Proceed to checkout').click() + cy.contains('Proceed to checkout').click() + cy.contains('DE').click() + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Karte').click({force:true}) + //Credit card inputing + cy.CreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + cy.get('.ps-shown-by-js > .btn').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') //Check if Subscription options are implemented in My Account FO cy.visit('/en/') cy.get('[class="account"]').click() cy.contains('Subscriptions').click() cy.get('[class="page-content"]').should('be.visible') - //wip ... }); }) From fe2033d58b9a48f91e7eca90b6902c96e71036d7 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 11:37:50 +0300 Subject: [PATCH 043/109] spec updates --- ...lie.ps8.EnablingPaymentsOrdersAPI.specs.js | 37 +++++++++++++++++++ ...specs.js => 03_mollie.ps8.PaymentTests.js} | 0 ....js => 04_mollie.ps8.Subscriptions.WIP.js} | 0 3 files changed, 37 insertions(+) create mode 100755 cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js rename cypress/e2e/ps8/{02_mollie.ps8.specs.js => 03_mollie.ps8.PaymentTests.js} (100%) rename cypress/e2e/ps8/{03_mollie.ps8.Subscriptions.WIP.js => 04_mollie.ps8.Subscriptions.WIP.js} (100%) diff --git a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js new file mode 100755 index 000000000..93b95840e --- /dev/null +++ b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js @@ -0,0 +1,37 @@ +/// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +let failEarly = false; +afterEach(() => { + expect(windowConsoleError).to.not.be.called; + if (failEarly) throw new Error("Failing Early due to an API or other module configuration problem. If running on CI, please check Cypress VIDEOS/SCREENSHOTS in the Artifacts for more details.") +}) +afterEach(function() { + if (this.currentTest.state === "failed") failEarly = true +}); +describe('PS1784 Enabling Payments', () => { + beforeEach(() => { + cy.viewport(1920,1080) + login('MollieBOFOLoggingIn') + }) +it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.ConfOrdersAPI1784() + cy.get('[type="submit"]').first().click({force:true}) + cy.get('[class="alert alert-success"]').should('be.visible') +}) +}) diff --git a/cypress/e2e/ps8/02_mollie.ps8.specs.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js similarity index 100% rename from cypress/e2e/ps8/02_mollie.ps8.specs.js rename to cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js diff --git a/cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js similarity index 100% rename from cypress/e2e/ps8/03_mollie.ps8.Subscriptions.WIP.js rename to cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js From c6fed84e5e901cea24f9b81c85cfebcc3a30079c Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 11:40:18 +0300 Subject: [PATCH 044/109] spec updates (ps1784/ps8) --- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 152 ++++++++++-------- .../ps8/04_mollie.ps8.Subscriptions.WIP.js | 40 +++-- 2 files changed, 112 insertions(+), 80 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index fe9fcbf4b..01e4688d4 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -31,39 +31,39 @@ function prepareCookie() }); } - //Caching the BO and FO session - const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) - cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +afterEach(() => { + expect(windowConsoleError).to.not.be.called; +}) describe('PS8 Tests Suite', () => { beforeEach(() => { - cy.viewport(1920,1080) login('MollieBOFOLoggingIn') + cy.viewport(1920,1080) }) -it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { - cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() - cy.ConfOrdersAPI1784() - cy.get('[type="submit"]').first().click({force:true}) - cy.get('[class="alert alert-success"]').should('be.visible') -}) -// Somehow the Payment is not appearing in the ecommerce frontend...needs to be checked...TODO it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -97,8 +97,9 @@ it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Ord }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -127,6 +128,7 @@ it('C339345: 08 Bancontact Order BO Shipping, Refunding [Orders API]', () => { }) it('C339346: 09 iDEAL Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -157,6 +159,7 @@ it('C339347: 10 iDEAL Order BO Shipping, Refunding [Orders API]', () => { }) it('C339348: 11 Klarna Slice It Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.contains('DE').click() @@ -187,6 +190,7 @@ it('C339349: 12 Klarna Slice It Order BO Shipping, Refunding [Orders API]', () = }) it('C339350: 13 Klarna Pay Later Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -218,6 +222,7 @@ it('C339351: 14 Klarna Pay Later Order BO Shipping, Refunding [Orders API]', () }) it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -250,12 +255,12 @@ it('C339353: 16 Klarna Pay Now Order BO Shipping, Refunding [Orders API]', () => it('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Enabling the Single-Click for now cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() + cy.OpeningModuleDashboardURL() cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_on').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') cy.visit('/en/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -265,7 +270,6 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { //Credit card inputing cy.CreditCardFillingIframe() cy.get('.condition-label > .js-terms').click({force:true}) - cy.get('#mollie-save-card').check({force:true}) prepareCookie(); cy.get('.ps-shown-by-js > .btn').click({force: true}) cy.setCookie( @@ -285,6 +289,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { }) it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { cy.visit('/en/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -306,10 +311,9 @@ it('C339355: 18 Check if customerId is passed during the 2nd payment using Singl ); // reload current page to activate cookie cy.reload(); cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() //Disabling the single-click - no need again - cy.get('#MOLLIE_SINGLE_CLICK_PAYMENT_off').click({force:true}) + cy.OpeningModuleDashboardURL() + cy.get('#MOLLIE_SANDBOX_SINGLE_CLICK_PAYMENT_off').click({force:true}) cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) @@ -318,6 +322,7 @@ it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { }) it('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -344,15 +349,14 @@ it('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { +it.skip('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { - cy.visit('/de/index.php?controller=history') - cy.contains('Reorder').click() - cy.get('.logo').click() - cy.get('.blockcart').click() - cy.get('.js-cart-line-product-quantity').clear().type(500) + cy.visit('/de/') + cy.contains('Hummingbird printed sweater').click() + cy.get('[class="btn btn-primary add-to-cart"]').click() + cy.get('.cart-content-btn > .btn-primary').click() cy.get('.text-sm-center > .btn').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -362,18 +366,17 @@ it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { cy.contains('in3').should('not.exist') cy.get('.logo').click() cy.get('.blockcart').click() - //removing the cart for clear end cy.get('.remove-from-cart > .material-icons').click() }) it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() + cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) - cy.get('[name="MOLLIE_IMAGES"]').select('big',{force:true}) + cy.get('[name="MOLLIE_IMAGES"]').select('big') cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -381,10 +384,9 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('#js-delivery > .continue').click() //asserting i3 image cy.get('html').should('contain.html','src="https://www.mollie.com/external/icons/payment-methods/in3%402x.png"') - //Unsetting the images setting for clear end + //todo finish cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() + cy.OpeningModuleDashboardURL() cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[name="MOLLIE_IMAGES"]').select('hide') cy.get('[type="submit"]').first().click({force:true}) @@ -392,6 +394,7 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { }) it('C339361: 24 Paypal Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -422,6 +425,7 @@ it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -464,6 +468,7 @@ it('C339364: 27 SOFORT Order Shipping, Refunding [Orders API]', () => { }) it('C339365: 28 Przelewy24 Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -494,6 +499,7 @@ it('C339366: 29 Przelewy24 Order Shipping, Refunding [Orders API]', () => { }) it('C339367: 30 Giropay Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -524,6 +530,7 @@ it('C339368: 31 Giropay Order Shipping, Refunding [Orders API]', () => { }) it('C339369: 32 EPS Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -554,6 +561,7 @@ it('C339370: 33 EPS Order Shipping, Refunding [Orders API]', () => { }) it('C339371: 34 KBC/CBC Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -585,6 +593,7 @@ it('C339372: 35 KBC/CBC Order Shipping, Refunding [Orders API]', () => { }) it('C339373: 36 Belfius Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -615,6 +624,7 @@ it('C339374: 37 Belfius Order Shipping, Refunding [Orders API]', () => { }) it('C339375: 38 Bank Transfer Checkouting [Orders API]', () => { cy.visit('/en/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -647,6 +657,7 @@ it('C339376: 39 Bank Transfer Order Shipping, Refunding [Orders API]', () => { // Temporary disabled, Payment Method disables automatically in My Mollie Dashboard, because of the fake testing account... it.skip('40 Gift Card Checkouting [Orders API]', () => { cy.visit('/en/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -679,25 +690,24 @@ it.skip('40 Gift Card Checkouting [Orders API]', () => { it.skip('41 Gift Card Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it('C339377: 42 >> SWITCH TO PAYMENTS API >> Enabling All payments in Module BO [Payments API]', () => { +it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() + cy.OpeningModuleDashboardURL() cy.ConfPaymentsAPI1784() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', () => { cy.visit('/admin1/') - cy.get('#subtab-AdminMollieModule_MTR > :nth-child(1)').click() - cy.get('#subtab-AdminMollieModule > .link').click() + cy.OpeningModuleDashboardURL() cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') }) it('C339379: 44 Bancontact Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -726,6 +736,7 @@ it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]' }) it('C339381: 46 iDEAL Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -756,6 +767,7 @@ it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () }) it('C339383: 48 Credit Card Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') + cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -785,8 +797,7 @@ it('C339383: 48 Credit Card Checkouting [Payments API]', () => { it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }) -//guest checkout skipped for now, somehow buggy in PS8, will check what is the problem -it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { +it('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { cy.clearCookies() //Payments API item cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) @@ -837,8 +848,7 @@ it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -//todo - check the problem of PS9 -it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { +it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { cy.clearCookies() //Payments API item cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) @@ -876,9 +886,10 @@ it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Pay }) it('C339387: 52 Paypal Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -914,9 +925,10 @@ it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339389: 54 SOFORT Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -948,9 +960,10 @@ it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -981,9 +994,10 @@ it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () = }); it('C339393: 58 Giropay Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1012,9 +1026,10 @@ it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339395: 60 EPS Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1042,10 +1057,11 @@ it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') + cy.visit('/en/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1074,10 +1090,11 @@ it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); it('C339399: 64 Belfius Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') + cy.visit('/en/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1106,9 +1123,10 @@ it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') + cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('DE').click() + cy.contains('LT').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1132,7 +1150,7 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { +it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why cy.OrderRefundingPartialPaymentsAPI() }); }) diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js index 1a04e9a7b..9af7c22cf 100755 --- a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js +++ b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js @@ -22,7 +22,7 @@ windowConsoleError = cy.spy(win.console, 'error'); afterEach(() => { expect(windowConsoleError).to.not.be.called; }) -describe('PS8 Subscriptions Test Suit', () => { +describe('PS1784 Subscriptions Test Suit', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') @@ -31,28 +31,42 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.visit('/admin1/') cy.get('#subtab-AdminCatalog > :nth-child(1)').click() cy.get('#subtab-AdminProducts > .link').click() - cy.contains('Hummingbird printed t-shirt').click() + cy.get('[data-product-id="8"]').find('[class="btn tooltip-link product-edit"]').click() cy.contains('Product with combinations').click() cy.get('[id="tab_step3"]').click() cy.contains('Daily').click({force:true}) cy.get('[class="token"]').should('be.visible') cy.get('#create-combinations').click() + cy.wait(5000) cy.reload() cy.wait(5000) cy.contains('Mollie Subscription - Daily').should('be.visible') cy.get('[class="attribute-quantity"]').last().find('[type="text"]').clear().type('999') cy.get('#submit').click() - cy.get('.growl-message').contains('Settings updated.') //somehow PS8 has a combinations creation bug probably... - //Check if Subscription options are in Product Page FO - cy.visit('/SHOP2/de/') - // cy.get('.products > :nth-child(1)').click() - // cy.get('a').click() - // wip ... + cy.get('.growl-message').contains('Settings updated.') + //Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it + cy.visit('/de/') + cy.get('[data-id-product="8"]').click() + cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page + cy.contains('Add to cart').click() + cy.contains('Proceed to checkout').click() + cy.contains('Proceed to checkout').click() + cy.contains('DE').click() + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Karte').click({force:true}) + //Credit card inputing + cy.CreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + cy.get('.ps-shown-by-js > .btn').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') //Check if Subscription options are implemented in My Account FO - // cy.visit('/SHOP2/') - // cy.get('[class="account"]').click() - // cy.contains('Mollie subscriptions').click() - // cy.get('[class="page-content"]').should('be.visible') - // wip ... + cy.visit('/en/') + cy.get('[class="account"]').click() + cy.contains('Subscriptions').click() + cy.get('[class="page-content"]').should('be.visible') }); }) From a478f7de15afc06e2660f24656990d399a990a28 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 11:43:55 +0300 Subject: [PATCH 045/109] Update 04_mollie.ps8.Subscriptions.WIP.js --- cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js index 9af7c22cf..b2313b83c 100755 --- a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js +++ b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js @@ -22,7 +22,7 @@ windowConsoleError = cy.spy(win.console, 'error'); afterEach(() => { expect(windowConsoleError).to.not.be.called; }) -describe('PS1784 Subscriptions Test Suit', () => { +describe('PS8 Subscriptions Test Suit', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') From a6b71c080f69f32b70c11da3ea842fe4f617f7cf Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 11:44:41 +0300 Subject: [PATCH 046/109] Update 02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js --- .../e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js index 93b95840e..9036c5e6b 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js @@ -22,7 +22,7 @@ afterEach(() => { afterEach(function() { if (this.currentTest.state === "failed") failEarly = true }); -describe('PS1784 Enabling Payments', () => { +describe('PS8 Enabling Payments', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') From cfb360b3c77c3f861c5cfaff2f2ed9bb17b24d25 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 12:31:21 +0300 Subject: [PATCH 047/109] Update Makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7d2d87bed..b0ef8765d 100755 --- a/Makefile +++ b/Makefile @@ -40,13 +40,13 @@ e2eh8: # configuring base database mysql -h 127.0.0.1 -P 9459 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_8.sql # installing module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # uninstalling module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" # installing the module again - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # enabling the module - docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie --id_shop=2" + docker exec -i prestashop-mollie-8 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie" # chmod all folders docker exec -i prestashop-mollie-8 sh -c "chmod -R 777 /var/www/html" From ddc19b8ccb80a032e5fa8c637e7d77d43fd3794f Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 12:47:26 +0300 Subject: [PATCH 048/109] Update prestashop_8.sql --- tests/seed/database/prestashop_8.sql | 331 +++++++++++++++++++++++---- 1 file changed, 286 insertions(+), 45 deletions(-) diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index cb56f86d8..9c2e024c9 100644 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -1,4 +1,4 @@ --- Adminer 4.8.1 MySQL 5.7.41 dump +-- Adminer 4.8.1 MySQL 5.7.43 dump SET NAMES utf8; SET time_zone = '+00:00'; @@ -1131,7 +1131,6 @@ CREATE TABLE `ps_admin_filter` ( INSERT INTO `ps_admin_filter` (`id`, `employee`, `shop`, `controller`, `action`, `filter`, `filter_id`) VALUES (1, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"date_add\",\"sortOrder\":\"DESC\",\"filters\":[]}', 'customer'), -(2, 1, 2, '', '', '{\"limit\":50,\"orderBy\":\"id_mol_recurring_order\",\"sortOrder\":\"asc\",\"filters\":[]}', 'invertus_mollie_subscription'), (3, 1, 2, '', '', '{\"limit\":50,\"orderBy\":\"id_order\",\"sortOrder\":\"DESC\",\"filters\":[]}', 'order'), (4, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"id_lang\",\"sortOrder\":\"ASC\",\"filters\":[]}', 'language'); @@ -1251,10 +1250,7 @@ INSERT INTO `ps_attribute_group_lang` (`id_attribute_group`, `id_lang`, `name`, (3, 3, 'Dimension', 'Dimension'), (4, 1, 'Paper Type', 'Paper Type'), (4, 2, 'Paper Type', 'Paper Type'), -(4, 3, 'Paper Type', 'Paper Type'), -(5, 1, 'Mollie Subscription', 'Subscription'), -(5, 2, 'Mollie Subscription', 'Subscription'), -(5, 3, 'Mollie Subscription', 'Subscription'); +(4, 3, 'Paper Type', 'Paper Type'); DROP TABLE IF EXISTS `ps_attribute_group_shop`; CREATE TABLE `ps_attribute_group_shop` ( @@ -3073,7 +3069,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (26, NULL, NULL, 'PS_TAX', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (27, NULL, NULL, 'PS_SHOP_ENABLE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (28, NULL, NULL, 'PS_NB_DAYS_NEW_PRODUCT', '20', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(29, NULL, NULL, 'PS_SSL_ENABLED', '1', '0000-00-00 00:00:00', '2023-05-08 16:59:10'), +(29, NULL, NULL, 'PS_SSL_ENABLED', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), (30, NULL, NULL, 'PS_WEIGHT_UNIT', 'kg', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (31, NULL, NULL, 'PS_BLOCK_CART_AJAX', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (32, NULL, NULL, 'PS_ORDER_RETURN', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3149,9 +3145,9 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (102, NULL, NULL, 'PS_SMARTY_CACHE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (103, NULL, NULL, 'PS_DIMENSION_UNIT', 'cm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (104, NULL, NULL, 'PS_GUEST_CHECKOUT_ENABLED', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(105, NULL, NULL, 'PS_DISPLAY_SUPPLIERS', NULL, '0000-00-00 00:00:00', '2023-05-08 16:59:10'), -(106, NULL, NULL, 'PS_DISPLAY_MANUFACTURERS', '1', '0000-00-00 00:00:00', '2023-05-08 16:59:10'), -(107, NULL, NULL, 'PS_DISPLAY_BEST_SELLERS', '1', '0000-00-00 00:00:00', '2023-05-08 16:59:10'), +(105, NULL, NULL, 'PS_DISPLAY_SUPPLIERS', NULL, '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(106, NULL, NULL, 'PS_DISPLAY_MANUFACTURERS', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(107, NULL, NULL, 'PS_DISPLAY_BEST_SELLERS', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), (108, NULL, NULL, 'PS_CATALOG_MODE', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (109, NULL, NULL, 'PS_GEOLOCATION_WHITELIST', '127;::1;188.165.122;209.185.108;209.185.253;209.85.238;209.85.238.11;209.85.238.4;216.239.33.96;216.239.33.97;216.239.33.98;216.239.33.99;216.239.37.98;216.239.37.99;216.239.39.98;216.239.39.99;216.239.41.96;216.239.41.97;216.239.41.98;216.239.41.99;216.239.45.4;216.239.46;216.239.51.96;216.239.51.97;216.239.51.98;216.239.51.99;216.239.53.98;216.239.53.99;216.239.57.96;91.240.109;216.239.57.97;216.239.57.98;216.239.57.99;216.239.59.98;216.239.59.99;216.33.229.163;64.233.173.193;64.233.173.194;64.233.173.195;64.233.173.196;64.233.173.197;64.233.173.198;64.233.173.199;64.233.173.200;64.233.173.201;64.233.173.202;64.233.173.203;64.233.173.204;64.233.173.205;64.233.173.206;64.233.173.207;64.233.173.208;64.233.173.209;64.233.173.210;64.233.173.211;64.233.173.212;64.233.173.213;64.233.173.214;64.233.173.215;64.233.173.216;64.233.173.217;64.233.173.218;64.233.173.219;64.233.173.220;64.233.173.221;64.233.173.222;64.233.173.223;64.233.173.224;64.233.173.225;64.233.173.226;64.233.173.227;64.233.173.228;64.233.173.229;64.233.173.230;64.233.173.231;64.233.173.232;64.233.173.233;64.233.173.234;64.233.173.235;64.233.173.236;64.233.173.237;64.233.173.238;64.233.173.239;64.233.173.240;64.233.173.241;64.233.173.242;64.233.173.243;64.233.173.244;64.233.173.245;64.233.173.246;64.233.173.247;64.233.173.248;64.233.173.249;64.233.173.250;64.233.173.251;64.233.173.252;64.233.173.253;64.233.173.254;64.233.173.255;64.68.80;64.68.81;64.68.82;64.68.83;64.68.84;64.68.85;64.68.86;64.68.87;64.68.88;64.68.89;64.68.90.1;64.68.90.10;64.68.90.11;64.68.90.12;64.68.90.129;64.68.90.13;64.68.90.130;64.68.90.131;64.68.90.132;64.68.90.133;64.68.90.134;64.68.90.135;64.68.90.136;64.68.90.137;64.68.90.138;64.68.90.139;64.68.90.14;64.68.90.140;64.68.90.141;64.68.90.142;64.68.90.143;64.68.90.144;64.68.90.145;64.68.90.146;64.68.90.147;64.68.90.148;64.68.90.149;64.68.90.15;64.68.90.150;64.68.90.151;64.68.90.152;64.68.90.153;64.68.90.154;64.68.90.155;64.68.90.156;64.68.90.157;64.68.90.158;64.68.90.159;64.68.90.16;64.68.90.160;64.68.90.161;64.68.90.162;64.68.90.163;64.68.90.164;64.68.90.165;64.68.90.166;64.68.90.167;64.68.90.168;64.68.90.169;64.68.90.17;64.68.90.170;64.68.90.171;64.68.90.172;64.68.90.173;64.68.90.174;64.68.90.175;64.68.90.176;64.68.90.177;64.68.90.178;64.68.90.179;64.68.90.18;64.68.90.180;64.68.90.181;64.68.90.182;64.68.90.183;64.68.90.184;64.68.90.185;64.68.90.186;64.68.90.187;64.68.90.188;64.68.90.189;64.68.90.19;64.68.90.190;64.68.90.191;64.68.90.192;64.68.90.193;64.68.90.194;64.68.90.195;64.68.90.196;64.68.90.197;64.68.90.198;64.68.90.199;64.68.90.2;64.68.90.20;64.68.90.200;64.68.90.201;64.68.90.202;64.68.90.203;64.68.90.204;64.68.90.205;64.68.90.206;64.68.90.207;64.68.90.208;64.68.90.21;64.68.90.22;64.68.90.23;64.68.90.24;64.68.90.25;64.68.90.26;64.68.90.27;64.68.90.28;64.68.90.29;64.68.90.3;64.68.90.30;64.68.90.31;64.68.90.32;64.68.90.33;64.68.90.34;64.68.90.35;64.68.90.36;64.68.90.37;64.68.90.38;64.68.90.39;64.68.90.4;64.68.90.40;64.68.90.41;64.68.90.42;64.68.90.43;64.68.90.44;64.68.90.45;64.68.90.46;64.68.90.47;64.68.90.48;64.68.90.49;64.68.90.5;64.68.90.50;64.68.90.51;64.68.90.52;64.68.90.53;64.68.90.54;64.68.90.55;64.68.90.56;64.68.90.57;64.68.90.58;64.68.90.59;64.68.90.6;64.68.90.60;64.68.90.61;64.68.90.62;64.68.90.63;64.68.90.64;64.68.90.65;64.68.90.66;64.68.90.67;64.68.90.68;64.68.90.69;64.68.90.7;64.68.90.70;64.68.90.71;64.68.90.72;64.68.90.73;64.68.90.74;64.68.90.75;64.68.90.76;64.68.90.77;64.68.90.78;64.68.90.79;64.68.90.8;64.68.90.80;64.68.90.9;64.68.91;64.68.92;66.249.64;66.249.65;66.249.66;66.249.67;66.249.68;66.249.69;66.249.70;66.249.71;66.249.72;66.249.73;66.249.78;66.249.79;72.14.199;8.6.48', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (110, NULL, NULL, 'PS_LOGS_BY_EMAIL', '4', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3236,7 +3232,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (189, NULL, NULL, 'MANUFACTURER_DISPLAY_TEXT', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (190, NULL, NULL, 'MANUFACTURER_DISPLAY_TEXT_NB', '5', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (191, NULL, NULL, 'NEW_PRODUCTS_NBR', '8', '0000-00-00 00:00:00', '2023-05-02 12:17:01'), -(192, NULL, NULL, 'PS_TOKEN_ENABLE', '1', '0000-00-00 00:00:00', '2023-05-08 16:59:10'), +(192, NULL, NULL, 'PS_TOKEN_ENABLE', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), (193, NULL, NULL, 'PS_STATS_RENDER', 'graphnvd3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (194, NULL, NULL, 'PS_STATS_OLD_CONNECT_AUTO_CLEAN', 'never', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (195, NULL, NULL, 'PS_STATS_GRID_RENDER', 'gridhtml', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3283,7 +3279,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(239, NULL, NULL, 'PS_SHOP_ACTIVITY', NULL, '0000-00-00 00:00:00', '2023-05-08 16:59:10'), +(239, NULL, NULL, 'PS_SHOP_ACTIVITY', NULL, '0000-00-00 00:00:00', '2023-08-28 11:40:31'), (240, NULL, NULL, 'PS_LOGO', 'logo.png', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (241, NULL, NULL, 'PS_FAVICON', 'favicon.ico', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (242, NULL, NULL, 'PS_STORES_ICON', 'logo_stores.png', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3311,7 +3307,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (264, NULL, NULL, 'PS_ATTRIBUTE_ANCHOR_SEPARATOR', '-', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (265, NULL, NULL, 'CONF_AVERAGE_PRODUCT_MARGIN', '40', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (266, NULL, NULL, 'PS_DASHBOARD_SIMULATION', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(267, NULL, NULL, 'PS_USE_HTMLPURIFIER', '1', '0000-00-00 00:00:00', '2023-05-08 16:59:10'), +(267, NULL, NULL, 'PS_USE_HTMLPURIFIER', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), (268, NULL, NULL, 'PS_SMARTY_LOCAL', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (269, NULL, NULL, 'PS_SMARTY_CLEAR_CACHE', 'everytime', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (270, NULL, NULL, 'PS_DETECT_LANG', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3342,7 +3338,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (295, NULL, NULL, 'PS_SECURITY_PASSWORD_POLICY_MINIMUM_LENGTH', '8', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (296, NULL, NULL, 'PS_SECURITY_PASSWORD_POLICY_MINIMUM_SCORE', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (297, NULL, NULL, 'PS_INSTALL_XML_LOADERS_ID', '{\"authorization_role:TAB_ADMINACCESS_CREATE\":1,\"authorization_role:TAB_ADMINACCESS_READ\":2,\"authorization_role:TAB_ADMINACCESS_UPDATE\":3,\"authorization_role:TAB_ADMINACCESS_DELETE\":4,\"authorization_role:TAB_ADMINADDRESSES_CREATE\":5,\"authorization_role:TAB_ADMINADDRESSES_READ\":6,\"authorization_role:TAB_ADMINADDRESSES_UPDATE\":7,\"authorization_role:TAB_ADMINADDRESSES_DELETE\":8,\"authorization_role:TAB_ADMINADMINPREFERENCES_CREATE\":9,\"authorization_role:TAB_ADMINADMINPREFERENCES_READ\":10,\"authorization_role:TAB_ADMINADMINPREFERENCES_UPDATE\":11,\"authorization_role:TAB_ADMINADMINPREFERENCES_DELETE\":12,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_CREATE\":13,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_READ\":14,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_UPDATE\":15,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_DELETE\":16,\"authorization_role:TAB_ADMINATTACHMENTS_CREATE\":17,\"authorization_role:TAB_ADMINATTACHMENTS_READ\":18,\"authorization_role:TAB_ADMINATTACHMENTS_UPDATE\":19,\"authorization_role:TAB_ADMINATTACHMENTS_DELETE\":20,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_CREATE\":21,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_READ\":22,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_UPDATE\":23,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_DELETE\":24,\"authorization_role:TAB_ADMINBACKUP_CREATE\":25,\"authorization_role:TAB_ADMINBACKUP_READ\":26,\"authorization_role:TAB_ADMINBACKUP_UPDATE\":27,\"authorization_role:TAB_ADMINBACKUP_DELETE\":28,\"authorization_role:TAB_ADMINCARRIERS_CREATE\":29,\"authorization_role:TAB_ADMINCARRIERS_READ\":30,\"authorization_role:TAB_ADMINCARRIERS_UPDATE\":31,\"authorization_role:TAB_ADMINCARRIERS_DELETE\":32,\"authorization_role:TAB_ADMINCARTRULES_CREATE\":33,\"authorization_role:TAB_ADMINCARTRULES_READ\":34,\"authorization_role:TAB_ADMINCARTRULES_UPDATE\":35,\"authorization_role:TAB_ADMINCARTRULES_DELETE\":36,\"authorization_role:TAB_ADMINCARTS_CREATE\":37,\"authorization_role:TAB_ADMINCARTS_READ\":38,\"authorization_role:TAB_ADMINCARTS_UPDATE\":39,\"authorization_role:TAB_ADMINCARTS_DELETE\":40,\"authorization_role:TAB_ADMINCATALOG_CREATE\":41,\"authorization_role:TAB_ADMINCATALOG_READ\":42,\"authorization_role:TAB_ADMINCATALOG_UPDATE\":43,\"authorization_role:TAB_ADMINCATALOG_DELETE\":44,\"authorization_role:TAB_ADMINCATEGORIES_CREATE\":45,\"authorization_role:TAB_ADMINCATEGORIES_READ\":46,\"authorization_role:TAB_ADMINCATEGORIES_UPDATE\":47,\"authorization_role:TAB_ADMINCATEGORIES_DELETE\":48,\"authorization_role:TAB_ADMINCMSCONTENT_CREATE\":49,\"authorization_role:TAB_ADMINCMSCONTENT_READ\":50,\"authorization_role:TAB_ADMINCMSCONTENT_UPDATE\":51,\"authorization_role:TAB_ADMINCMSCONTENT_DELETE\":52,\"authorization_role:TAB_ADMINCONTACTS_CREATE\":53,\"authorization_role:TAB_ADMINCONTACTS_READ\":54,\"authorization_role:TAB_ADMINCONTACTS_UPDATE\":55,\"authorization_role:TAB_ADMINCONTACTS_DELETE\":56,\"authorization_role:TAB_ADMINCOUNTRIES_CREATE\":57,\"authorization_role:TAB_ADMINCOUNTRIES_READ\":58,\"authorization_role:TAB_ADMINCOUNTRIES_UPDATE\":59,\"authorization_role:TAB_ADMINCOUNTRIES_DELETE\":60,\"authorization_role:TAB_ADMINCURRENCIES_CREATE\":61,\"authorization_role:TAB_ADMINCURRENCIES_READ\":62,\"authorization_role:TAB_ADMINCURRENCIES_UPDATE\":63,\"authorization_role:TAB_ADMINCURRENCIES_DELETE\":64,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_CREATE\":65,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_READ\":66,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_UPDATE\":67,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_DELETE\":68,\"authorization_role:TAB_ADMINCUSTOMERS_CREATE\":69,\"authorization_role:TAB_ADMINCUSTOMERS_READ\":70,\"authorization_role:TAB_ADMINCUSTOMERS_UPDATE\":71,\"authorization_role:TAB_ADMINCUSTOMERS_DELETE\":72,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_CREATE\":73,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_READ\":74,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_UPDATE\":75,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_DELETE\":76,\"authorization_role:TAB_ADMINDASHBOARD_CREATE\":77,\"authorization_role:TAB_ADMINDASHBOARD_READ\":78,\"authorization_role:TAB_ADMINDASHBOARD_UPDATE\":79,\"authorization_role:TAB_ADMINDASHBOARD_DELETE\":80,\"authorization_role:TAB_ADMINDELIVERYSLIP_CREATE\":81,\"authorization_role:TAB_ADMINDELIVERYSLIP_READ\":82,\"authorization_role:TAB_ADMINDELIVERYSLIP_UPDATE\":83,\"authorization_role:TAB_ADMINDELIVERYSLIP_DELETE\":84,\"authorization_role:TAB_ADMINEMAILS_CREATE\":85,\"authorization_role:TAB_ADMINEMAILS_READ\":86,\"authorization_role:TAB_ADMINEMAILS_UPDATE\":87,\"authorization_role:TAB_ADMINEMAILS_DELETE\":88,\"authorization_role:TAB_ADMINEMPLOYEES_CREATE\":89,\"authorization_role:TAB_ADMINEMPLOYEES_READ\":90,\"authorization_role:TAB_ADMINEMPLOYEES_UPDATE\":91,\"authorization_role:TAB_ADMINEMPLOYEES_DELETE\":92,\"authorization_role:TAB_ADMINFEATURES_CREATE\":93,\"authorization_role:TAB_ADMINFEATURES_READ\":94,\"authorization_role:TAB_ADMINFEATURES_UPDATE\":95,\"authorization_role:TAB_ADMINFEATURES_DELETE\":96,\"authorization_role:TAB_ADMINGENDERS_CREATE\":97,\"authorization_role:TAB_ADMINGENDERS_READ\":98,\"authorization_role:TAB_ADMINGENDERS_UPDATE\":99,\"authorization_role:TAB_ADMINGENDERS_DELETE\":100,\"authorization_role:TAB_ADMINGEOLOCATION_CREATE\":101,\"authorization_role:TAB_ADMINGEOLOCATION_READ\":102,\"authorization_role:TAB_ADMINGEOLOCATION_UPDATE\":103,\"authorization_role:TAB_ADMINGEOLOCATION_DELETE\":104,\"authorization_role:TAB_ADMINGROUPS_CREATE\":105,\"authorization_role:TAB_ADMINGROUPS_READ\":106,\"authorization_role:TAB_ADMINGROUPS_UPDATE\":107,\"authorization_role:TAB_ADMINGROUPS_DELETE\":108,\"authorization_role:TAB_ADMINIMAGES_CREATE\":109,\"authorization_role:TAB_ADMINIMAGES_READ\":110,\"authorization_role:TAB_ADMINIMAGES_UPDATE\":111,\"authorization_role:TAB_ADMINIMAGES_DELETE\":112,\"authorization_role:TAB_ADMINIMPORT_CREATE\":113,\"authorization_role:TAB_ADMINIMPORT_READ\":114,\"authorization_role:TAB_ADMINIMPORT_UPDATE\":115,\"authorization_role:TAB_ADMINIMPORT_DELETE\":116,\"authorization_role:TAB_ADMININFORMATION_CREATE\":117,\"authorization_role:TAB_ADMININFORMATION_READ\":118,\"authorization_role:TAB_ADMININFORMATION_UPDATE\":119,\"authorization_role:TAB_ADMININFORMATION_DELETE\":120,\"authorization_role:TAB_ADMININTERNATIONAL_CREATE\":121,\"authorization_role:TAB_ADMININTERNATIONAL_READ\":122,\"authorization_role:TAB_ADMININTERNATIONAL_UPDATE\":123,\"authorization_role:TAB_ADMININTERNATIONAL_DELETE\":124,\"authorization_role:TAB_ADMININVOICES_CREATE\":125,\"authorization_role:TAB_ADMININVOICES_READ\":126,\"authorization_role:TAB_ADMININVOICES_UPDATE\":127,\"authorization_role:TAB_ADMININVOICES_DELETE\":128,\"authorization_role:TAB_ADMINLANGUAGES_CREATE\":129,\"authorization_role:TAB_ADMINLANGUAGES_READ\":130,\"authorization_role:TAB_ADMINLANGUAGES_UPDATE\":131,\"authorization_role:TAB_ADMINLANGUAGES_DELETE\":132,\"authorization_role:TAB_ADMINLINKWIDGET_CREATE\":133,\"authorization_role:TAB_ADMINLINKWIDGET_READ\":134,\"authorization_role:TAB_ADMINLINKWIDGET_UPDATE\":135,\"authorization_role:TAB_ADMINLINKWIDGET_DELETE\":136,\"authorization_role:TAB_ADMINLOCALIZATION_CREATE\":137,\"authorization_role:TAB_ADMINLOCALIZATION_READ\":138,\"authorization_role:TAB_ADMINLOCALIZATION_UPDATE\":139,\"authorization_role:TAB_ADMINLOCALIZATION_DELETE\":140,\"authorization_role:TAB_ADMINLOGS_CREATE\":141,\"authorization_role:TAB_ADMINLOGS_READ\":142,\"authorization_role:TAB_ADMINLOGS_UPDATE\":143,\"authorization_role:TAB_ADMINLOGS_DELETE\":144,\"authorization_role:TAB_ADMINMAINTENANCE_CREATE\":145,\"authorization_role:TAB_ADMINMAINTENANCE_READ\":146,\"authorization_role:TAB_ADMINMAINTENANCE_UPDATE\":147,\"authorization_role:TAB_ADMINMAINTENANCE_DELETE\":148,\"authorization_role:TAB_ADMINMANUFACTURERS_CREATE\":149,\"authorization_role:TAB_ADMINMANUFACTURERS_READ\":150,\"authorization_role:TAB_ADMINMANUFACTURERS_UPDATE\":151,\"authorization_role:TAB_ADMINMANUFACTURERS_DELETE\":152,\"authorization_role:TAB_ADMINMETA_CREATE\":153,\"authorization_role:TAB_ADMINMETA_READ\":154,\"authorization_role:TAB_ADMINMETA_UPDATE\":155,\"authorization_role:TAB_ADMINMETA_DELETE\":156,\"authorization_role:TAB_ADMINMODULES_CREATE\":157,\"authorization_role:TAB_ADMINMODULES_READ\":158,\"authorization_role:TAB_ADMINMODULES_UPDATE\":159,\"authorization_role:TAB_ADMINMODULES_DELETE\":160,\"authorization_role:TAB_ADMINMODULESPOSITIONS_CREATE\":161,\"authorization_role:TAB_ADMINMODULESPOSITIONS_READ\":162,\"authorization_role:TAB_ADMINMODULESPOSITIONS_UPDATE\":163,\"authorization_role:TAB_ADMINMODULESPOSITIONS_DELETE\":164,\"authorization_role:TAB_ADMINMODULESUPDATES_CREATE\":165,\"authorization_role:TAB_ADMINMODULESUPDATES_READ\":166,\"authorization_role:TAB_ADMINMODULESUPDATES_UPDATE\":167,\"authorization_role:TAB_ADMINMODULESUPDATES_DELETE\":168,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_CREATE\":169,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_READ\":170,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_UPDATE\":171,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_DELETE\":172,\"authorization_role:TAB_ADMINMODULESSF_CREATE\":173,\"authorization_role:TAB_ADMINMODULESSF_READ\":174,\"authorization_role:TAB_ADMINMODULESSF_UPDATE\":175,\"authorization_role:TAB_ADMINMODULESSF_DELETE\":176,\"authorization_role:TAB_ADMINORDERMESSAGE_CREATE\":177,\"authorization_role:TAB_ADMINORDERMESSAGE_READ\":178,\"authorization_role:TAB_ADMINORDERMESSAGE_UPDATE\":179,\"authorization_role:TAB_ADMINORDERMESSAGE_DELETE\":180,\"authorization_role:TAB_ADMINORDERPREFERENCES_CREATE\":181,\"authorization_role:TAB_ADMINORDERPREFERENCES_READ\":182,\"authorization_role:TAB_ADMINORDERPREFERENCES_UPDATE\":183,\"authorization_role:TAB_ADMINORDERPREFERENCES_DELETE\":184,\"authorization_role:TAB_ADMINORDERS_CREATE\":185,\"authorization_role:TAB_ADMINORDERS_READ\":186,\"authorization_role:TAB_ADMINORDERS_UPDATE\":187,\"authorization_role:TAB_ADMINORDERS_DELETE\":188,\"authorization_role:TAB_ADMINOUTSTANDING_CREATE\":189,\"authorization_role:TAB_ADMINOUTSTANDING_READ\":190,\"authorization_role:TAB_ADMINOUTSTANDING_UPDATE\":191,\"authorization_role:TAB_ADMINOUTSTANDING_DELETE\":192,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_CREATE\":193,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_READ\":194,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_UPDATE\":195,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_DELETE\":196,\"authorization_role:TAB_ADMINPARENTCARTRULES_CREATE\":197,\"authorization_role:TAB_ADMINPARENTCARTRULES_READ\":198,\"authorization_role:TAB_ADMINPARENTCARTRULES_UPDATE\":199,\"authorization_role:TAB_ADMINPARENTCARTRULES_DELETE\":200,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_CREATE\":201,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_READ\":202,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_UPDATE\":203,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_DELETE\":204,\"authorization_role:TAB_ADMINPARENTCUSTOMER_CREATE\":205,\"authorization_role:TAB_ADMINPARENTCUSTOMER_READ\":206,\"authorization_role:TAB_ADMINPARENTCUSTOMER_UPDATE\":207,\"authorization_role:TAB_ADMINPARENTCUSTOMER_DELETE\":208,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_CREATE\":209,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_READ\":210,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_UPDATE\":211,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_DELETE\":212,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_CREATE\":213,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_READ\":214,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_UPDATE\":215,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_DELETE\":216,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_CREATE\":217,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_READ\":218,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_UPDATE\":219,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_DELETE\":220,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_CREATE\":221,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_READ\":222,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_UPDATE\":223,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_DELETE\":224,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_CREATE\":225,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_READ\":226,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_UPDATE\":227,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_DELETE\":228,\"authorization_role:TAB_ADMINPARENTMODULESSF_CREATE\":229,\"authorization_role:TAB_ADMINPARENTMODULESSF_READ\":230,\"authorization_role:TAB_ADMINPARENTMODULESSF_UPDATE\":231,\"authorization_role:TAB_ADMINPARENTMODULESSF_DELETE\":232,\"authorization_role:TAB_ADMINPARENTMETA_CREATE\":233,\"authorization_role:TAB_ADMINPARENTMETA_READ\":234,\"authorization_role:TAB_ADMINPARENTMETA_UPDATE\":235,\"authorization_role:TAB_ADMINPARENTMETA_DELETE\":236,\"authorization_role:TAB_ADMINPARENTMODULES_CREATE\":237,\"authorization_role:TAB_ADMINPARENTMODULES_READ\":238,\"authorization_role:TAB_ADMINPARENTMODULES_UPDATE\":239,\"authorization_role:TAB_ADMINPARENTMODULES_DELETE\":240,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_CREATE\":241,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_READ\":242,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_UPDATE\":243,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_DELETE\":244,\"authorization_role:TAB_ADMINPARENTORDERS_CREATE\":245,\"authorization_role:TAB_ADMINPARENTORDERS_READ\":246,\"authorization_role:TAB_ADMINPARENTORDERS_UPDATE\":247,\"authorization_role:TAB_ADMINPARENTORDERS_DELETE\":248,\"authorization_role:TAB_ADMINPARENTPAYMENT_CREATE\":249,\"authorization_role:TAB_ADMINPARENTPAYMENT_READ\":250,\"authorization_role:TAB_ADMINPARENTPAYMENT_UPDATE\":251,\"authorization_role:TAB_ADMINPARENTPAYMENT_DELETE\":252,\"authorization_role:TAB_ADMINPARENTPREFERENCES_CREATE\":253,\"authorization_role:TAB_ADMINPARENTPREFERENCES_READ\":254,\"authorization_role:TAB_ADMINPARENTPREFERENCES_UPDATE\":255,\"authorization_role:TAB_ADMINPARENTPREFERENCES_DELETE\":256,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_CREATE\":257,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_READ\":258,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_UPDATE\":259,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_DELETE\":260,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_CREATE\":261,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_READ\":262,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_UPDATE\":263,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_DELETE\":264,\"authorization_role:TAB_ADMINPARENTSHIPPING_CREATE\":265,\"authorization_role:TAB_ADMINPARENTSHIPPING_READ\":266,\"authorization_role:TAB_ADMINPARENTSHIPPING_UPDATE\":267,\"authorization_role:TAB_ADMINPARENTSHIPPING_DELETE\":268,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE\":269,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_READ\":270,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE\":271,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE\":272,\"authorization_role:TAB_ADMINPARENTSTORES_CREATE\":273,\"authorization_role:TAB_ADMINPARENTSTORES_READ\":274,\"authorization_role:TAB_ADMINPARENTSTORES_UPDATE\":275,\"authorization_role:TAB_ADMINPARENTSTORES_DELETE\":276,\"authorization_role:TAB_ADMINPARENTTAXES_CREATE\":277,\"authorization_role:TAB_ADMINPARENTTAXES_READ\":278,\"authorization_role:TAB_ADMINPARENTTAXES_UPDATE\":279,\"authorization_role:TAB_ADMINPARENTTAXES_DELETE\":280,\"authorization_role:TAB_ADMINPARENTTHEMES_CREATE\":281,\"authorization_role:TAB_ADMINPARENTTHEMES_READ\":282,\"authorization_role:TAB_ADMINPARENTTHEMES_UPDATE\":283,\"authorization_role:TAB_ADMINPARENTTHEMES_DELETE\":284,\"authorization_role:TAB_ADMINPAYMENT_CREATE\":285,\"authorization_role:TAB_ADMINPAYMENT_READ\":286,\"authorization_role:TAB_ADMINPAYMENT_UPDATE\":287,\"authorization_role:TAB_ADMINPAYMENT_DELETE\":288,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_CREATE\":289,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_READ\":290,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_UPDATE\":291,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_DELETE\":292,\"authorization_role:TAB_ADMINPERFORMANCE_CREATE\":293,\"authorization_role:TAB_ADMINPERFORMANCE_READ\":294,\"authorization_role:TAB_ADMINPERFORMANCE_UPDATE\":295,\"authorization_role:TAB_ADMINPERFORMANCE_DELETE\":296,\"authorization_role:TAB_ADMINPPREFERENCES_CREATE\":297,\"authorization_role:TAB_ADMINPPREFERENCES_READ\":298,\"authorization_role:TAB_ADMINPPREFERENCES_UPDATE\":299,\"authorization_role:TAB_ADMINPPREFERENCES_DELETE\":300,\"authorization_role:TAB_ADMINPREFERENCES_CREATE\":301,\"authorization_role:TAB_ADMINPREFERENCES_READ\":302,\"authorization_role:TAB_ADMINPREFERENCES_UPDATE\":303,\"authorization_role:TAB_ADMINPREFERENCES_DELETE\":304,\"authorization_role:TAB_ADMINPRODUCTS_CREATE\":305,\"authorization_role:TAB_ADMINPRODUCTS_READ\":306,\"authorization_role:TAB_ADMINPRODUCTS_UPDATE\":307,\"authorization_role:TAB_ADMINPRODUCTS_DELETE\":308,\"authorization_role:TAB_ADMINPROFILES_CREATE\":309,\"authorization_role:TAB_ADMINPROFILES_READ\":310,\"authorization_role:TAB_ADMINPROFILES_UPDATE\":311,\"authorization_role:TAB_ADMINPROFILES_DELETE\":312,\"authorization_role:TAB_ADMINREQUESTSQL_CREATE\":313,\"authorization_role:TAB_ADMINREQUESTSQL_READ\":314,\"authorization_role:TAB_ADMINREQUESTSQL_UPDATE\":315,\"authorization_role:TAB_ADMINREQUESTSQL_DELETE\":316,\"authorization_role:TAB_ADMINRETURN_CREATE\":317,\"authorization_role:TAB_ADMINRETURN_READ\":318,\"authorization_role:TAB_ADMINRETURN_UPDATE\":319,\"authorization_role:TAB_ADMINRETURN_DELETE\":320,\"authorization_role:TAB_ADMINSEARCHCONF_CREATE\":321,\"authorization_role:TAB_ADMINSEARCHCONF_READ\":322,\"authorization_role:TAB_ADMINSEARCHCONF_UPDATE\":323,\"authorization_role:TAB_ADMINSEARCHCONF_DELETE\":324,\"authorization_role:TAB_ADMINSEARCHENGINES_CREATE\":325,\"authorization_role:TAB_ADMINSEARCHENGINES_READ\":326,\"authorization_role:TAB_ADMINSEARCHENGINES_UPDATE\":327,\"authorization_role:TAB_ADMINSEARCHENGINES_DELETE\":328,\"authorization_role:TAB_ADMINSHIPPING_CREATE\":329,\"authorization_role:TAB_ADMINSHIPPING_READ\":330,\"authorization_role:TAB_ADMINSHIPPING_UPDATE\":331,\"authorization_role:TAB_ADMINSHIPPING_DELETE\":332,\"authorization_role:TAB_ADMINSHOPGROUP_CREATE\":333,\"authorization_role:TAB_ADMINSHOPGROUP_READ\":334,\"authorization_role:TAB_ADMINSHOPGROUP_UPDATE\":335,\"authorization_role:TAB_ADMINSHOPGROUP_DELETE\":336,\"authorization_role:TAB_ADMINSHOPURL_CREATE\":337,\"authorization_role:TAB_ADMINSHOPURL_READ\":338,\"authorization_role:TAB_ADMINSHOPURL_UPDATE\":339,\"authorization_role:TAB_ADMINSHOPURL_DELETE\":340,\"authorization_role:TAB_ADMINSLIP_CREATE\":341,\"authorization_role:TAB_ADMINSLIP_READ\":342,\"authorization_role:TAB_ADMINSLIP_UPDATE\":343,\"authorization_role:TAB_ADMINSLIP_DELETE\":344,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_CREATE\":345,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_READ\":346,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_UPDATE\":347,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_DELETE\":348,\"authorization_role:TAB_ADMINSTATES_CREATE\":349,\"authorization_role:TAB_ADMINSTATES_READ\":350,\"authorization_role:TAB_ADMINSTATES_UPDATE\":351,\"authorization_role:TAB_ADMINSTATES_DELETE\":352,\"authorization_role:TAB_ADMINSTATS_CREATE\":353,\"authorization_role:TAB_ADMINSTATS_READ\":354,\"authorization_role:TAB_ADMINSTATS_UPDATE\":355,\"authorization_role:TAB_ADMINSTATS_DELETE\":356,\"authorization_role:TAB_ADMINSTATUSES_CREATE\":357,\"authorization_role:TAB_ADMINSTATUSES_READ\":358,\"authorization_role:TAB_ADMINSTATUSES_UPDATE\":359,\"authorization_role:TAB_ADMINSTATUSES_DELETE\":360,\"authorization_role:TAB_ADMINSTOCK_CREATE\":361,\"authorization_role:TAB_ADMINSTOCK_READ\":362,\"authorization_role:TAB_ADMINSTOCK_UPDATE\":363,\"authorization_role:TAB_ADMINSTOCK_DELETE\":364,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_CREATE\":365,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_READ\":366,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_UPDATE\":367,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_DELETE\":368,\"authorization_role:TAB_ADMINSTORES_CREATE\":369,\"authorization_role:TAB_ADMINSTORES_READ\":370,\"authorization_role:TAB_ADMINSTORES_UPDATE\":371,\"authorization_role:TAB_ADMINSTORES_DELETE\":372,\"authorization_role:TAB_ADMINSUPPLIERS_CREATE\":373,\"authorization_role:TAB_ADMINSUPPLIERS_READ\":374,\"authorization_role:TAB_ADMINSUPPLIERS_UPDATE\":375,\"authorization_role:TAB_ADMINSUPPLIERS_DELETE\":376,\"authorization_role:TAB_ADMINTAGS_CREATE\":377,\"authorization_role:TAB_ADMINTAGS_READ\":378,\"authorization_role:TAB_ADMINTAGS_UPDATE\":379,\"authorization_role:TAB_ADMINTAGS_DELETE\":380,\"authorization_role:TAB_ADMINTAXES_CREATE\":381,\"authorization_role:TAB_ADMINTAXES_READ\":382,\"authorization_role:TAB_ADMINTAXES_UPDATE\":383,\"authorization_role:TAB_ADMINTAXES_DELETE\":384,\"authorization_role:TAB_ADMINTAXRULESGROUP_CREATE\":385,\"authorization_role:TAB_ADMINTAXRULESGROUP_READ\":386,\"authorization_role:TAB_ADMINTAXRULESGROUP_UPDATE\":387,\"authorization_role:TAB_ADMINTAXRULESGROUP_DELETE\":388,\"authorization_role:TAB_ADMINTHEMES_CREATE\":389,\"authorization_role:TAB_ADMINTHEMES_READ\":390,\"authorization_role:TAB_ADMINTHEMES_UPDATE\":391,\"authorization_role:TAB_ADMINTHEMES_DELETE\":392,\"authorization_role:TAB_ADMINTRACKING_CREATE\":393,\"authorization_role:TAB_ADMINTRACKING_READ\":394,\"authorization_role:TAB_ADMINTRACKING_UPDATE\":395,\"authorization_role:TAB_ADMINTRACKING_DELETE\":396,\"authorization_role:TAB_ADMINTRANSLATIONS_CREATE\":397,\"authorization_role:TAB_ADMINTRANSLATIONS_READ\":398,\"authorization_role:TAB_ADMINTRANSLATIONS_UPDATE\":399,\"authorization_role:TAB_ADMINTRANSLATIONS_DELETE\":400,\"authorization_role:TAB_ADMINWAREHOUSES_CREATE\":401,\"authorization_role:TAB_ADMINWAREHOUSES_READ\":402,\"authorization_role:TAB_ADMINWAREHOUSES_UPDATE\":403,\"authorization_role:TAB_ADMINWAREHOUSES_DELETE\":404,\"authorization_role:TAB_ADMINWEBSERVICE_CREATE\":405,\"authorization_role:TAB_ADMINWEBSERVICE_READ\":406,\"authorization_role:TAB_ADMINWEBSERVICE_UPDATE\":407,\"authorization_role:TAB_ADMINWEBSERVICE_DELETE\":408,\"authorization_role:TAB_ADMINZONES_CREATE\":409,\"authorization_role:TAB_ADMINZONES_READ\":410,\"authorization_role:TAB_ADMINZONES_UPDATE\":411,\"authorization_role:TAB_ADMINZONES_DELETE\":412,\"authorization_role:TAB_CONFIGURE_CREATE\":413,\"authorization_role:TAB_CONFIGURE_READ\":414,\"authorization_role:TAB_CONFIGURE_UPDATE\":415,\"authorization_role:TAB_CONFIGURE_DELETE\":416,\"authorization_role:TAB_IMPROVE_CREATE\":417,\"authorization_role:TAB_IMPROVE_READ\":418,\"authorization_role:TAB_IMPROVE_UPDATE\":419,\"authorization_role:TAB_IMPROVE_DELETE\":420,\"authorization_role:TAB_SELL_CREATE\":421,\"authorization_role:TAB_SELL_READ\":422,\"authorization_role:TAB_SELL_UPDATE\":423,\"authorization_role:TAB_SELL_DELETE\":424,\"authorization_role:TAB_SHOPPARAMETERS_CREATE\":425,\"authorization_role:TAB_SHOPPARAMETERS_READ\":426,\"authorization_role:TAB_SHOPPARAMETERS_UPDATE\":427,\"authorization_role:TAB_SHOPPARAMETERS_DELETE\":428,\"authorization_role:TAB_ADMINPARENTMAILTHEME_CREATE\":429,\"authorization_role:TAB_ADMINPARENTMAILTHEME_READ\":430,\"authorization_role:TAB_ADMINPARENTMAILTHEME_UPDATE\":431,\"authorization_role:TAB_ADMINPARENTMAILTHEME_DELETE\":432,\"authorization_role:TAB_ADMINMAILTHEME_CREATE\":433,\"authorization_role:TAB_ADMINMAILTHEME_READ\":434,\"authorization_role:TAB_ADMINMAILTHEME_UPDATE\":435,\"authorization_role:TAB_ADMINMAILTHEME_DELETE\":436,\"authorization_role:TAB_ADMINMODULESMANAGE_CREATE\":437,\"authorization_role:TAB_ADMINMODULESMANAGE_READ\":438,\"authorization_role:TAB_ADMINMODULESMANAGE_UPDATE\":439,\"authorization_role:TAB_ADMINMODULESMANAGE_DELETE\":440,\"authorization_role:TAB_ADMINFEATUREFLAG_CREATE\":441,\"authorization_role:TAB_ADMINFEATUREFLAG_READ\":442,\"authorization_role:TAB_ADMINFEATUREFLAG_UPDATE\":443,\"authorization_role:TAB_ADMINFEATUREFLAG_DELETE\":444,\"authorization_role:TAB_ADMINPARENTSECURITY_CREATE\":445,\"authorization_role:TAB_ADMINPARENTSECURITY_READ\":446,\"authorization_role:TAB_ADMINPARENTSECURITY_UPDATE\":447,\"authorization_role:TAB_ADMINPARENTSECURITY_DELETE\":448,\"authorization_role:TAB_ADMINSECURITY_CREATE\":449,\"authorization_role:TAB_ADMINSECURITY_READ\":450,\"authorization_role:TAB_ADMINSECURITY_UPDATE\":451,\"authorization_role:TAB_ADMINSECURITY_DELETE\":452,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_CREATE\":453,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_READ\":454,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_UPDATE\":455,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_DELETE\":456,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_CREATE\":457,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_READ\":458,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_UPDATE\":459,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_DELETE\":460,\"profile:SuperAdmin\":\"1\",\"access:access_1_0\":0,\"access:access_1_1\":0,\"access:access_1_2\":0,\"access:access_1_3\":0,\"access:access_1_9\":0,\"access:access_1_10\":0,\"access:access_1_11\":0,\"access:access_1_13\":0,\"access:access_1_14\":0,\"access:access_1_15\":0,\"access:access_1_16\":0,\"access:access_1_19\":0,\"access:access_1_20\":0,\"access:access_1_21\":0,\"access:access_1_22\":0,\"access:access_1_23\":0,\"access:access_1_24\":0,\"access:access_1_25\":0,\"access:access_1_26\":0,\"access:access_1_27\":0,\"access:access_1_29\":0,\"access:access_1_30\":0,\"access:access_1_32\":0,\"access:access_1_33\":0,\"access:access_1_34\":0,\"access:access_1_35\":0,\"access:access_1_36\":0,\"access:access_1_37\":0,\"access:access_1_39\":0,\"access:access_1_40\":0,\"access:access_1_41\":0,\"access:access_1_42\":0,\"access:access_1_43\":0,\"access:access_1_44\":0,\"access:access_1_45\":0,\"access:access_1_46\":0,\"access:access_1_47\":0,\"access:access_1_49\":0,\"access:access_1_50\":0,\"access:access_1_51\":0,\"access:access_1_53\":0,\"access:access_1_54\":0,\"access:access_1_55\":0,\"access:access_1_56\":0,\"access:access_1_57\":0,\"access:access_1_58\":0,\"access:access_1_59\":0,\"access:access_1_60\":0,\"access:access_1_62\":0,\"access:access_1_63\":0,\"access:access_1_64\":0,\"access:access_1_67\":0,\"access:access_1_68\":0,\"access:access_1_69\":0,\"access:access_1_70\":0,\"access:access_1_71\":0,\"access:access_1_72\":0,\"access:access_1_73\":0,\"access:access_1_74\":0,\"access:access_1_75\":0,\"access:access_1_76\":0,\"access:access_1_77\":0,\"access:access_1_78\":0,\"access:access_1_79\":0,\"access:access_1_81\":0,\"access:access_1_82\":0,\"access:access_1_83\":0,\"access:access_1_84\":0,\"access:access_1_85\":0,\"access:access_1_87\":0,\"access:access_1_88\":0,\"access:access_1_89\":0,\"access:access_1_90\":0,\"access:access_1_91\":0,\"access:access_1_93\":0,\"access:access_1_98\":0,\"access:access_1_99\":0,\"access:access_1_100\":0,\"access:access_1_101\":0,\"access:access_1_102\":0,\"access:access_1_103\":0,\"access:access_1_104\":0,\"access:access_1_105\":0,\"access:access_1_106\":0,\"access:access_1_107\":0,\"access:access_1_108\":0,\"access:access_1_109\":0,\"access:access_1_110\":0,\"access:access_1_111\":0,\"access:access_1_112\":0,\"access:access_1_113\":0,\"access:access_1_114\":0,\"access:access_1_115\":0,\"access:access_1_116\":0,\"access:access_1_117\":0,\"access:access_1_118\":0,\"access:access_1_119\":0,\"access:access_1_120\":0,\"access:access_1_121\":0,\"access:access_1_122\":0,\"access:access_1_123\":0,\"access:access_1_124\":0,\"access:access_1_125\":0,\"access:access_1_126\":0,\"access:access_1_127\":0,\"access:access_1_128\":0,\"access:access_1_129\":0,\"access:access_1_130\":0,\"access:access_1_131\":0,\"access:access_1_132\":0,\"access:access_1_133\":0,\"access:access_1_134\":0,\"access:access_1_135\":0,\"access:access_1_136\":0,\"access:access_1_137\":0,\"access:access_1_138\":0,\"access:access_1_139\":0,\"access:access_1_140\":0,\"access:access_1_141\":0,\"access:access_1_142\":0,\"access:access_1_143\":0,\"access:access_1_144\":0,\"access:access_1_145\":0,\"access:access_1_146\":0,\"access:access_1_147\":0,\"access:access_1_148\":0,\"access:access_1_149\":0,\"access:access_1_150\":0,\"access:access_1_151\":0,\"access:access_1_152\":0,\"access:access_1_153\":0,\"access:access_1_154\":0,\"access:access_1_155\":0,\"access:access_1_156\":0,\"access:access_1_157\":0,\"access:access_1_158\":0,\"access:access_1_159\":0,\"access:access_1_160\":0,\"access:access_1_161\":0,\"access:access_1_162\":0,\"access:access_1_163\":0,\"access:access_1_164\":0,\"access:access_1_165\":0,\"access:access_1_166\":0,\"access:access_1_167\":0,\"access:access_1_168\":0,\"access:access_1_169\":0,\"access:access_1_170\":0,\"access:access_1_171\":0,\"access:access_1_172\":0,\"access:access_1_173\":0,\"access:access_1_174\":0,\"access:access_1_175\":0,\"access:access_1_176\":0,\"access:access_1_177\":0,\"access:access_1_178\":0,\"access:access_1_179\":0,\"access:access_1_180\":0,\"access:access_1_181\":0,\"access:access_1_182\":0,\"access:access_1_183\":0,\"access:access_1_184\":0,\"access:access_1_185\":0,\"access:access_1_186\":0,\"access:access_1_187\":0,\"access:access_1_188\":0,\"access:access_1_189\":0,\"access:access_1_190\":0,\"access:access_1_191\":0,\"access:access_1_192\":0,\"access:access_1_193\":0,\"access:access_1_194\":0,\"access:access_1_195\":0,\"access:access_1_196\":0,\"access:access_1_197\":0,\"access:access_1_198\":0,\"access:access_1_199\":0,\"access:access_1_200\":0,\"access:access_1_201\":0,\"access:access_1_202\":0,\"access:access_1_203\":0,\"access:access_1_204\":0,\"access:access_1_205\":0,\"access:access_1_206\":0,\"access:access_1_207\":0,\"access:access_1_208\":0,\"access:access_1_209\":0,\"access:access_1_210\":0,\"access:access_1_211\":0,\"access:access_1_212\":0,\"access:access_1_213\":0,\"access:access_1_214\":0,\"access:access_1_215\":0,\"access:access_1_216\":0,\"access:access_1_217\":0,\"access:access_1_218\":0,\"access:access_1_219\":0,\"access:access_1_220\":0,\"access:access_1_221\":0,\"access:access_1_222\":0,\"access:access_1_223\":0,\"access:access_1_224\":0,\"access:access_1_225\":0,\"access:access_1_226\":0,\"access:access_1_227\":0,\"access:access_1_228\":0,\"access:access_1_229\":0,\"access:access_1_230\":0,\"access:access_1_231\":0,\"access:access_1_232\":0,\"access:access_1_233\":0,\"access:access_1_234\":0,\"access:access_1_235\":0,\"access:access_1_236\":0,\"access:access_1_237\":0,\"access:access_1_238\":0,\"access:access_1_239\":0,\"access:access_1_240\":0,\"access:access_1_241\":0,\"access:access_1_242\":0,\"access:access_1_243\":0,\"access:access_1_244\":0,\"access:access_1_245\":0,\"access:access_1_246\":0,\"access:access_1_247\":0,\"access:access_1_248\":0,\"access:access_1_249\":0,\"access:access_1_250\":0,\"access:access_1_251\":0,\"access:access_1_252\":0,\"access:access_1_253\":0,\"access:access_1_254\":0,\"access:access_1_255\":0,\"access:access_1_256\":0,\"access:access_1_257\":0,\"access:access_1_258\":0,\"access:access_1_259\":0,\"access:access_1_260\":0,\"access:access_1_261\":0,\"access:access_1_262\":0,\"access:access_1_263\":0,\"access:access_1_264\":0,\"access:access_1_265\":0,\"access:access_1_266\":0,\"access:access_1_267\":0,\"access:access_1_268\":0,\"access:access_1_269\":0,\"access:access_1_270\":0,\"access:access_1_271\":0,\"access:access_1_272\":0,\"access:access_1_273\":0,\"access:access_1_274\":0,\"access:access_1_275\":0,\"access:access_1_276\":0,\"access:access_1_277\":0,\"access:access_1_278\":0,\"access:access_1_279\":0,\"access:access_1_280\":0,\"access:access_1_281\":0,\"access:access_1_282\":0,\"access:access_1_283\":0,\"access:access_1_284\":0,\"access:access_1_285\":0,\"access:access_1_286\":0,\"access:access_1_287\":0,\"access:access_1_288\":0,\"access:access_1_289\":0,\"access:access_1_290\":0,\"access:access_1_291\":0,\"access:access_1_292\":0,\"access:access_1_293\":0,\"access:access_1_294\":0,\"access:access_1_295\":0,\"access:access_1_296\":0,\"access:access_1_297\":0,\"access:access_1_298\":0,\"access:access_1_299\":0,\"access:access_1_300\":0,\"access:access_1_301\":0,\"access:access_1_302\":0,\"access:access_1_303\":0,\"access:access_1_304\":0,\"access:access_1_305\":0,\"access:access_1_306\":0,\"access:access_1_307\":0,\"access:access_1_308\":0,\"access:access_1_309\":0,\"access:access_1_314\":0,\"access:access_1_315\":0,\"access:access_1_316\":0,\"access:access_1_317\":0,\"access:access_1_318\":0,\"access:access_1_319\":0,\"access:access_1_320\":0,\"access:access_1_321\":0,\"access:access_1_322\":0,\"access:access_1_323\":0,\"access:access_1_324\":0,\"access:access_1_325\":0,\"access:access_1_326\":0,\"access:access_1_327\":0,\"access:access_1_328\":0,\"access:access_1_329\":0,\"access:access_1_330\":0,\"access:access_1_331\":0,\"access:access_1_332\":0,\"access:access_1_333\":0,\"access:access_1_334\":0,\"access:access_1_335\":0,\"access:access_1_336\":0,\"access:access_1_337\":0,\"access:access_1_338\":0,\"access:access_1_339\":0,\"access:access_1_340\":0,\"access:access_1_341\":0,\"access:access_1_342\":0,\"access:access_1_343\":0,\"access:access_1_344\":0,\"access:access_1_345\":0,\"access:access_1_346\":0,\"access:access_1_347\":0,\"access:access_1_348\":0,\"access:access_1_349\":0,\"access:access_1_350\":0,\"access:access_1_351\":0,\"access:access_1_352\":0,\"access:access_1_353\":0,\"access:access_1_354\":0,\"access:access_1_355\":0,\"access:access_1_356\":0,\"access:access_1_357\":0,\"access:access_1_358\":0,\"access:access_1_359\":0,\"access:access_1_360\":0,\"access:access_1_361\":0,\"access:access_1_373\":0,\"access:access_1_374\":0,\"access:access_1_375\":0,\"access:access_1_376\":0,\"access:access_1_381\":0,\"access:access_1_382\":0,\"access:access_1_383\":0,\"access:access_1_384\":0,\"access:access_1_385\":0,\"access:access_1_386\":0,\"access:access_1_387\":0,\"access:access_1_388\":0,\"access:access_1_393\":0,\"access:access_1_394\":0,\"access:access_1_395\":0,\"access:access_1_396\":0,\"access:access_1_397\":0,\"access:access_1_398\":0,\"access:access_1_399\":0,\"access:access_1_400\":0,\"access:access_1_401\":0,\"access:access_1_402\":0,\"access:access_1_403\":0,\"access:access_1_404\":0,\"access:access_1_405\":0,\"access:access_1_406\":0,\"access:access_1_407\":0,\"access:access_1_408\":0,\"access:access_1_413\":0,\"access:access_1_414\":0,\"access:access_1_415\":0,\"access:access_1_416\":0,\"access:access_1_417\":0,\"access:access_1_418\":0,\"access:access_1_419\":0,\"access:access_1_420\":0,\"access:access_1_421\":0,\"access:access_1_422\":0,\"access:access_1_423\":0,\"access:access_1_424\":0,\"access:access_1_425\":0,\"access:access_1_426\":0,\"access:access_1_427\":0,\"access:access_1_428\":0,\"access:access_1_429\":0,\"access:access_1_430\":0,\"access:access_1_431\":0,\"access:access_1_432\":0,\"access:access_1_433\":0,\"access:access_1_434\":0,\"access:access_1_435\":0,\"access:access_1_436\":0,\"access:access_1_437\":0,\"access:access_1_438\":0,\"access:access_1_439\":0,\"access:access_1_440\":0,\"access:access_1_441\":0,\"access:access_1_442\":0,\"access:access_1_443\":0,\"access:access_1_444\":0,\"access:access_1_445\":0,\"access:access_1_446\":0,\"access:access_1_447\":0,\"access:access_1_448\":0,\"access:access_1_449\":0,\"access:access_1_450\":0,\"access:access_1_451\":0,\"access:access_1_452\":0,\"access:access_1_453\":0,\"access:access_1_454\":0,\"access:access_1_455\":0,\"access:access_1_456\":0,\"access:access_1_457\":0,\"access:access_1_458\":0,\"access:access_1_459\":0,\"access:access_1_460\":0,\"access:access_1_461\":0,\"access:access_1_462\":0,\"access:access_1_463\":0,\"access:access_1_464\":0,\"access:access_1_465\":0,\"access:access_1_466\":0,\"access:access_1_467\":0,\"access:access_1_468\":0,\"access:access_1_469\":0,\"access:access_1_470\":0,\"access:access_1_471\":0,\"access:access_1_472\":0,\"access:access_1_473\":0,\"access:access_1_474\":0,\"access:access_1_475\":0,\"access:access_1_476\":0,\"access:access_1_477\":0,\"access:access_1_478\":0,\"access:access_1_479\":0,\"access:access_1_480\":0,\"access:access_1_481\":0,\"access:access_1_482\":0,\"access:access_1_483\":0,\"access:access_1_484\":0,\"access:access_1_485\":0,\"access:access_1_486\":0,\"access:access_1_487\":0,\"access:access_1_488\":0,\"access:access_1_489\":0,\"access:access_1_490\":0,\"access:access_1_491\":0,\"access:access_1_492\":0,\"access:access_1_493\":0,\"access:access_1_494\":0,\"access:access_1_495\":0,\"access:access_1_496\":0,\"access:access_1_497\":0,\"access:access_1_498\":0,\"access:access_1_499\":0,\"access:access_1_500\":0,\"access:access_1_501\":0,\"access:access_1_502\":0,\"access:access_1_503\":0,\"zone:Europe\":\"1\",\"zone:North_America\":\"2\",\"zone:Asia\":\"3\",\"zone:Africa\":\"4\",\"zone:Oceania\":\"5\",\"zone:South_America\":\"6\",\"zone:Europe_out_E_U\":\"7\",\"zone:Central_America_Antilla\":\"8\",\"country:DE\":1,\"country:AT\":2,\"country:BE\":3,\"country:CA\":4,\"country:CN\":5,\"country:ES\":6,\"country:FI\":7,\"country:FR\":8,\"country:GR\":9,\"country:IT\":10,\"country:JP\":11,\"country:LU\":12,\"country:NL\":13,\"country:PL\":14,\"country:PT\":15,\"country:CZ\":16,\"country:GB\":17,\"country:SE\":18,\"country:CH\":19,\"country:DK\":20,\"country:US\":21,\"country:HK\":22,\"country:NO\":23,\"country:AU\":24,\"country:SG\":25,\"country:IE\":26,\"country:NZ\":27,\"country:KR\":28,\"country:IL\":29,\"country:ZA\":30,\"country:NG\":31,\"country:CI\":32,\"country:TG\":33,\"country:BO\":34,\"country:MU\":35,\"country:RO\":36,\"country:SK\":37,\"country:DZ\":38,\"country:AS\":39,\"country:AD\":40,\"country:AO\":41,\"country:AI\":42,\"country:AG\":43,\"country:AR\":44,\"country:AM\":45,\"country:AW\":46,\"country:AZ\":47,\"country:BS\":48,\"country:BH\":49,\"country:BD\":50,\"country:BB\":51,\"country:BY\":52,\"country:BZ\":53,\"country:BJ\":54,\"country:BM\":55,\"country:BT\":56,\"country:BW\":57,\"country:BR\":58,\"country:BN\":59,\"country:BF\":60,\"country:MM\":61,\"country:BI\":62,\"country:KH\":63,\"country:CM\":64,\"country:CV\":65,\"country:CF\":66,\"country:TD\":67,\"country:CL\":68,\"country:CO\":69,\"country:KM\":70,\"country:CD\":71,\"country:CG\":72,\"country:CR\":73,\"country:HR\":74,\"country:CU\":75,\"country:CY\":76,\"country:DJ\":77,\"country:DM\":78,\"country:DO\":79,\"country:TL\":80,\"country:EC\":81,\"country:EG\":82,\"country:SV\":83,\"country:GQ\":84,\"country:ER\":85,\"country:EE\":86,\"country:ET\":87,\"country:FK\":88,\"country:FO\":89,\"country:FJ\":90,\"country:GA\":91,\"country:GM\":92,\"country:GE\":93,\"country:GH\":94,\"country:GD\":95,\"country:GL\":96,\"country:GI\":97,\"country:GP\":98,\"country:GU\":99,\"country:GT\":100,\"country:GG\":101,\"country:GN\":102,\"country:GW\":103,\"country:GY\":104,\"country:HT\":105,\"country:VA\":106,\"country:HN\":107,\"country:IS\":108,\"country:IN\":109,\"country:ID\":110,\"country:IR\":111,\"country:IQ\":112,\"country:IM\":113,\"country:JM\":114,\"country:JE\":115,\"country:JO\":116,\"country:KZ\":117,\"country:KE\":118,\"country:KI\":119,\"country:KP\":120,\"country:KW\":121,\"country:KG\":122,\"country:LA\":123,\"country:LV\":124,\"country:LB\":125,\"country:LS\":126,\"country:LR\":127,\"country:LY\":128,\"country:LI\":129,\"country:LT\":130,\"country:MO\":131,\"country:MK\":132,\"country:MG\":133,\"country:MW\":134,\"country:MY\":135,\"country:MV\":136,\"country:ML\":137,\"country:MT\":138,\"country:MH\":139,\"country:MQ\":140,\"country:MR\":141,\"country:HU\":142,\"country:YT\":143,\"country:MX\":144,\"country:FM\":145,\"country:MD\":146,\"country:MC\":147,\"country:MN\":148,\"country:ME\":149,\"country:MS\":150,\"country:MA\":151,\"country:MZ\":152,\"country:NA\":153,\"country:NR\":154,\"country:NP\":155,\"country:NC\":156,\"country:NI\":157,\"country:NE\":158,\"country:NU\":159,\"country:NF\":160,\"country:MP\":161,\"country:OM\":162,\"country:PK\":163,\"country:PW\":164,\"country:PS\":165,\"country:PA\":166,\"country:PG\":167,\"country:PY\":168,\"country:PE\":169,\"country:PH\":170,\"country:PN\":171,\"country:PR\":172,\"country:QA\":173,\"country:RE\":174,\"country:RU\":175,\"country:RW\":176,\"country:BL\":177,\"country:KN\":178,\"country:LC\":179,\"country:MF\":180,\"country:PM\":181,\"country:VC\":182,\"country:WS\":183,\"country:SM\":184,\"country:ST\":185,\"country:SA\":186,\"country:SN\":187,\"country:RS\":188,\"country:SC\":189,\"country:SL\":190,\"country:SI\":191,\"country:SB\":192,\"country:SO\":193,\"country:GS\":194,\"country:LK\":195,\"country:SD\":196,\"country:SR\":197,\"country:SJ\":198,\"country:SZ\":199,\"country:SY\":200,\"country:TW\":201,\"country:TJ\":202,\"country:TZ\":203,\"country:TH\":204,\"country:TK\":205,\"country:TO\":206,\"country:TT\":207,\"country:TN\":208,\"country:TR\":209,\"country:TM\":210,\"country:TC\":211,\"country:TV\":212,\"country:UG\":213,\"country:UA\":214,\"country:AE\":215,\"country:UY\":216,\"country:UZ\":217,\"country:VU\":218,\"country:VE\":219,\"country:VN\":220,\"country:VG\":221,\"country:VI\":222,\"country:WF\":223,\"country:EH\":224,\"country:YE\":225,\"country:ZM\":226,\"country:ZW\":227,\"country:AL\":228,\"country:AF\":229,\"country:AQ\":230,\"country:BA\":231,\"country:IO\":232,\"country:BG\":233,\"country:KY\":234,\"country:CX\":235,\"country:CC\":236,\"country:CK\":237,\"country:GF\":238,\"country:PF\":239,\"country:TF\":240,\"country:AX\":241,\"address_format:address_format_1\":\"0\",\"address_format:address_format_2\":\"0\",\"address_format:address_format_3\":\"0\",\"address_format:address_format_4\":\"0\",\"address_format:address_format_5\":\"0\",\"address_format:address_format_6\":\"0\",\"address_format:address_format_7\":\"0\",\"address_format:address_format_8\":\"0\",\"address_format:address_format_9\":\"0\",\"address_format:address_format_10\":\"0\",\"address_format:address_format_11\":\"0\",\"address_format:address_format_12\":\"0\",\"address_format:address_format_13\":\"0\",\"address_format:address_format_14\":\"0\",\"address_format:address_format_15\":\"0\",\"address_format:address_format_16\":\"0\",\"address_format:address_format_17\":\"0\",\"address_format:address_format_18\":\"0\",\"address_format:address_format_19\":\"0\",\"address_format:address_format_20\":\"0\",\"address_format:address_format_21\":\"0\",\"address_format:address_format_22\":\"0\",\"address_format:address_format_23\":\"0\",\"address_format:address_format_24\":\"0\",\"address_format:address_format_25\":\"0\",\"address_format:address_format_26\":\"0\",\"address_format:address_format_27\":\"0\",\"address_format:address_format_28\":\"0\",\"address_format:address_format_29\":\"0\",\"address_format:address_format_30\":\"0\",\"address_format:address_format_31\":\"0\",\"address_format:address_format_32\":\"0\",\"address_format:address_format_33\":\"0\",\"address_format:address_format_34\":\"0\",\"address_format:address_format_35\":\"0\",\"address_format:address_format_36\":\"0\",\"address_format:address_format_37\":\"0\",\"address_format:address_format_38\":\"0\",\"address_format:address_format_39\":\"0\",\"address_format:address_format_40\":\"0\",\"address_format:address_format_41\":\"0\",\"address_format:address_format_42\":\"0\",\"address_format:address_format_43\":\"0\",\"address_format:address_format_44\":\"0\",\"address_format:address_format_45\":\"0\",\"address_format:address_format_46\":\"0\",\"address_format:address_format_47\":\"0\",\"address_format:address_format_48\":\"0\",\"address_format:address_format_49\":\"0\",\"address_format:address_format_50\":\"0\",\"address_format:address_format_51\":\"0\",\"address_format:address_format_52\":\"0\",\"address_format:address_format_53\":\"0\",\"address_format:address_format_54\":\"0\",\"address_format:address_format_55\":\"0\",\"address_format:address_format_56\":\"0\",\"address_format:address_format_57\":\"0\",\"address_format:address_format_58\":\"0\",\"address_format:address_format_59\":\"0\",\"address_format:address_format_60\":\"0\",\"address_format:address_format_61\":\"0\",\"address_format:address_format_62\":\"0\",\"address_format:address_format_63\":\"0\",\"address_format:address_format_64\":\"0\",\"address_format:address_format_65\":\"0\",\"address_format:address_format_66\":\"0\",\"address_format:address_format_67\":\"0\",\"address_format:address_format_68\":\"0\",\"address_format:address_format_69\":\"0\",\"address_format:address_format_70\":\"0\",\"address_format:address_format_71\":\"0\",\"address_format:address_format_72\":\"0\",\"address_format:address_format_73\":\"0\",\"address_format:address_format_74\":\"0\",\"address_format:address_format_75\":\"0\",\"address_format:address_format_76\":\"0\",\"address_format:address_format_77\":\"0\",\"address_format:address_format_78\":\"0\",\"address_format:address_format_79\":\"0\",\"address_format:address_format_80\":\"0\",\"address_format:address_format_81\":\"0\",\"address_format:address_format_82\":\"0\",\"address_format:address_format_83\":\"0\",\"address_format:address_format_84\":\"0\",\"address_format:address_format_85\":\"0\",\"address_format:address_format_86\":\"0\",\"address_format:address_format_87\":\"0\",\"address_format:address_format_88\":\"0\",\"address_format:address_format_89\":\"0\",\"address_format:address_format_90\":\"0\",\"address_format:address_format_91\":\"0\",\"address_format:address_format_92\":\"0\",\"address_format:address_format_93\":\"0\",\"address_format:address_format_94\":\"0\",\"address_format:address_format_95\":\"0\",\"address_format:address_format_96\":\"0\",\"address_format:address_format_97\":\"0\",\"address_format:address_format_98\":\"0\",\"address_format:address_format_99\":\"0\",\"address_format:address_format_100\":\"0\",\"address_format:address_format_101\":\"0\",\"address_format:address_format_102\":\"0\",\"address_format:address_format_103\":\"0\",\"address_format:address_format_104\":\"0\",\"address_format:address_format_105\":\"0\",\"address_format:address_format_107\":\"0\",\"address_format:address_format_108\":\"0\",\"address_format:address_format_109\":\"0\",\"address_format:address_format_110\":\"0\",\"address_format:address_format_111\":\"0\",\"address_format:address_format_112\":\"0\",\"address_format:address_format_113\":\"0\",\"address_format:address_format_114\":\"0\",\"address_format:address_format_115\":\"0\",\"address_format:address_format_116\":\"0\",\"address_format:address_format_117\":\"0\",\"address_format:address_format_118\":\"0\",\"address_format:address_format_119\":\"0\",\"address_format:address_format_120\":\"0\",\"address_format:address_format_121\":\"0\",\"address_format:address_format_122\":\"0\",\"address_format:address_format_123\":\"0\",\"address_format:address_format_124\":\"0\",\"address_format:address_format_125\":\"0\",\"address_format:address_format_126\":\"0\",\"address_format:address_format_127\":\"0\",\"address_format:address_format_128\":\"0\",\"address_format:address_format_129\":\"0\",\"address_format:address_format_130\":\"0\",\"address_format:address_format_131\":\"0\",\"address_format:address_format_132\":\"0\",\"address_format:address_format_133\":\"0\",\"address_format:address_format_134\":\"0\",\"address_format:address_format_135\":\"0\",\"address_format:address_format_136\":\"0\",\"address_format:address_format_137\":\"0\",\"address_format:address_format_138\":\"0\",\"address_format:address_format_139\":\"0\",\"address_format:address_format_140\":\"0\",\"address_format:address_format_141\":\"0\",\"address_format:address_format_142\":\"0\",\"address_format:address_format_143\":\"0\",\"address_format:address_format_144\":\"0\",\"address_format:address_format_145\":\"0\",\"address_format:address_format_146\":\"0\",\"address_format:address_format_147\":\"0\",\"address_format:address_format_148\":\"0\",\"address_format:address_format_149\":\"0\",\"address_format:address_format_150\":\"0\",\"address_format:address_format_151\":\"0\",\"address_format:address_format_152\":\"0\",\"address_format:address_format_153\":\"0\",\"address_format:address_format_154\":\"0\",\"address_format:address_format_155\":\"0\",\"address_format:address_format_156\":\"0\",\"address_format:address_format_158\":\"0\",\"address_format:address_format_159\":\"0\",\"address_format:address_format_160\":\"0\",\"address_format:address_format_161\":\"0\",\"address_format:address_format_162\":\"0\",\"address_format:address_format_163\":\"0\",\"address_format:address_format_164\":\"0\",\"address_format:address_format_165\":\"0\",\"address_format:address_format_166\":\"0\",\"address_format:address_format_167\":\"0\",\"address_format:address_format_168\":\"0\",\"address_format:address_format_169\":\"0\",\"address_format:address_format_170\":\"0\",\"address_format:address_format_171\":\"0\",\"address_format:address_format_172\":\"0\",\"address_format:address_format_173\":\"0\",\"address_format:address_format_174\":\"0\",\"address_format:address_format_175\":\"0\",\"address_format:address_format_176\":\"0\",\"address_format:address_format_177\":\"0\",\"address_format:address_format_178\":\"0\",\"address_format:address_format_179\":\"0\",\"address_format:address_format_180\":\"0\",\"address_format:address_format_181\":\"0\",\"address_format:address_format_182\":\"0\",\"address_format:address_format_183\":\"0\",\"address_format:address_format_184\":\"0\",\"address_format:address_format_185\":\"0\",\"address_format:address_format_186\":\"0\",\"address_format:address_format_187\":\"0\",\"address_format:address_format_188\":\"0\",\"address_format:address_format_189\":\"0\",\"address_format:address_format_190\":\"0\",\"address_format:address_format_191\":\"0\",\"address_format:address_format_192\":\"0\",\"address_format:address_format_193\":\"0\",\"address_format:address_format_194\":\"0\",\"address_format:address_format_195\":\"0\",\"address_format:address_format_196\":\"0\",\"address_format:address_format_197\":\"0\",\"address_format:address_format_198\":\"0\",\"address_format:address_format_199\":\"0\",\"address_format:address_format_200\":\"0\",\"address_format:address_format_201\":\"0\",\"address_format:address_format_202\":\"0\",\"address_format:address_format_203\":\"0\",\"address_format:address_format_204\":\"0\",\"address_format:address_format_205\":\"0\",\"address_format:address_format_206\":\"0\",\"address_format:address_format_207\":\"0\",\"address_format:address_format_208\":\"0\",\"address_format:address_format_209\":\"0\",\"address_format:address_format_210\":\"0\",\"address_format:address_format_211\":\"0\",\"address_format:address_format_212\":\"0\",\"address_format:address_format_213\":\"0\",\"address_format:address_format_214\":\"0\",\"address_format:address_format_215\":\"0\",\"address_format:address_format_216\":\"0\",\"address_format:address_format_217\":\"0\",\"address_format:address_format_218\":\"0\",\"address_format:address_format_219\":\"0\",\"address_format:address_format_220\":\"0\",\"address_format:address_format_221\":\"0\",\"address_format:address_format_222\":\"0\",\"address_format:address_format_223\":\"0\",\"address_format:address_format_224\":\"0\",\"address_format:address_format_225\":\"0\",\"address_format:address_format_226\":\"0\",\"address_format:address_format_227\":\"0\",\"address_format:address_format_228\":\"0\",\"address_format:address_format_229\":\"0\",\"address_format:address_format_230\":\"0\",\"address_format:address_format_231\":\"0\",\"address_format:address_format_232\":\"0\",\"address_format:address_format_233\":\"0\",\"address_format:address_format_235\":\"0\",\"address_format:address_format_236\":\"0\",\"address_format:address_format_237\":\"0\",\"address_format:address_format_238\":\"0\",\"address_format:address_format_239\":\"0\",\"address_format:address_format_240\":\"0\",\"address_format:address_format_241\":\"0\",\"address_format:address_format_242\":\"0\",\"address_format:address_format_243\":\"0\",\"address_format:address_format_244\":\"0\",\"carrier:carrier_1\":\"1\",\"group:Visitor\":\"1\",\"group:Guest\":\"2\",\"group:Customer\":\"3\",\"carrier_group:carrier_group_1_1\":0,\"carrier_group:carrier_group_1_2\":0,\"carrier_group:carrier_group_1_3\":0,\"carrier_tax_rules_group_shop:carrier_tax_rules_group_shop_1_1_1\":0,\"carrier_zone:carrier_zone_1_1\":0,\"category:Root\":\"1\",\"category:Home\":\"2\",\"category_group:category_group_1_1\":0,\"category_group:category_group_1_2\":0,\"category_group:category_group_1_3\":0,\"cms_category:Home\":\"1\",\"cms:Delivery\":\"1\",\"cms:Legal_Notice\":\"2\",\"cms:Terms_and_conditions_of_use\":\"3\",\"cms:About_us\":\"4\",\"cms:Secure_payment\":\"5\",\"cms_role:\":\"2\",\"configuration:PS_CURRENCY_DEFAULT\":6,\"configuration:PS_COUNTRY_DEFAULT\":7,\"configuration:PS_REWRITING_SETTINGS\":8,\"configuration:PS_ORDER_OUT_OF_STOCK\":9,\"configuration:PS_LAST_QTIES\":10,\"configuration:PS_CONDITIONS\":11,\"configuration:PS_RECYCLABLE_PACK\":12,\"configuration:PS_GIFT_WRAPPING\":13,\"configuration:PS_GIFT_WRAPPING_PRICE\":14,\"configuration:PS_STOCK_MANAGEMENT\":15,\"configuration:PS_NAVIGATION_PIPE\":16,\"configuration:PS_PRODUCTS_PER_PAGE\":17,\"configuration:PS_PURCHASE_MINIMUM\":18,\"configuration:PS_PRODUCTS_ORDER_WAY\":19,\"configuration:PS_PRODUCTS_ORDER_BY\":20,\"configuration:PS_DISPLAY_QTIES\":21,\"configuration:PS_SHIPPING_HANDLING\":22,\"configuration:PS_SHIPPING_FREE_PRICE\":23,\"configuration:PS_SHIPPING_FREE_WEIGHT\":24,\"configuration:PS_SHIPPING_METHOD\":25,\"configuration:PS_TAX\":26,\"configuration:PS_SHOP_ENABLE\":27,\"configuration:PS_NB_DAYS_NEW_PRODUCT\":28,\"configuration:PS_SSL_ENABLED\":29,\"configuration:PS_WEIGHT_UNIT\":30,\"configuration:PS_BLOCK_CART_AJAX\":31,\"configuration:PS_ORDER_RETURN\":32,\"configuration:PS_ORDER_RETURN_NB_DAYS\":33,\"configuration:PS_MAIL_TYPE\":34,\"configuration:PS_PRODUCT_PICTURE_MAX_SIZE\":35,\"configuration:PS_PRODUCT_PICTURE_WIDTH\":36,\"configuration:PS_PRODUCT_PICTURE_HEIGHT\":37,\"configuration:PS_INVOICE_PREFIX\":38,\"configuration:PS_INVCE_INVOICE_ADDR_RULES\":39,\"configuration:PS_INVCE_DELIVERY_ADDR_RULES\":40,\"configuration:PS_DELIVERY_PREFIX\":41,\"configuration:PS_DELIVERY_NUMBER\":42,\"configuration:PS_RETURN_PREFIX\":43,\"configuration:PS_INVOICE\":44,\"configuration:PS_PASSWD_TIME_BACK\":45,\"configuration:PS_PASSWD_TIME_FRONT\":46,\"configuration:PS_PASSWD_RESET_VALIDITY\":47,\"configuration:PS_DISP_UNAVAILABLE_ATTR\":48,\"configuration:PS_SEARCH_INDEXATION\":49,\"configuration:PS_SEARCH_FUZZY\":50,\"configuration:PS_SEARCH_FUZZY_MAX_LOOP\":51,\"configuration:PS_SEARCH_MAX_WORD_LENGTH\":52,\"configuration:PS_SEARCH_MINWORDLEN\":53,\"configuration:PS_SEARCH_BLACKLIST\":54,\"configuration:PS_SEARCH_WEIGHT_PNAME\":55,\"configuration:PS_SEARCH_WEIGHT_REF\":56,\"configuration:PS_SEARCH_WEIGHT_SHORTDESC\":57,\"configuration:PS_SEARCH_WEIGHT_DESC\":58,\"configuration:PS_SEARCH_WEIGHT_CNAME\":59,\"configuration:PS_SEARCH_WEIGHT_MNAME\":60,\"configuration:PS_SEARCH_WEIGHT_TAG\":61,\"configuration:PS_SEARCH_WEIGHT_ATTRIBUTE\":62,\"configuration:PS_SEARCH_WEIGHT_FEATURE\":63,\"configuration:PS_SEARCH_AJAX\":64,\"configuration:PS_TIMEZONE\":65,\"configuration:PS_THEME_V11\":66,\"configuration:PRESTASTORE_LIVE\":67,\"configuration:PS_TIN_ACTIVE\":68,\"configuration:PS_SHOW_ALL_MODULES\":69,\"configuration:PS_BACKUP_ALL\":70,\"configuration:PS_1_3_UPDATE_DATE\":71,\"configuration:PS_PRICE_ROUND_MODE\":72,\"configuration:PS_1_3_2_UPDATE_DATE\":73,\"configuration:PS_CONDITIONS_CMS_ID\":74,\"configuration:PS_VOLUME_UNIT\":75,\"configuration:PS_CIPHER_ALGORITHM\":76,\"configuration:PS_ATTRIBUTE_CATEGORY_DISPLAY\":77,\"configuration:PS_CUSTOMER_SERVICE_FILE_UPLOAD\":78,\"configuration:PS_CUSTOMER_SERVICE_SIGNATURE\":79,\"configuration:PS_BLOCK_BESTSELLERS_DISPLAY\":80,\"configuration:PS_BLOCK_NEWPRODUCTS_DISPLAY\":81,\"configuration:PS_BLOCK_SPECIALS_DISPLAY\":82,\"configuration:PS_STOCK_MVT_REASON_DEFAULT\":83,\"configuration:PS_SPECIFIC_PRICE_PRIORITIES\":84,\"configuration:PS_TAX_DISPLAY\":85,\"configuration:PS_SMARTY_FORCE_COMPILE\":86,\"configuration:PS_DISTANCE_UNIT\":87,\"configuration:PS_STORES_DISPLAY_CMS\":88,\"configuration:SHOP_LOGO_WIDTH\":89,\"configuration:SHOP_LOGO_HEIGHT\":90,\"configuration:EDITORIAL_IMAGE_WIDTH\":91,\"configuration:EDITORIAL_IMAGE_HEIGHT\":92,\"configuration:PS_STATSDATA_CUSTOMER_PAGESVIEWS\":93,\"configuration:PS_STATSDATA_PAGESVIEWS\":94,\"configuration:PS_STATSDATA_PLUGINS\":95,\"configuration:PS_GEOLOCATION_ENABLED\":96,\"configuration:PS_ALLOWED_COUNTRIES\":97,\"configuration:PS_GEOLOCATION_BEHAVIOR\":98,\"configuration:PS_LOCALE_LANGUAGE\":99,\"configuration:PS_LOCALE_COUNTRY\":100,\"configuration:PS_ATTACHMENT_MAXIMUM_SIZE\":101,\"configuration:PS_SMARTY_CACHE\":102,\"configuration:PS_DIMENSION_UNIT\":103,\"configuration:PS_GUEST_CHECKOUT_ENABLED\":104,\"configuration:PS_DISPLAY_SUPPLIERS\":105,\"configuration:PS_DISPLAY_MANUFACTURERS\":106,\"configuration:PS_DISPLAY_BEST_SELLERS\":107,\"configuration:PS_CATALOG_MODE\":108,\"configuration:PS_GEOLOCATION_WHITELIST\":109,\"configuration:PS_LOGS_BY_EMAIL\":110,\"configuration:PS_COOKIE_CHECKIP\":111,\"configuration:PS_COOKIE_SAMESITE\":112,\"configuration:PS_USE_ECOTAX\":113,\"configuration:PS_CANONICAL_REDIRECT\":114,\"configuration:PS_IMG_UPDATE_TIME\":115,\"configuration:PS_BACKUP_DROP_TABLE\":116,\"configuration:PS_OS_CHEQUE\":117,\"configuration:PS_OS_PAYMENT\":118,\"configuration:PS_OS_PREPARATION\":119,\"configuration:PS_OS_SHIPPING\":120,\"configuration:PS_OS_DELIVERED\":121,\"configuration:PS_OS_CANCELED\":122,\"configuration:PS_OS_REFUND\":123,\"configuration:PS_OS_ERROR\":124,\"configuration:PS_OS_OUTOFSTOCK\":125,\"configuration:PS_OS_BANKWIRE\":126,\"configuration:PS_OS_WS_PAYMENT\":127,\"configuration:PS_OS_OUTOFSTOCK_PAID\":128,\"configuration:PS_OS_OUTOFSTOCK_UNPAID\":129,\"configuration:PS_OS_COD_VALIDATION\":130,\"configuration:PS_LEGACY_IMAGES\":131,\"configuration:PS_IMAGE_QUALITY\":132,\"configuration:PS_PNG_QUALITY\":133,\"configuration:PS_JPEG_QUALITY\":134,\"configuration:PS_WEBP_QUALITY\":135,\"configuration:PS_COOKIE_LIFETIME_FO\":136,\"configuration:PS_COOKIE_LIFETIME_BO\":137,\"configuration:PS_RESTRICT_DELIVERED_COUNTRIES\":138,\"configuration:PS_SHOW_NEW_ORDERS\":139,\"configuration:PS_SHOW_NEW_CUSTOMERS\":140,\"configuration:PS_SHOW_NEW_MESSAGES\":141,\"configuration:PS_FEATURE_FEATURE_ACTIVE\":142,\"configuration:PS_COMBINATION_FEATURE_ACTIVE\":143,\"configuration:PS_SPECIFIC_PRICE_FEATURE_ACTIVE\":144,\"configuration:PS_VIRTUAL_PROD_FEATURE_ACTIVE\":145,\"configuration:PS_CUSTOMIZATION_FEATURE_ACTIVE\":146,\"configuration:PS_CART_RULE_FEATURE_ACTIVE\":147,\"configuration:PS_PACK_FEATURE_ACTIVE\":148,\"configuration:PS_ALIAS_FEATURE_ACTIVE\":149,\"configuration:PS_TAX_ADDRESS_TYPE\":150,\"configuration:PS_SHOP_DEFAULT\":151,\"configuration:PS_CARRIER_DEFAULT_SORT\":152,\"configuration:PS_STOCK_MVT_INC_REASON_DEFAULT\":153,\"configuration:PS_STOCK_MVT_DEC_REASON_DEFAULT\":154,\"configuration:PS_ADVANCED_STOCK_MANAGEMENT\":155,\"configuration:PS_STOCK_MVT_TRANSFER_TO\":156,\"configuration:PS_STOCK_MVT_TRANSFER_FROM\":157,\"configuration:PS_CARRIER_DEFAULT_ORDER\":158,\"configuration:PS_STOCK_MVT_SUPPLY_ORDER\":159,\"configuration:PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON\":160,\"configuration:PS_STOCK_CUSTOMER_RETURN_REASON\":161,\"configuration:PS_STOCK_MVT_INC_EMPLOYEE_EDITION\":162,\"configuration:PS_STOCK_MVT_DEC_EMPLOYEE_EDITION\":163,\"configuration:PS_STOCK_CUSTOMER_ORDER_REASON\":164,\"configuration:PS_UNIDENTIFIED_GROUP\":165,\"configuration:PS_GUEST_GROUP\":166,\"configuration:PS_CUSTOMER_GROUP\":167,\"configuration:PS_SMARTY_CONSOLE\":168,\"configuration:PS_INVOICE_MODEL\":169,\"configuration:PS_LIMIT_UPLOAD_IMAGE_VALUE\":170,\"configuration:PS_LIMIT_UPLOAD_FILE_VALUE\":171,\"configuration:MB_PAY_TO_EMAIL\":172,\"configuration:MB_SECRET_WORD\":173,\"configuration:MB_HIDE_LOGIN\":174,\"configuration:MB_ID_LOGO\":175,\"configuration:MB_ID_LOGO_WALLET\":176,\"configuration:MB_PARAMETERS\":177,\"configuration:MB_PARAMETERS_2\":178,\"configuration:MB_DISPLAY_MODE\":179,\"configuration:MB_CANCEL_URL\":180,\"configuration:MB_LOCAL_METHODS\":181,\"configuration:MB_INTER_METHODS\":182,\"configuration:BANK_WIRE_CURRENCIES\":183,\"configuration:CHEQUE_CURRENCIES\":184,\"configuration:PRODUCTS_VIEWED_NBR\":185,\"configuration:BLOCK_CATEG_DHTML\":186,\"configuration:BLOCK_CATEG_MAX_DEPTH\":187,\"configuration:MANUFACTURER_DISPLAY_FORM\":188,\"configuration:MANUFACTURER_DISPLAY_TEXT\":189,\"configuration:MANUFACTURER_DISPLAY_TEXT_NB\":190,\"configuration:NEW_PRODUCTS_NBR\":191,\"configuration:PS_TOKEN_ENABLE\":192,\"configuration:PS_STATS_RENDER\":193,\"configuration:PS_STATS_OLD_CONNECT_AUTO_CLEAN\":194,\"configuration:PS_STATS_GRID_RENDER\":195,\"configuration:BLOCKTAGS_NBR\":196,\"configuration:CHECKUP_DESCRIPTIONS_LT\":197,\"configuration:CHECKUP_DESCRIPTIONS_GT\":198,\"configuration:CHECKUP_IMAGES_LT\":199,\"configuration:CHECKUP_IMAGES_GT\":200,\"configuration:CHECKUP_SALES_LT\":201,\"configuration:CHECKUP_SALES_GT\":202,\"configuration:CHECKUP_STOCK_LT\":203,\"configuration:CHECKUP_STOCK_GT\":204,\"configuration:FOOTER_CMS\":205,\"configuration:FOOTER_BLOCK_ACTIVATION\":206,\"configuration:FOOTER_POWEREDBY\":207,\"configuration:BLOCKADVERT_LINK\":208,\"configuration:BLOCKSTORE_IMG\":209,\"configuration:BLOCKADVERT_IMG_EXT\":210,\"configuration:MOD_BLOCKTOPMENU_ITEMS\":211,\"configuration:MOD_BLOCKTOPMENU_SEARCH\":212,\"configuration:blocksocial_facebook\":213,\"configuration:blocksocial_twitter\":214,\"configuration:blocksocial_rss\":215,\"configuration:blockcontactinfos_company\":216,\"configuration:blockcontactinfos_address\":217,\"configuration:blockcontactinfos_phone\":218,\"configuration:blockcontactinfos_email\":219,\"configuration:blockcontact_telnumber\":220,\"configuration:blockcontact_email\":221,\"configuration:SUPPLIER_DISPLAY_TEXT\":222,\"configuration:SUPPLIER_DISPLAY_TEXT_NB\":223,\"configuration:SUPPLIER_DISPLAY_FORM\":224,\"configuration:BLOCK_CATEG_NBR_COLUMN_FOOTER\":225,\"configuration:UPGRADER_BACKUPDB_FILENAME\":226,\"configuration:UPGRADER_BACKUPFILES_FILENAME\":227,\"configuration:BLOCKREINSURANCE_NBBLOCKS\":228,\"configuration:HOMESLIDER_WIDTH\":229,\"configuration:HOMESLIDER_SPEED\":230,\"configuration:HOMESLIDER_PAUSE\":231,\"configuration:HOMESLIDER_LOOP\":232,\"configuration:PS_BASE_DISTANCE_UNIT\":233,\"configuration:PS_SHOP_DOMAIN\":234,\"configuration:PS_SHOP_DOMAIN_SSL\":235,\"configuration:PS_SHOP_NAME\":236,\"configuration:PS_SHOP_EMAIL\":237,\"configuration:PS_MAIL_METHOD\":238,\"configuration:PS_SHOP_ACTIVITY\":239,\"configuration:PS_LOGO\":240,\"configuration:PS_FAVICON\":241,\"configuration:PS_STORES_ICON\":242,\"configuration:PS_ROOT_CATEGORY\":243,\"configuration:PS_HOME_CATEGORY\":244,\"configuration:PS_CONFIGURATION_AGREMENT\":245,\"configuration:PS_MAIL_SERVER\":246,\"configuration:PS_MAIL_USER\":247,\"configuration:PS_MAIL_PASSWD\":248,\"configuration:PS_MAIL_SMTP_ENCRYPTION\":249,\"configuration:PS_MAIL_SMTP_PORT\":250,\"configuration:PS_MAIL_COLOR\":251,\"configuration:PS_MAIL_DKIM_ENABLE\":252,\"configuration:PS_MAIL_DKIM_DOMAIN\":253,\"configuration:PS_MAIL_DKIM_SELECTOR\":254,\"configuration:PS_MAIL_DKIM_KEY\":255,\"configuration:NW_SALT\":256,\"configuration:PS_PAYMENT_LOGO_CMS_ID\":257,\"configuration:HOME_FEATURED_NBR\":258,\"configuration:SEK_MIN_OCCURENCES\":259,\"configuration:SEK_FILTER_KW\":260,\"configuration:PS_ALLOW_MOBILE_DEVICE\":261,\"configuration:PS_CUSTOMER_CREATION_EMAIL\":262,\"configuration:PS_SMARTY_CONSOLE_KEY\":263,\"configuration:PS_ATTRIBUTE_ANCHOR_SEPARATOR\":264,\"configuration:CONF_AVERAGE_PRODUCT_MARGIN\":265,\"configuration:PS_DASHBOARD_SIMULATION\":266,\"configuration:PS_USE_HTMLPURIFIER\":267,\"configuration:PS_SMARTY_LOCAL\":268,\"configuration:PS_SMARTY_CLEAR_CACHE\":269,\"configuration:PS_DETECT_LANG\":270,\"configuration:PS_DETECT_COUNTRY\":271,\"configuration:PS_ROUND_TYPE\":272,\"configuration:PS_LOG_EMAILS\":273,\"configuration:PS_CUSTOMER_OPTIN\":274,\"configuration:PS_CUSTOMER_BIRTHDATE\":275,\"configuration:PS_PACK_STOCK_TYPE\":276,\"configuration:PS_LOG_MODULE_PERFS_MODULO\":277,\"configuration:PS_DISALLOW_HISTORY_REORDERING\":278,\"configuration:PS_DISPLAY_PRODUCT_WEIGHT\":279,\"configuration:PS_PRODUCT_WEIGHT_PRECISION\":280,\"configuration:PS_ORDER_RECALCULATE_SHIPPING\":281,\"configuration:PS_MAINTENANCE_TEXT\":282,\"configuration:PS_PRODUCT_SHORT_DESC_LIMIT\":283,\"configuration:PS_LABEL_IN_STOCK_PRODUCTS\":284,\"configuration:PS_LABEL_OOS_PRODUCTS_BOA\":285,\"configuration:PS_LABEL_OOS_PRODUCTS_BOD\":286,\"configuration:PS_CATALOG_MODE_WITH_PRICES\":287,\"configuration:PS_MAIL_THEME\":288,\"configuration:PS_ORDER_PRODUCTS_NB_PER_PAGE\":289,\"configuration:PS_LOGS_EMAIL_RECEIVERS\":290,\"configuration:PS_SHOW_LABEL_OOS_LISTING_PAGES\":291,\"configuration:ADDONS_API_MODULE_CHANNEL\":292,\"configuration:PS_SECURITY_TOKEN\":293,\"configuration:PS_SECURITY_PASSWORD_POLICY_MAXIMUM_LENGTH\":294,\"configuration:PS_SECURITY_PASSWORD_POLICY_MINIMUM_LENGTH\":295,\"configuration:PS_SECURITY_PASSWORD_POLICY_MINIMUM_SCORE\":296,\"contact:Webmaster\":\"1\",\"contact:Customer_service\":\"2\",\"feature_flag:product_page_v2\":\"1\",\"feature_flag:product_page_v2_multi_shop\":\"2\",\"gender:Mr\":\"1\",\"gender:Mrs\":\"2\",\"hook:actionValidateOrder\":1,\"hook:actionValidateOrderAfter\":2,\"hook:displayMaintenance\":3,\"hook:displayCartModalContent\":4,\"hook:displayCartModalFooter\":5,\"hook:displayProductPageDrawer\":6,\"hook:actionPaymentConfirmation\":7,\"hook:displayPaymentReturn\":8,\"hook:actionUpdateQuantity\":9,\"hook:displayRightColumn\":10,\"hook:displayWrapperTop\":11,\"hook:displayWrapperBottom\":12,\"hook:displayContentWrapperTop\":13,\"hook:displayContentWrapperBottom\":14,\"hook:displayLeftColumn\":15,\"hook:displayHome\":16,\"hook:displayHeader\":17,\"hook:actionCartSave\":18,\"hook:actionAuthentication\":19,\"hook:actionProductAdd\":20,\"hook:actionProductUpdate\":21,\"hook:displayAfterTitleTag\":22,\"hook:displayAfterBodyOpeningTag\":23,\"hook:displayBanner\":24,\"hook:displayBeforeBodyClosingTag\":25,\"hook:displayTop\":26,\"hook:displayNavFullWidth\":27,\"hook:displayRightColumnProduct\":28,\"hook:actionProductDelete\":29,\"hook:actionObjectProductInCartDeleteBefore\":30,\"hook:actionObjectProductInCartDeleteAfter\":31,\"hook:displayFooterProduct\":32,\"hook:displayInvoice\":33,\"hook:actionOrderStatusUpdate\":34,\"hook:displayAdminGridTableBefore\":573,\"hook:displayAdminGridTableAfter\":574,\"hook:displayAdminOrder\":37,\"hook:displayAdminOrderTabOrder\":38,\"hook:displayAdminOrderTabShip\":39,\"hook:displayAdminOrderContentOrder\":40,\"hook:displayAdminOrderContentShip\":41,\"hook:displayFooter\":42,\"hook:displayPDFInvoice\":43,\"hook:displayInvoiceLegalFreeText\":44,\"hook:displayAdminCustomers\":45,\"hook:displayAdminCustomersAddressesItemAction\":46,\"hook:displayOrderConfirmation\":47,\"hook:actionCustomerAccountAdd\":48,\"hook:actionCustomerAccountUpdate\":49,\"hook:displayCustomerAccount\":50,\"hook:actionOrderSlipAdd\":51,\"hook:displayShoppingCartFooter\":52,\"hook:displayCreateAccountEmailFormBottom\":53,\"hook:displayAuthenticateFormBottom\":54,\"hook:displayCustomerAccountForm\":55,\"hook:displayModuleConfigureExtraButtons\":56,\"hook:displayAdminStatsModules\":57,\"hook:displayAdminStatsGraphEngine\":58,\"hook:actionOrderReturn\":59,\"hook:displayProductAdditionalInfo\":60,\"hook:displayBackOfficeHome\":61,\"hook:displayAdminStatsGridEngine\":62,\"hook:actionWatermark\":63,\"hook:actionProductCancel\":64,\"hook:displayLeftColumnProduct\":65,\"hook:actionProductOutOfStock\":66,\"hook:actionProductAttributeUpdate\":67,\"hook:displayCarrierList\":68,\"hook:displayShoppingCart\":69,\"hook:actionCarrierUpdate\":70,\"hook:actionOrderStatusPostUpdate\":71,\"hook:displayCustomerAccountFormTop\":72,\"hook:displayBackOfficeHeader\":73,\"hook:displayBackOfficeTop\":74,\"hook:displayAdminEndContent\":75,\"hook:displayBackOfficeFooter\":76,\"hook:actionProductAttributeDelete\":77,\"hook:actionCarrierProcess\":78,\"hook:displayBeforeCarrier\":79,\"hook:displayAfterCarrier\":80,\"hook:displayOrderDetail\":81,\"hook:actionPaymentCCAdd\":82,\"hook:actionCategoryAdd\":83,\"hook:actionCategoryUpdate\":84,\"hook:actionCategoryDelete\":85,\"hook:displayPaymentTop\":86,\"hook:actionHtaccessCreate\":87,\"hook:actionAdminMetaSave\":88,\"hook:displayAttributeGroupForm\":89,\"hook:actionAttributeGroupSave\":90,\"hook:actionAttributeGroupDelete\":91,\"hook:displayFeatureForm\":92,\"hook:actionFeatureSave\":93,\"hook:actionFeatureDelete\":94,\"hook:actionProductSave\":95,\"hook:displayAttributeGroupPostProcess\":96,\"hook:displayFeaturePostProcess\":97,\"hook:displayFeatureValueForm\":98,\"hook:displayFeatureValuePostProcess\":99,\"hook:actionFeatureValueDelete\":100,\"hook:actionFeatureValueSave\":101,\"hook:displayAttributeForm\":102,\"hook:actionAttributePostProcess\":103,\"hook:actionAttributeDelete\":104,\"hook:actionAttributeSave\":105,\"hook:actionTaxManager\":106,\"hook:displayMyAccountBlock\":107,\"hook:actionModuleInstallBefore\":108,\"hook:actionModuleInstallAfter\":109,\"hook:actionModuleUninstallBefore\":110,\"hook:actionModuleUninstallAfter\":111,\"hook:displayTopColumn\":112,\"hook:displayBackOfficeCategory\":113,\"hook:displayProductListFunctionalButtons\":114,\"hook:displayNav\":115,\"hook:displayOverrideTemplate\":116,\"hook:actionAdminLoginControllerSetMedia\":117,\"hook:actionOrderEdited\":118,\"hook:actionEmailAddBeforeContent\":119,\"hook:actionEmailAddAfterContent\":120,\"hook:sendMailAlterTemplateVars\":121,\"hook:displayCartExtraProductActions\":122,\"hook:displayPaymentByBinaries\":123,\"hook:additionalCustomerFormFields\":124,\"hook:additionalCustomerAddressFields\":125,\"hook:addWebserviceResources\":126,\"hook:displayCustome', '2023-05-02 12:16:57', '2023-05-02 12:16:57'), -(298, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', '2023-05-02 12:16:57', '2023-05-08 16:59:10'), +(298, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', '2023-05-02 12:16:57', '2023-08-28 11:40:31'), (299, NULL, NULL, 'PSR_HOOK_HEADER', '0', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), (300, NULL, NULL, 'PSR_HOOK_FOOTER', '0', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), (301, NULL, NULL, 'PSR_HOOK_PRODUCT', '1', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), @@ -3473,8 +3469,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (458, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_WEEKLY', '28', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), (459, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_MONTHLY', '29', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), (460, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '30', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(484, NULL, NULL, 'PS_ALLOW_HTML_IFRAME', NULL, '2023-05-08 16:59:10', '2023-05-08 16:59:10'), -(485, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', '1', '2023-05-08 16:59:10', '2023-05-08 16:59:10'), +(484, NULL, NULL, 'PS_ALLOW_HTML_IFRAME', NULL, '2023-05-08 16:59:10', '2023-08-28 11:40:31'), +(485, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', NULL, '2023-05-08 16:59:10', '2023-08-28 11:40:31'), (486, NULL, NULL, 'PS_CCCJS_VERSION', '1', '2023-05-08 17:09:12', '2023-05-08 17:09:12'), (487, NULL, NULL, 'PS_CCCCSS_VERSION', '1', '2023-05-08 17:09:12', '2023-05-08 17:09:12'), (492, 1, 1, 'MOLLIE_ENVIRONMENT', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), @@ -3730,7 +3726,9 @@ INSERT INTO `ps_connections` (`id_connections`, `id_shop_group`, `id_shop`, `id_ (41, 1, 1, 833, 1, 1490595887, '2023-05-15 10:29:31', ''), (42, 1, 1, 836, 3, 1490595887, '2023-05-15 10:29:55', ''), (43, 1, 1, 837, 3, 1490595887, '2023-05-15 10:29:56', ''), -(44, 1, 2, 124, 1, 1490595887, '2023-05-15 10:31:31', ''); +(44, 1, 2, 124, 1, 1490595887, '2023-05-15 10:31:31', ''), +(45, 1, 1, 913, 2, 1404794126, '2023-08-28 10:56:51', ''), +(46, 1, 1, 916, 1, 1404794126, '2023-08-28 10:57:11', ''); DROP TABLE IF EXISTS `ps_connections_page`; CREATE TABLE `ps_connections_page` ( @@ -3767,17 +3765,14 @@ INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, (7, 6, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), (8, 11, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), (9, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), -(10, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=7&utm_nooverride=1&rand=1684137420&key=d3706ec244ca9eab42f1fc44b328f4ae&customerId=3&order_number=mol_76461e5cc3a5e51684137420', '', '2023-05-15 09:57:11'), (11, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), (12, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), (13, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), (14, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), (15, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), (16, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), -(17, 11, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=13&utm_nooverride=1&rand=1684137664&key=8900fd298500393a9e33f64884749e5d&customerId=3&order_number=mol_136461e6c020e831684137664', '', '2023-05-15 10:01:13'), (18, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), (19, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), -(20, 11, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=15&utm_nooverride=1&rand=1684137749&key=8cb2296283120dba6295254e168228b8&customerId=3&order_number=mol_156461e71509c031684137749', '', '2023-05-15 10:02:40'), (21, 11, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), (22, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), (23, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), @@ -3789,25 +3784,20 @@ INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, (29, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), (30, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), (31, 19, '', 'demoshop8debug.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), -(32, 19, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=20&utm_nooverride=1&rand=1684138327&key=2e74e2ae079c17082613558eb9b9c2db&customerId=3&order_number=mol_206461e95746ba71684138327', '', '2023-05-15 10:12:18'), (33, 20, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), (34, 21, '', 'demoshop8debug.ngrok.io/en/', '', '2023-05-15 10:12:52'), (35, 22, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), (36, 27, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), (37, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), -(38, 27, 'https://demoshop8debug.ngrok.io/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=21&utm_nooverride=1&rand=1684139123&key=00a8bde746f83e8885f48645578f9544&customerId=3&order_number=mol_216461ec7306c9e1684139123', '', '2023-05-15 10:25:37'), (39, 27, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), (40, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), -(41, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=22&utm_nooverride=1&rand=1684139182&key=239f329ef0c0962a66f3f6b57761a643&customerId=3&order_number=mol_226461ecae77ce11684139182', '', '2023-05-15 10:26:34'), (42, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), -(43, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=23&utm_nooverride=1&rand=1684139231&key=1dbd385fe7198fdfad40185f704d510a&customerId=3&order_number=mol_236461ecdf1959f1684139231', '', '2023-05-15 10:27:19'), (44, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), -(45, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/de/module/mollie/return?cart_id=24&utm_nooverride=1&rand=1684139277&key=47e45fd72178d52d813c84d73e229dbd&customerId=3&order_number=mol_246461ed0d1102a1684139277', '', '2023-05-15 10:28:09'), (46, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), -(47, 27, 'https://www.mollie.com/', 'demoshop8debug.ngrok.io/shop2/en/module/mollie/return?cart_id=25&utm_nooverride=1&rand=1684139342&key=46c2c075c7e4377e2013d07caf01445d&customerId=3&order_number=mol_256461ed4eb56401684139342', '', '2023-05-15 10:29:16'), (48, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), (49, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), -(50, 44, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'); +(50, 44, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'), +(51, 46, '', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 10:57:11'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -5691,7 +5681,7 @@ CREATE TABLE `ps_employee` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_employee` (`id_employee`, `id_profile`, `id_lang`, `lastname`, `firstname`, `email`, `passwd`, `last_passwd_gen`, `stats_date_from`, `stats_date_to`, `stats_compare_from`, `stats_compare_to`, `stats_compare_option`, `preselect_date_range`, `bo_color`, `bo_theme`, `bo_css`, `default_tab`, `bo_width`, `bo_menu`, `active`, `optin`, `id_last_order`, `id_last_customer_message`, `id_last_customer`, `last_connection_date`, `reset_password_token`, `reset_password_validity`, `has_enabled_gravatar`) VALUES -(1, 1, 1, 'Doe', 'John', 'demo@prestashop.com', '$2y$10$q322jp6mz0cb71ZbjPycduo540qj3ptvpvX/CkuSI3TV4HmvmdPG2', '2023-05-02 06:16:59', '2023-04-02', '2023-05-02', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-05-15', NULL, '0000-00-00 00:00:00', 0); +(1, 1, 1, 'Doe', 'John', 'demo@prestashop.com', '$2y$10$q322jp6mz0cb71ZbjPycduo540qj3ptvpvX/CkuSI3TV4HmvmdPG2', '2023-05-02 06:16:59', '2023-04-02', '2023-05-02', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-08-28', NULL, '0000-00-00 00:00:00', 0); DROP TABLE IF EXISTS `ps_employee_session`; CREATE TABLE `ps_employee_session` ( @@ -5709,7 +5699,9 @@ INSERT INTO `ps_employee_session` (`id_employee_session`, `id_employee`, `token` (4, 1, '96e2c290feb46f4ae5e970d08e94297506a85240', '2023-05-15 09:55:41', '2023-05-15 10:03:03'), (5, 1, '82ec834d1e15c6d8d559b89e35f3de0fade68d29', '2023-05-15 10:13:30', '2023-05-15 10:42:45'), (6, 1, '90f28ac72faade5f2e803e9ef2560cd6df8b952d', '2023-05-15 10:21:50', '2023-05-15 10:23:21'), -(7, 1, '46c91e6e4113ab4a2048ee3ac31d2d505ae01269', '2023-05-15 10:23:38', '2023-05-15 10:30:06'); +(7, 1, '46c91e6e4113ab4a2048ee3ac31d2d505ae01269', '2023-05-15 10:23:38', '2023-05-15 10:30:06'), +(8, 1, '8a368b7b836014e2491dc0f454e476496beecb1f', '2023-08-28 10:56:38', '2023-08-28 10:56:48'), +(9, 1, 'f1f085b5f15db8783771114436f6c2a64c00f21c', '2023-08-28 10:57:58', '2023-08-28 11:44:35'); DROP TABLE IF EXISTS `ps_employee_shop`; CREATE TABLE `ps_employee_shop` ( @@ -6978,7 +6970,257 @@ INSERT INTO `ps_guest` (`id_guest`, `id_operating_system`, `id_web_browser`, `id (905, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (906, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (907, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(908, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); +(908, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(909, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(910, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(911, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(912, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(913, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(914, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(915, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(916, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), +(917, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(918, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(919, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(921, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(922, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(923, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(924, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(925, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(926, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(927, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(928, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(929, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(930, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(931, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(932, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(933, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(934, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(935, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(936, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(937, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(938, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(939, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(940, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(941, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(942, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(943, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(944, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(945, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(946, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(947, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(949, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(950, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(951, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(952, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(953, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(954, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(955, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(956, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(957, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(958, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(959, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(960, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(961, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(962, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(963, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(964, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(965, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(966, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(967, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(969, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(970, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(971, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(972, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(973, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(974, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(976, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(977, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(978, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(979, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(980, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(982, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(983, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(984, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(985, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(986, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(987, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(988, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(989, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(990, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(991, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(992, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(993, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(994, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(995, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(996, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(997, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(998, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1002, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1003, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1004, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1005, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1006, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1007, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1008, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1009, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1011, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1012, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1013, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1014, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1015, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1016, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1017, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1018, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1019, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1020, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1021, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1022, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1023, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1025, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1026, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1027, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1028, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1029, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1031, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1032, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1033, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1034, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1035, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1036, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1037, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1038, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1039, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1040, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1041, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1042, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1043, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1044, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1045, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1046, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1049, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1050, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1051, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1052, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1053, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1054, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1055, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1056, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1057, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1058, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1059, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1060, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1061, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1062, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1063, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1064, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1065, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1066, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1067, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1068, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1069, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1070, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1071, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1072, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1073, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1074, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1075, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1076, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1077, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1078, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1079, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1080, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1081, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1082, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1083, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1084, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1085, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1086, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1087, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1088, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1089, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1090, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1091, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1092, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1093, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1094, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1095, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1097, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1098, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1099, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1153, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1157, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); DROP TABLE IF EXISTS `ps_homeslider`; CREATE TABLE `ps_homeslider` ( @@ -7948,7 +8190,8 @@ INSERT INTO `ps_hook` (`id_hook`, `name`, `title`, `description`, `active`, `pos (912, 'actionObjectAddressUpdateAfter', 'actionObjectAddressUpdateAfter', '', 1, 1), (913, 'actionObjectAddressDeleteAfter', 'actionObjectAddressDeleteAfter', '', 1, 1), (914, 'actionBeforeCartUpdateQty', 'actionBeforeCartUpdateQty', '', 1, 1), -(915, 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', '', 1, 1); +(915, 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', 'actionAjaxDieCartControllerDisplayAjaxUpdateBefore', '', 1, 1), +(916, 'actionFrontControllerAfterInit', 'actionFrontControllerAfterInit', '', 1, 1); DROP TABLE IF EXISTS `ps_hook_alias`; CREATE TABLE `ps_hook_alias` ( @@ -9906,7 +10149,12 @@ INSERT INTO `ps_log` (`id_log`, `severity`, `error_code`, `message`, `object_typ (597, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:37:59', '2023-05-15 10:37:59'), (598, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:38:26', '2023-05-15 10:38:26'), (599, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:39:34', '2023-05-15 10:39:34'), -(600, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:40:34', '2023-05-15 10:40:34'); +(600, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:40:34', '2023-05-15 10:40:34'), +(601, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:26', '2023-08-28 10:50:26'), +(602, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:41', '2023-08-28 10:50:41'), +(603, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:54', '2023-08-28 10:50:54'), +(604, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:56:38', '2023-08-28 10:56:38'), +(605, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:57:58', '2023-08-28 10:57:58'); DROP TABLE IF EXISTS `ps_mail`; CREATE TABLE `ps_mail` ( @@ -13348,12 +13596,6 @@ INSERT INTO `ps_order_state_lang` (`id_order_state`, `id_lang`, `name`, `templat (13, 1, 'Awaiting Cash On Delivery validation', 'cashondelivery'), (13, 2, 'Warten auf Zahlungseingang Nachnahme', 'cashondelivery'), (13, 3, 'Wachten op bevestiging (rembours)', 'cashondelivery'), -(14, 1, 'Partially refunded by Mollie', ''), -(14, 2, 'Partially refunded by Mollie', ''), -(14, 3, 'Partially refunded by Mollie', ''), -(15, 1, 'Awaiting Mollie payment', ''), -(15, 2, 'Awaiting Mollie payment', ''), -(15, 3, 'Awaiting Mollie payment', ''), (16, 1, 'Partially shipped', ''), (16, 2, 'Partially shipped', ''), (16, 3, 'Partially shipped', ''), @@ -13365,10 +13607,7 @@ INSERT INTO `ps_order_state_lang` (`id_order_state`, `id_lang`, `name`, `templat (18, 3, 'Klarna payment authorized', 'payment'), (19, 1, 'Klarna payment shipped', 'shipped'), (19, 2, 'Klarna payment shipped', 'shipped'), -(19, 3, 'Klarna payment shipped', 'shipped'), -(20, 1, 'Mollie Chargeback', ''), -(20, 2, 'Mollie Chargeback', ''), -(20, 3, 'Mollie Chargeback', ''); +(19, 3, 'Klarna payment shipped', 'shipped'); DROP TABLE IF EXISTS `ps_pack`; CREATE TABLE `ps_pack` ( @@ -13463,7 +13702,9 @@ INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `r (48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), (49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), (50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), -(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'); +(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'), +(52, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:34:01'), +(53, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:40:33'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -18624,7 +18865,7 @@ INSERT INTO `ps_tab` (`id_tab`, `id_parent`, `position`, `module`, `class_name`, (104, 102, 1, NULL, 'AdminBackup', '', 1, 1, '', 'DB Backup', 'Admin.Navigation.Menu'), (105, 92, 7, NULL, 'AdminLogs', '', 1, 1, '', 'Logs', 'Admin.Navigation.Menu'), (106, 92, 8, NULL, 'AdminWebservice', '', 1, 1, '', 'Webservice', 'Admin.Navigation.Menu'), -(107, 92, 9, NULL, 'AdminShopGroup', '', 1, 1, '', 'Multistore', 'Admin.Navigation.Menu'), +(107, 92, 9, NULL, 'AdminShopGroup', '', 0, 1, '', 'Multistore', 'Admin.Navigation.Menu'), (108, 92, 10, NULL, 'AdminShopUrl', '', 0, 1, '', 'Multistore', 'Admin.Navigation.Menu'), (109, 92, 11, NULL, 'AdminFeatureFlag', '', 1, 1, '', 'New & Experimental Features', 'Admin.Navigation.Menu'), (110, 92, 12, NULL, 'AdminParentSecurity', '', 1, 1, '', '', ''), @@ -20308,4 +20549,4 @@ INSERT INTO `ps_zone_shop` (`id_zone`, `id_shop`) VALUES (7, 2), (8, 2); --- 2023-05-15 08:43:12 +-- 2023-08-28 09:44:50 From ac1abc11ec8012064429307d38fa4253bafbc597 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 12:51:37 +0300 Subject: [PATCH 049/109] Update prestashop_8.sql --- tests/seed/database/prestashop_8.sql | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/seed/database/prestashop_8.sql diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql old mode 100644 new mode 100755 From 95e5782c57302296465df5ee4b750477c6ff9263 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 12:52:41 +0300 Subject: [PATCH 050/109] Update .htaccess8 --- .docker/.htaccess8 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index 8e216b1ad..b6776b88f 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -11,7 +11,6 @@ RewriteEngine on #Domain: demoshop8debug.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] @@ -36,12 +35,10 @@ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBAS RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] #Domain: demoshop8debug.ngrok.io -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] @@ -71,16 +68,13 @@ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBAS RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] RewriteCond %{REQUEST_FILENAME} -d -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^.*$ - [NC,L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^.*$ %{ENV:REWRITEBASE}index.php [NC,L] From 4667a3df1e47da9856013ac54002c163157d26b1 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 13:01:53 +0300 Subject: [PATCH 051/109] Update prestashop_8.sql --- tests/seed/database/prestashop_8.sql | 170 ++++++++++++++++++++++----- 1 file changed, 139 insertions(+), 31 deletions(-) mode change 100755 => 100644 tests/seed/database/prestashop_8.sql diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql old mode 100755 new mode 100644 index 9c2e024c9..a4b0e51a0 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -862,7 +862,10 @@ INSERT INTO `ps_address` (`id_address`, `id_country`, `id_state`, `id_customer`, (6, 8, 0, 0, 0, 2, 0, 'accessories_supplier', 'Accessories and Co', 'accessories', 'accessories', '42 Avenue Maréchal Soult', '', '64990', 'Bayonne', '', '0102030405', '', '', '', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), (7, 1, 0, 3, 0, 0, 0, 'DE', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '+49 30 140228614', '', '23423523', '', '2023-05-08 17:21:15', '2023-05-15 10:42:01', 1, 1), (8, 13, 0, 3, 0, 0, 0, 'NL', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'ADDRESS 123-123 2', '4331 NS', 'Rotterdam', '', '06-26128932', '', '23423523', '', '2023-05-15 10:41:20', '2023-05-15 10:41:20', 1, 0), -(9, 1, 0, 3, 0, 0, 0, 'DE', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '04193 12 17 38', '', '23423523', '', '2023-05-15 10:42:01', '2023-05-15 10:42:01', 1, 0); +(9, 1, 0, 3, 0, 0, 0, 'DE', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '04193 12 17 38', '', '23423523', '', '2023-05-15 10:42:01', '2023-05-15 10:42:01', 1, 0), +(10, 1, 0, 4, 0, 0, 0, 'DE', 'TEST COMP', 'TESSST', 'TEST TEST', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '+49-42198759147', '', '23423523', '', '2023-08-28 11:55:41', '2023-08-28 11:58:45', 1, 1), +(11, 13, 0, 4, 0, 0, 0, 'NL', 'TEST COMP', 'TESSST', 'TEST TEST', 'Nobelstraat 26-A', 'TEST123-312', '3512 EP', 'Utrecht', '', '030 240 0192', '', '23423523', '', '2023-08-28 11:57:13', '2023-08-28 11:57:13', 1, 0), +(12, 1, 0, 4, 0, 0, 0, 'DE', 'TEST COMP', 'TESSST', 'TEST TEST', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '+49 30 084669845 ', '', '23423523', '', '2023-08-28 11:58:45', '2023-08-28 11:58:45', 1, 0); DROP TABLE IF EXISTS `ps_address_format`; CREATE TABLE `ps_address_format` ( @@ -1132,7 +1135,8 @@ CREATE TABLE `ps_admin_filter` ( INSERT INTO `ps_admin_filter` (`id`, `employee`, `shop`, `controller`, `action`, `filter`, `filter_id`) VALUES (1, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"date_add\",\"sortOrder\":\"DESC\",\"filters\":[]}', 'customer'), (3, 1, 2, '', '', '{\"limit\":50,\"orderBy\":\"id_order\",\"sortOrder\":\"DESC\",\"filters\":[]}', 'order'), -(4, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"id_lang\",\"sortOrder\":\"ASC\",\"filters\":[]}', 'language'); +(4, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"id_lang\",\"sortOrder\":\"ASC\",\"filters\":[]}', 'language'), +(5, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"id_meta\",\"sortOrder\":\"asc\",\"filters\":[]}', 'meta'); DROP TABLE IF EXISTS `ps_alias`; CREATE TABLE `ps_alias` ( @@ -2453,7 +2457,8 @@ INSERT INTO `ps_cart` (`id_cart`, `id_shop_group`, `id_shop`, `id_carrier`, `del (24, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:27:43', '2023-05-15 10:27:50', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), (25, 1, 2, 1, '{\"7\":\"1,\"}', 1, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:28:46', '2023-05-15 10:28:53', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"d20451c8b294bfeff2e7bb60202a498aa8a9f054\"}'), (26, 1, 2, 1, '{\"7\":\"1,\"}', 1, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:29:21', '2023-05-15 10:29:28', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"d20451c8b294bfeff2e7bb60202a498aa8a9f054\"}'), -(27, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:30:11', '2023-05-15 10:30:12', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":false,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checkout-payment-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'); +(27, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:30:11', '2023-05-15 10:30:12', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":false,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checkout-payment-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), +(28, 1, 1, 1, '{\"10\":\"1,\"}', 1, 10, 10, 1, 4, 916, '3374052bdf067ccff64d284a39dec0fd', 0, 0, '', 0, 0, '2023-08-28 11:54:59', '2023-08-28 11:55:46', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"3fe58cfa47c03f827f3d6c0ffa3bf5f1b86c8abb\"}'); DROP TABLE IF EXISTS `ps_cart_cart_rule`; CREATE TABLE `ps_cart_cart_rule` ( @@ -2508,7 +2513,8 @@ INSERT INTO `ps_cart_product` (`id_cart`, `id_product`, `id_address_delivery`, ` (24, 2, 7, 2, 9, 0, 4, '2023-05-15 10:27:43'), (25, 2, 7, 2, 9, 0, 4, '2023-05-15 10:28:46'), (26, 2, 7, 2, 9, 0, 4, '2023-05-15 10:29:22'), -(27, 2, 7, 2, 9, 0, 4, '2023-05-15 10:30:11'); +(27, 2, 7, 2, 9, 0, 4, '2023-05-15 10:30:11'), +(28, 3, 10, 1, 13, 0, 3, '2023-08-28 11:54:59'); DROP TABLE IF EXISTS `ps_cart_rule`; CREATE TABLE `ps_cart_rule` ( @@ -3048,7 +3054,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (5, NULL, NULL, 'PS_GROUP_FEATURE_ACTIVE', '1', '2023-05-02 12:16:56', '2023-05-02 12:16:56'), (6, NULL, NULL, 'PS_CURRENCY_DEFAULT', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (7, NULL, NULL, 'PS_COUNTRY_DEFAULT', '17', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-08-28 11:52:30'), (9, NULL, NULL, 'PS_ORDER_OUT_OF_STOCK', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (10, NULL, NULL, 'PS_LAST_QTIES', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (11, NULL, NULL, 'PS_CONDITIONS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3471,8 +3477,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (460, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '30', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), (484, NULL, NULL, 'PS_ALLOW_HTML_IFRAME', NULL, '2023-05-08 16:59:10', '2023-08-28 11:40:31'), (485, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', NULL, '2023-05-08 16:59:10', '2023-08-28 11:40:31'), -(486, NULL, NULL, 'PS_CCCJS_VERSION', '1', '2023-05-08 17:09:12', '2023-05-08 17:09:12'), -(487, NULL, NULL, 'PS_CCCCSS_VERSION', '1', '2023-05-08 17:09:12', '2023-05-08 17:09:12'), +(486, NULL, NULL, 'PS_CCCJS_VERSION', '2', '2023-05-08 17:09:12', '2023-08-28 11:52:30'), +(487, NULL, NULL, 'PS_CCCCSS_VERSION', '2', '2023-05-08 17:09:12', '2023-08-28 11:52:30'), (492, 1, 1, 'MOLLIE_ENVIRONMENT', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), (493, 1, 2, 'MOLLIE_ENVIRONMENT', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), (516, 1, 1, 'MOLLIE_STATUS_OPEN', '15', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), @@ -3504,7 +3510,10 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (608, 1, 2, 'MOLLIE_MAIL_WHEN_AWAITING', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), (610, 1, 2, 'MOLLIE_STATUS_PARTIAL_REFUND', '14', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), (611, 1, 2, 'MOLLIE_MAIL_WHEN_PARTIAL_REFUND', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(612, 1, 2, 'MOLLIE_STATUS_CHARGEBACK', '20', '2023-05-15 09:54:40', '2023-05-15 09:54:40'); +(612, 1, 2, 'MOLLIE_STATUS_CHARGEBACK', '20', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), +(659, NULL, NULL, 'PS_ALLOW_ACCENTED_CHARS_URL', NULL, '2023-08-28 11:52:30', '2023-08-28 11:52:30'), +(660, NULL, NULL, 'PS_HTACCESS_DISABLE_MULTIVIEWS', NULL, '2023-08-28 11:52:30', '2023-08-28 11:52:30'), +(661, NULL, NULL, 'PS_HTACCESS_DISABLE_MODSEC', NULL, '2023-08-28 11:52:30', '2023-08-28 11:52:30'); DROP TABLE IF EXISTS `ps_configuration_kpi`; CREATE TABLE `ps_configuration_kpi` ( @@ -3728,7 +3737,10 @@ INSERT INTO `ps_connections` (`id_connections`, `id_shop_group`, `id_shop`, `id_ (43, 1, 1, 837, 3, 1490595887, '2023-05-15 10:29:56', ''), (44, 1, 2, 124, 1, 1490595887, '2023-05-15 10:31:31', ''), (45, 1, 1, 913, 2, 1404794126, '2023-08-28 10:56:51', ''), -(46, 1, 1, 916, 1, 1404794126, '2023-08-28 10:57:11', ''); +(46, 1, 1, 916, 1, 1404794126, '2023-08-28 10:57:11', ''), +(47, 1, 1, 1165, 2, 1404794126, '2023-08-28 11:49:44', ''), +(48, 1, 1, 1169, 2, 1404794126, '2023-08-28 11:50:24', ''), +(49, 1, 1, 1173, 2, 1404794126, '2023-08-28 11:50:58', ''); DROP TABLE IF EXISTS `ps_connections_page`; CREATE TABLE `ps_connections_page` ( @@ -5429,7 +5441,8 @@ CREATE TABLE `ps_customer` ( INSERT INTO `ps_customer` (`id_customer`, `id_shop_group`, `id_shop`, `id_gender`, `id_default_group`, `id_lang`, `id_risk`, `company`, `siret`, `ape`, `firstname`, `lastname`, `email`, `passwd`, `last_passwd_gen`, `birthday`, `newsletter`, `ip_registration_newsletter`, `newsletter_date_add`, `optin`, `website`, `outstanding_allow_amount`, `show_public_prices`, `max_payment_days`, `secure_key`, `note`, `active`, `is_guest`, `deleted`, `date_add`, `date_upd`, `reset_password_token`, `reset_password_validity`) VALUES (1, 1, 1, 1, 3, 1, 0, '', '', '', 'Anonymous', 'Anonymous', 'anonymous@psgdpr.com', '$2y$10$T4rXnzJ6WlMwZ3foAIYfqOrivupBqnh0sZ6KGHHEVocwtY6NFsxF.', '2023-05-02 06:17:00', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, '902ad78a4595938c30f9f27665f54a28', '', 0, 0, 0, '2023-05-02 12:17:00', '2023-05-02 12:17:00', '', '0000-00-00 00:00:00'), (2, 1, 1, 1, 3, 1, 0, '', '', '', 'John', 'DOE', 'pub@prestashop.com', '$2y$10$f2BEuL7S22hIQbCKKIntGuaSpPLi4A.2Zy5qfeb3DsPqI9pGVARJa', '2023-05-02 06:18:38', '1970-01-15', 1, '', '2013-12-13 08:19:15', 1, '', 0.000000, 0, 0, 'dde10d65a88301c97a07d0778504c572', '', 1, 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', '', '0000-00-00 00:00:00'), -(3, 1, 2, 1, 3, 1, 0, NULL, NULL, NULL, 'INVERTUS', 'RRRRRRR', 'demo@demo.com', '$2y$10$ql1JyAHrvAXIlu9d8y3Jou9kmjB.syg7F.Jqs/DcSFekW7rXtsqDW', '2023-05-08 11:09:50', '0000-00-00', 1, NULL, '2023-05-08 17:09:50', 1, NULL, 0.000000, 0, 0, '0c46e3398a8f3f024dc6569fc56ed4eb', NULL, 1, 0, 0, '2023-05-08 17:09:50', '2023-05-15 10:31:36', NULL, '0000-00-00 00:00:00'); +(3, 1, 2, 1, 3, 1, 0, NULL, NULL, NULL, 'INVERTUS', 'RRRRRRR', 'demo@demo.com', '$2y$10$ql1JyAHrvAXIlu9d8y3Jou9kmjB.syg7F.Jqs/DcSFekW7rXtsqDW', '2023-05-08 11:09:50', '0000-00-00', 1, NULL, '2023-05-08 17:09:50', 1, NULL, 0.000000, 0, 0, '0c46e3398a8f3f024dc6569fc56ed4eb', NULL, 1, 0, 0, '2023-05-08 17:09:50', '2023-05-15 10:31:36', NULL, '0000-00-00 00:00:00'), +(4, 1, 1, 1, 3, 1, 0, '', '', '', 'TEST TEST', 'TESSST', 'demo@demo.com', '$2y$10$9e3ChqC7envKbcw0JGVCyuq9/emLY96Rl3QNfeCVf1P9WZFBFjva.', '2023-08-28 05:54:29', '0000-00-00', 1, '', '2023-08-28 11:54:29', 1, '', 0.000000, 0, 0, '3374052bdf067ccff64d284a39dec0fd', '', 1, 0, 0, '2023-08-28 11:54:29', '2023-08-28 11:54:29', '', '0000-00-00 00:00:00'); DROP TABLE IF EXISTS `ps_customer_group`; CREATE TABLE `ps_customer_group` ( @@ -5443,7 +5456,8 @@ CREATE TABLE `ps_customer_group` ( INSERT INTO `ps_customer_group` (`id_customer`, `id_group`) VALUES (1, 3), (2, 3), -(3, 3); +(3, 3), +(4, 3); DROP TABLE IF EXISTS `ps_customer_message`; CREATE TABLE `ps_customer_message` ( @@ -5488,7 +5502,8 @@ INSERT INTO `ps_customer_session` (`id_customer_session`, `id_customer`, `token` (4, 3, '0775365b2d960dc57ba7e74f530c9d38f26a0df5', '2023-05-15 10:10:56', '2023-05-15 10:12:27'), (5, 3, 'a2c2e75644d05ba9e2bcac8dd95e7ab6a7977127', '2023-05-15 10:22:06', '2023-05-15 10:22:08'), (6, 3, 'b22097c67b73534db5f63a9f156872b445788417', '2023-05-15 10:23:47', '2023-05-15 10:30:12'), -(7, 3, '2d3eacd9e2a09019f50cd97066a962c8869f211f', '2023-05-15 10:31:36', '2023-05-15 10:42:02'); +(7, 3, '2d3eacd9e2a09019f50cd97066a962c8869f211f', '2023-05-15 10:31:36', '2023-05-15 10:42:02'), +(8, 4, 'a310c60579b905c14559fe6e2a63abb94aee0b62', '2023-08-28 11:54:29', '2023-08-28 11:58:58'); DROP TABLE IF EXISTS `ps_customer_thread`; CREATE TABLE `ps_customer_thread` ( @@ -5701,7 +5716,10 @@ INSERT INTO `ps_employee_session` (`id_employee_session`, `id_employee`, `token` (6, 1, '90f28ac72faade5f2e803e9ef2560cd6df8b952d', '2023-05-15 10:21:50', '2023-05-15 10:23:21'), (7, 1, '46c91e6e4113ab4a2048ee3ac31d2d505ae01269', '2023-05-15 10:23:38', '2023-05-15 10:30:06'), (8, 1, '8a368b7b836014e2491dc0f454e476496beecb1f', '2023-08-28 10:56:38', '2023-08-28 10:56:48'), -(9, 1, 'f1f085b5f15db8783771114436f6c2a64c00f21c', '2023-08-28 10:57:58', '2023-08-28 11:44:35'); +(9, 1, 'f1f085b5f15db8783771114436f6c2a64c00f21c', '2023-08-28 10:57:58', '2023-08-28 11:52:35'), +(10, 1, '66cbeffc6425f31c80496679d672a0e87c6987c2', '2023-08-28 11:49:41', '2023-08-28 11:49:42'), +(11, 1, 'e36aa25c95cf531e1c07db56f4e3c4c02d9dbde0', '2023-08-28 11:50:13', '2023-08-28 11:50:21'), +(12, 1, 'b3f27265c70b3e66b606a26571b4b78ace3a7544', '2023-08-28 11:50:48', '2023-08-28 11:50:55'); DROP TABLE IF EXISTS `ps_employee_shop`; CREATE TABLE `ps_employee_shop` ( @@ -5913,7 +5931,8 @@ INSERT INTO `ps_ganalytics` (`id_google_analytics`, `id_order`, `id_customer`, ` (7, 12, 0, 2, 0, NULL, '2023-05-15 08:26:36'), (8, 13, 0, 2, 0, NULL, '2023-05-15 08:27:21'), (9, 14, 0, 2, 0, NULL, '2023-05-15 08:28:10'), -(10, 15, 0, 2, 0, NULL, '2023-05-15 08:29:18'); +(10, 15, 0, 2, 0, NULL, '2023-05-15 08:29:18'), +(11, 16, 0, 1, 0, NULL, '2023-08-28 09:55:58'); DROP TABLE IF EXISTS `ps_ganalytics_data`; CREATE TABLE `ps_ganalytics_data` ( @@ -5945,7 +5964,8 @@ INSERT INTO `ps_ganalytics_data` (`id_cart`, `id_shop`, `data`) VALUES (24, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), (25, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), (26, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(27, 2, '[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]'); +(27, 2, '[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]'), +(28, 1, '[[[[[[[\"MBG.addCheckoutOption(2,\'\');\"]]]]]]]'); DROP TABLE IF EXISTS `ps_gender`; CREATE TABLE `ps_gender` ( @@ -6978,7 +6998,7 @@ INSERT INTO `ps_guest` (`id_guest`, `id_operating_system`, `id_web_browser`, `id (913, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (914, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (915, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(916, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), +(916, 7, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), (917, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (918, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (919, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), @@ -7220,7 +7240,73 @@ INSERT INTO `ps_guest` (`id_guest`, `id_operating_system`, `id_web_browser`, `id (1155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (1156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (1157, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); +(1158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1165, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1168, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1169, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1173, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1187, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1196, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1204, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1205, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1207, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1211, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1215, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), +(1224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); DROP TABLE IF EXISTS `ps_homeslider`; CREATE TABLE `ps_homeslider` ( @@ -10154,7 +10240,20 @@ INSERT INTO `ps_log` (`id_log`, `severity`, `error_code`, `message`, `object_typ (602, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:41', '2023-08-28 10:50:41'), (603, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:54', '2023-08-28 10:50:54'), (604, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:56:38', '2023-08-28 10:56:38'), -(605, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:57:58', '2023-08-28 10:57:58'); +(605, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:57:58', '2023-08-28 10:57:58'), +(606, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:47:47', '2023-08-28 11:47:47'), +(607, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:48:04', '2023-08-28 11:48:04'), +(608, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:48:18', '2023-08-28 11:48:18'), +(609, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 11:49:41', '2023-08-28 11:49:41'), +(610, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 11:50:13', '2023-08-28 11:50:13'), +(611, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 11:50:48', '2023-08-28 11:50:48'), +(612, 1, 0, 'Error - The following e-mail template is missing: en/account.txt', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:54:29', '2023-08-28 11:54:29'), +(613, 1, 0, 'Error - The following e-mail template is missing: account', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:54:29', '2023-08-28 11:54:29'), +(614, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), +(615, 1, 0, 'Error - The following e-mail template is missing: en/bankwire.txt', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), +(616, 1, 0, 'Error - The following e-mail template is missing: bankwire', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), +(617, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), +(618, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'); DROP TABLE IF EXISTS `ps_mail`; CREATE TABLE `ps_mail` ( @@ -13065,7 +13164,8 @@ INSERT INTO `ps_orders` (`id_order`, `reference`, `id_shop_group`, `id_shop`, `i (12, 'PWWTOWTOX', 1, 2, 1, 2, 3, 22, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Slice it.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 6, 0, '2023-05-15 10:26:29', '0000-00-00 00:00:00', 0, '2023-05-15 10:26:29', '2023-05-15 10:37:59', ''), (13, 'HBRIAYHBX', 1, 2, 1, 2, 3, 23, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Pay later.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 7, 0, '2023-05-15 10:27:15', '0000-00-00 00:00:00', 0, '2023-05-15 10:27:14', '2023-05-15 10:38:26', ''), (14, 'PKSGRJXBT', 1, 2, 1, 2, 3, 24, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Pay now.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 8, 0, '2023-05-15 10:28:04', '0000-00-00 00:00:00', 0, '2023-05-15 10:28:04', '2023-05-15 10:39:34', ''), -(15, 'HGVLPLRYN', 1, 2, 1, 1, 3, 25, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Credit/Debit Card', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 9, 0, '2023-05-15 10:29:11', '0000-00-00 00:00:00', 0, '2023-05-15 10:29:11', '2023-05-15 10:40:35', ''); +(15, 'HGVLPLRYN', 1, 2, 1, 1, 3, 25, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Credit/Debit Card', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 9, 0, '2023-05-15 10:29:11', '0000-00-00 00:00:00', 0, '2023-05-15 10:29:11', '2023-05-15 10:40:35', ''), +(16, 'QRVXSLSLY', 1, 1, 1, 1, 4, 28, 1, 10, 10, 10, '3374052bdf067ccff64d284a39dec0fd', 'Wire payment', 1.000000, 'ps_wirepayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 103.530000, 103.530000, 87.000000, 0.000000, 87.000000, 103.530000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57', ''); DROP TABLE IF EXISTS `ps_order_carrier`; CREATE TABLE `ps_order_carrier` ( @@ -13099,7 +13199,8 @@ INSERT INTO `ps_order_carrier` (`id_order_carrier`, `id_order`, `id_carrier`, `i (12, 12, 1, 6, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:26:29'), (13, 13, 1, 7, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:27:14'), (14, 14, 1, 8, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:28:04'), -(15, 15, 1, 9, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:29:11'); +(15, 15, 1, 9, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:29:11'), +(16, 16, 1, 0, 0.900000, 0.000000, 0.000000, '', '2023-08-28 11:55:57'); DROP TABLE IF EXISTS `ps_order_cart_rule`; CREATE TABLE `ps_order_cart_rule` ( @@ -13194,7 +13295,8 @@ INSERT INTO `ps_order_detail` (`id_order_detail`, `id_order`, `id_order_invoice` (14, 12, 6, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), (15, 13, 7, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), (16, 14, 8, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(17, 15, 9, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Size: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000); +(17, 15, 9, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Size: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), +(18, 16, 0, 0, 1, 3, 13, 0, 'The best is yet to come\' Framed poster (Dimension: 40x60cm)', 3, 3, 0, 0, 0, 29.000000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_6', 'demo_6_70', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 103.530000, 87.000000, 34.510000, 29.000000, 0.000000, 0.000000, 5.490000, 29.000000, 5.490000, 0.000000, 0.000000); DROP TABLE IF EXISTS `ps_order_detail_tax`; CREATE TABLE `ps_order_detail_tax` ( @@ -13216,7 +13318,8 @@ INSERT INTO `ps_order_detail_tax` (`id_order_detail`, `id_tax`, `unit_amount`, ` (14, 1, 5.456800, 21.830000), (15, 1, 5.456800, 21.830000), (16, 1, 5.456800, 21.830000), -(17, 1, 5.456800, 21.830000); +(17, 1, 5.456800, 21.830000), +(18, 1, 5.510000, 16.530000); DROP TABLE IF EXISTS `ps_order_history`; CREATE TABLE `ps_order_history` ( @@ -13271,7 +13374,8 @@ INSERT INTO `ps_order_history` (`id_order_history`, `id_employee`, `id_order`, ` (37, 0, 12, 14, '2023-05-15 10:37:59'), (38, 0, 13, 14, '2023-05-15 10:38:26'), (39, 0, 14, 14, '2023-05-15 10:39:34'), -(40, 0, 15, 14, '2023-05-15 10:40:35'); +(40, 0, 15, 14, '2023-05-15 10:40:35'), +(41, 0, 16, 10, '2023-08-28 11:55:57'); DROP TABLE IF EXISTS `ps_order_invoice`; CREATE TABLE `ps_order_invoice` ( @@ -13704,7 +13808,9 @@ INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `r (50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), (51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'), (52, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:34:01'), -(53, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:40:33'); +(53, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:40:33'), +(54, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/seo-urls/?_token=MQa6djbISf87mQfrA5liTH0pHguHQoUlCnNByQsBVrE', '2023-08-28 09:51:39'), +(55, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/seo-urls/?_token=MQa6djbISf87mQfrA5liTH0pHguHQoUlCnNByQsBVrE', '2023-08-28 09:52:36'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -14640,7 +14746,8 @@ CREATE TABLE `ps_psgdpr_log` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_psgdpr_log` (`id_gdpr_log`, `id_customer`, `id_guest`, `client_name`, `id_module`, `request_type`, `date_add`, `date_upd`) VALUES -(1, 3, 0, 'INVERTUS RRRRRRR', 0, 1, '2023-05-08 17:09:50', '2023-05-08 17:09:50'); +(1, 3, 0, 'INVERTUS RRRRRRR', 0, 1, '2023-05-08 17:09:50', '2023-05-08 17:09:50'), +(2, 4, 0, 'TEST TEST TESSST', 0, 1, '2023-08-28 11:54:29', '2023-08-28 11:54:29'); DROP TABLE IF EXISTS `ps_psreassurance`; CREATE TABLE `ps_psreassurance` ( @@ -18271,7 +18378,7 @@ CREATE TABLE `ps_stock_available` ( INSERT INTO `ps_stock_available` (`id_stock_available`, `id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`, `quantity`, `physical_quantity`, `reserved_quantity`, `depends_on_stock`, `out_of_stock`, `location`) VALUES (1, 1, 0, 1, 0, 2400, 0, 0, 0, 2, ''), (2, 2, 0, 1, 0, 2100, 0, 0, 0, 2, ''), -(3, 3, 0, 1, 0, 1500, 0, 0, 0, 2, ''), +(3, 3, 0, 1, 0, 1497, 1497, 0, 0, 2, ''), (4, 4, 0, 1, 0, 1500, 0, 0, 0, 2, ''), (5, 5, 0, 1, 0, 900, 0, 0, 0, 2, ''), (6, 6, 0, 1, 0, 300, 0, 0, 0, 2, ''), @@ -18300,9 +18407,9 @@ INSERT INTO `ps_stock_available` (`id_stock_available`, `id_product`, `id_produc (29, 2, 10, 1, 0, 300, 0, 0, 0, 2, ''), (30, 2, 11, 1, 0, 300, 0, 0, 0, 2, ''), (31, 2, 12, 1, 0, 300, 0, 0, 0, 2, ''), -(32, 3, 13, 1, 0, 900, 0, 0, 0, 2, ''), -(33, 3, 14, 1, 0, 300, 0, 0, 0, 2, ''), -(34, 3, 15, 1, 0, 300, 0, 0, 0, 2, ''), +(32, 3, 13, 1, 0, 897, 900, 3, 0, 2, ''), +(33, 3, 14, 1, 0, 300, 300, 0, 0, 2, ''), +(34, 3, 15, 1, 0, 300, 300, 0, 0, 2, ''), (35, 4, 16, 1, 0, 900, 0, 0, 0, 2, ''), (36, 4, 17, 1, 0, 300, 0, 0, 0, 2, ''), (37, 4, 18, 1, 0, 300, 0, 0, 0, 2, ''), @@ -20482,7 +20589,8 @@ CREATE TABLE `ps_wishlist` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_wishlist` (`id_wishlist`, `id_customer`, `id_shop`, `id_shop_group`, `token`, `name`, `counter`, `date_add`, `date_upd`, `default`) VALUES -(1, 3, 2, 1, '2694983583C98885', 'My wishlist', NULL, '2023-05-08 17:09:52', '2023-05-08 17:09:52', 1); +(1, 3, 2, 1, '2694983583C98885', 'My wishlist', NULL, '2023-05-08 17:09:52', '2023-05-08 17:09:52', 1), +(2, 4, 1, 1, 'B06388034434E779', 'My wishlist', NULL, '2023-08-28 11:54:31', '2023-08-28 11:54:31', 1); DROP TABLE IF EXISTS `ps_wishlist_product`; CREATE TABLE `ps_wishlist_product` ( @@ -20549,4 +20657,4 @@ INSERT INTO `ps_zone_shop` (`id_zone`, `id_shop`) VALUES (7, 2), (8, 2); --- 2023-08-28 09:44:50 +-- 2023-08-28 10:01:11 From 3763091f8d74d32c4ad98f49d531bc5ec00fcb07 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 13:19:26 +0300 Subject: [PATCH 052/109] Update 02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js --- .../e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js index 9036c5e6b..8faf17a02 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js @@ -30,7 +30,7 @@ describe('PS8 Enabling Payments', () => { it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() - cy.ConfOrdersAPI1784() + cy.ConfOrdersAPI8() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) From ce4c534958e36f866e0b52aa156b4d5ff049faa7 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 13:43:27 +0300 Subject: [PATCH 053/109] spec updates --- ...01_mollie.ps8.ModuleConfiguration.specs.js | 17 +++- ...lie.ps8.EnablingPaymentsOrdersAPI.specs.js | 9 +- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 86 +++++++------------ .../ps8/04_mollie.ps8.Subscriptions.WIP.js | 30 +++---- 4 files changed, 67 insertions(+), 75 deletions(-) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index d9c50b141..ecedea9b3 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -1,4 +1,19 @@ /// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { @@ -15,7 +30,7 @@ afterEach(function() { describe('PS8 Module initial configuration setup', () => { beforeEach(() => { cy.viewport(1920,1080) - cy.CachingBOFOPS8() + login('MollieBOFOLoggingIn') }) it('C339305: Connecting test API successsfully', () => { cy.visit('/admin1/') diff --git a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js index 8faf17a02..55f132902 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js @@ -4,9 +4,14 @@ const login = (MollieBOFOLoggingIn) => { cy.session(MollieBOFOLoggingIn,() => { cy.visit('/admin1/') cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() }) } //Checking the console for errors @@ -30,7 +35,7 @@ describe('PS8 Enabling Payments', () => { it('C339341: 04 Enabling All payments in Module BO [Orders API]', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() - cy.ConfOrdersAPI8() + cy.ConfOrdersAPI1784() cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') }) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index 01e4688d4..66c527ba7 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -36,12 +36,12 @@ const login = (MollieBOFOLoggingIn) => { cy.session(MollieBOFOLoggingIn,() => { cy.visit('/admin1/') cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) - cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') cy.visit('/en/my-account') cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') cy.get('#login-form [type="submit"]').eq(0).click({force:true}) cy.get('#history-link > .link-item').click() }) @@ -56,14 +56,13 @@ afterEach(() => { }) describe('PS8 Tests Suite', () => { beforeEach(() => { - login('MollieBOFOLoggingIn') cy.viewport(1920,1080) + login('MollieBOFOLoggingIn') }) it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -97,9 +96,8 @@ it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Ord }) it('C339344: 07 Bancontact Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -128,7 +126,6 @@ it('C339345: 08 Bancontact Order BO Shipping, Refunding [Orders API]', () => { }) it('C339346: 09 iDEAL Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -159,7 +156,6 @@ it('C339347: 10 iDEAL Order BO Shipping, Refunding [Orders API]', () => { }) it('C339348: 11 Klarna Slice It Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.contains('DE').click() @@ -190,7 +186,7 @@ it('C339349: 12 Klarna Slice It Order BO Shipping, Refunding [Orders API]', () = }) it('C339350: 13 Klarna Pay Later Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() + // cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -222,7 +218,6 @@ it('C339351: 14 Klarna Pay Later Order BO Shipping, Refunding [Orders API]', () }) it('C339352: 15 Klarna Pay Now Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() //Billing country LT, DE etc. @@ -260,7 +255,7 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') cy.visit('/en/index.php?controller=history') - cy.get('a').click() + cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -289,7 +284,6 @@ it('C339354: 17 Credit Card Checkouting [Orders API]', () => { }) it('C339355: 18 Check if customerId is passed during the 2nd payment using Single Click Payment [Orders API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -322,7 +316,6 @@ it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { }) it('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -376,7 +369,6 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.get('[type="submit"]').first().click({force:true}) cy.get('[class="alert alert-success"]').should('be.visible') cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -394,7 +386,6 @@ it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { }) it('C339361: 24 Paypal Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -425,7 +416,6 @@ it('C339362: 25 Paypal Order Shipping, Refunding [Orders API]', () => { }) it('C339363: 26 SOFORT Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -454,21 +444,20 @@ it('C339363: 26 SOFORT Checkouting [Orders API]', () => { it('C339364: 27 SOFORT Order Shipping, Refunding [Orders API]', () => { cy.visit('/admin1/index.php?controller=AdminOrders') cy.get(':nth-child(1) > .column-payment').click() - //Shipping button in React - cy.get('.btn-group > .btn-primary').click() - cy.get('[class="swal-button swal-button--confirm"]').click() - cy.get('.swal-modal').should('exist') - cy.get('#input-carrier').clear({force: true}).type('FedEx',{delay:0}) - cy.get('#input-code').clear({force: true}).type('123456',{delay:0}) - cy.get('#input-url').clear({force: true}).type('https://www.invertus.eu',{delay:0}) - cy.get(':nth-child(2) > .swal-button').click() - cy.get('#mollie_order > :nth-child(1) > .alert').contains('Shipment was made successfully!') - cy.get('[class="alert alert-success"]').should('be.visible') - //Refunding not possible because "We haven't received the payment on our bank accounts yet" message from Mollie Dashboard + //Shipping button in React + cy.get('.btn-group > .btn-primary').click() + cy.get('[class="swal-button swal-button--confirm"]').click() + cy.get('.swal-modal').should('exist') + cy.get('#input-carrier').clear({force: true}).type('FedEx',{delay:0}) + cy.get('#input-code').clear({force: true}).type('123456',{delay:0}) + cy.get('#input-url').clear({force: true}).type('https://www.invertus.eu',{delay:0}) + cy.get(':nth-child(2) > .swal-button').click() + cy.get('#mollie_order > :nth-child(1) > .alert').contains('Shipment was made successfully!') + cy.get('[class="alert alert-success"]').should('be.visible') + //Refunding not possible because "We haven't received the payment on our bank accounts yet" message from Mollie Dashboard }) it('C339365: 28 Przelewy24 Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -499,7 +488,6 @@ it('C339366: 29 Przelewy24 Order Shipping, Refunding [Orders API]', () => { }) it('C339367: 30 Giropay Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -530,7 +518,6 @@ it('C339368: 31 Giropay Order Shipping, Refunding [Orders API]', () => { }) it('C339369: 32 EPS Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -561,7 +548,6 @@ it('C339370: 33 EPS Order Shipping, Refunding [Orders API]', () => { }) it('C339371: 34 KBC/CBC Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -593,7 +579,6 @@ it('C339372: 35 KBC/CBC Order Shipping, Refunding [Orders API]', () => { }) it('C339373: 36 Belfius Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -624,7 +609,6 @@ it('C339374: 37 Belfius Order Shipping, Refunding [Orders API]', () => { }) it('C339375: 38 Bank Transfer Checkouting [Orders API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -657,7 +641,6 @@ it('C339376: 39 Bank Transfer Order Shipping, Refunding [Orders API]', () => { // Temporary disabled, Payment Method disables automatically in My Mollie Dashboard, because of the fake testing account... it.skip('40 Gift Card Checkouting [Orders API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() cy.contains('NL').click() //Billing country LT, DE etc. @@ -704,10 +687,9 @@ it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', }) it('C339379: 44 Bancontact Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -736,7 +718,6 @@ it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]' }) it('C339381: 46 iDEAL Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -767,7 +748,6 @@ it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () }) it('C339383: 48 Credit Card Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() cy.contains('Reorder').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() @@ -886,10 +866,9 @@ it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments }) it('C339387: 52 Paypal Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -925,10 +904,9 @@ it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339389: 54 SOFORT Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -960,10 +938,9 @@ it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -994,10 +971,9 @@ it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () = }); it('C339393: 58 Giropay Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1026,10 +1002,9 @@ it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339395: 60 EPS Checkouting [Payments API]', () => { cy.visit('/de/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1058,10 +1033,9 @@ it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1091,10 +1065,9 @@ it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339399: 64 Belfius Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1123,10 +1096,9 @@ it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { }); it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.visit('/en/index.php?controller=history') - cy.get('a').click() // cy.contains('Reorder').click() - cy.contains('LT').click() + cy.contains('DE').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() @@ -1152,5 +1124,5 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { }); it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why cy.OrderRefundingPartialPaymentsAPI() -}); +}) }) diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js index b2313b83c..86861f788 100755 --- a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js +++ b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js @@ -1,19 +1,19 @@ /// - //Caching the BO and FO session - const login = (MollieBOFOLoggingIn) => { - cy.session(MollieBOFOLoggingIn,() => { - cy.visit('/admin1/') - cy.url().should('contain', 'https').as('Check if HTTPS exists') - cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) - cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) - cy.get('#submit_login').click().wait(1000).as('Connection successsful') - cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') - cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') - cy.get('#login-form [type="submit"]').eq(0).click({force:true}) - cy.get('#history-link > .link-item').click() - }) - } +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } //Checking the console for errors let windowConsoleError; Cypress.on('window:before:load', (win) => { From bfe5951db0c601b37fed487b63cecb72c9f94d6e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 15:08:14 +0300 Subject: [PATCH 054/109] ps8 test spec updates --- docker-compose.8.yml | 1 + tests/seed/database/prestashop_8.sql | 13990 ++++++++----------------- 2 files changed, 4181 insertions(+), 9810 deletions(-) mode change 100644 => 100755 tests/seed/database/prestashop_8.sql diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 8a482483a..72da1c1b6 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -32,6 +32,7 @@ services: dockerfile: .docker/Dockerfile.8 environment: PS_INSTALL_AUTO: 0 + PS_ENABLE_SSL: 1 DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql old mode 100644 new mode 100755 index a4b0e51a0..93eb8894c --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -5,12 +5,14 @@ SET time_zone = '+00:00'; SET foreign_key_checks = 0; SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'; +SET NAMES utf8mb4; + DROP TABLE IF EXISTS `ps_access`; CREATE TABLE `ps_access` ( `id_profile` int(10) unsigned NOT NULL, `id_authorization_role` int(10) unsigned NOT NULL, PRIMARY KEY (`id_profile`,`id_authorization_role`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 1), @@ -493,22 +495,26 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 498), (1, 499), (1, 500), -(1, 641), -(1, 642), -(1, 643), -(1, 644), -(1, 745), -(1, 746), -(1, 747), -(1, 748), -(1, 749), -(1, 750), -(1, 751), -(1, 752), -(1, 753), -(1, 754), -(1, 755), -(1, 756), +(1, 689), +(1, 690), +(1, 691), +(1, 692), +(1, 693), +(1, 694), +(1, 695), +(1, 696), +(1, 697), +(1, 698), +(1, 699), +(1, 700), +(1, 741), +(1, 742), +(1, 743), +(1, 744), +(1, 765), +(1, 766), +(1, 767), +(1, 768), (1, 769), (1, 770), (1, 771), @@ -545,50 +551,6 @@ INSERT INTO `ps_access` (`id_profile`, `id_authorization_role`) VALUES (1, 802), (1, 803), (1, 804), -(1, 805), -(1, 806), -(1, 807), -(1, 808), -(1, 813), -(1, 814), -(1, 815), -(1, 816), -(1, 817), -(1, 818), -(1, 819), -(1, 820), -(1, 821), -(1, 822), -(1, 823), -(1, 824), -(1, 825), -(1, 826), -(1, 827), -(1, 828), -(1, 829), -(1, 830), -(1, 831), -(1, 832), -(1, 833), -(1, 834), -(1, 835), -(1, 836), -(1, 837), -(1, 838), -(1, 839), -(1, 840), -(1, 841), -(1, 842), -(1, 843), -(1, 844), -(1, 845), -(1, 846), -(1, 847), -(1, 848), -(1, 849), -(1, 850), -(1, 851), -(1, 852), (2, 5), (2, 6), (2, 7), @@ -815,7 +777,7 @@ CREATE TABLE `ps_accessory` ( `id_product_1` int(10) unsigned NOT NULL, `id_product_2` int(10) unsigned NOT NULL, KEY `accessory_product` (`id_product_1`,`id_product_2`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_address`; @@ -842,8 +804,8 @@ CREATE TABLE `ps_address` ( `dni` varchar(16) DEFAULT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, - `active` tinyint(3) unsigned NOT NULL DEFAULT '1', - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '1', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_address`), KEY `address_customer` (`id_customer`), KEY `id_country` (`id_country`), @@ -851,28 +813,24 @@ CREATE TABLE `ps_address` ( KEY `id_manufacturer` (`id_manufacturer`), KEY `id_supplier` (`id_supplier`), KEY `id_warehouse` (`id_warehouse`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_address` (`id_address`, `id_country`, `id_state`, `id_customer`, `id_manufacturer`, `id_supplier`, `id_warehouse`, `alias`, `company`, `lastname`, `firstname`, `address1`, `address2`, `postcode`, `city`, `other`, `phone`, `phone_mobile`, `vat_number`, `dni`, `date_add`, `date_upd`, `active`, `deleted`) VALUES -(1, 17, 0, 1, 0, 0, 0, 'Anonymous', 'Anonymous', 'Anonymous', 'Anonymous', 'Anonymous', '', '00000', 'Anonymous', '', '0000000000', '0000000000', '0000', '0000', '2023-05-02 12:17:00', '2023-05-02 12:17:00', 1, 0), -(2, 8, 0, 2, 0, 0, 0, 'Mon adresse', 'My Company', 'DOE', 'John', '16, Main street', '2nd floor', '75002', 'Paris ', '', '0102030405', '', '', '', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(3, 21, 35, 0, 0, 1, 0, 'supplier', 'Fashion', 'supplier', 'supplier', '767 Fifth Ave.', '', '10153', 'New York', '', '(212) 336-1440', '', '', '', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(4, 21, 35, 0, 1, 0, 0, 'manufacturer', 'Fashion', 'manufacturer', 'manufacturer', '767 Fifth Ave.', '', '10154', 'New York', '', '(212) 336-1666', '', '', '', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(5, 21, 12, 2, 0, 0, 0, 'My address', 'My Company', 'DOE', 'John', '16, Main street', '2nd floor', '33133', 'Miami', '', '0102030405', '', '', '', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(6, 8, 0, 0, 0, 2, 0, 'accessories_supplier', 'Accessories and Co', 'accessories', 'accessories', '42 Avenue Maréchal Soult', '', '64990', 'Bayonne', '', '0102030405', '', '', '', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(7, 1, 0, 3, 0, 0, 0, 'DE', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '+49 30 140228614', '', '23423523', '', '2023-05-08 17:21:15', '2023-05-15 10:42:01', 1, 1), -(8, 13, 0, 3, 0, 0, 0, 'NL', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'ADDRESS 123-123 2', '4331 NS', 'Rotterdam', '', '06-26128932', '', '23423523', '', '2023-05-15 10:41:20', '2023-05-15 10:41:20', 1, 0), -(9, 1, 0, 3, 0, 0, 0, 'DE', 'TEST COMP', 'RRRRRRR', 'INVERTUS', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '04193 12 17 38', '', '23423523', '', '2023-05-15 10:42:01', '2023-05-15 10:42:01', 1, 0), -(10, 1, 0, 4, 0, 0, 0, 'DE', 'TEST COMP', 'TESSST', 'TEST TEST', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '+49-42198759147', '', '23423523', '', '2023-08-28 11:55:41', '2023-08-28 11:58:45', 1, 1), -(11, 13, 0, 4, 0, 0, 0, 'NL', 'TEST COMP', 'TESSST', 'TEST TEST', 'Nobelstraat 26-A', 'TEST123-312', '3512 EP', 'Utrecht', '', '030 240 0192', '', '23423523', '', '2023-08-28 11:57:13', '2023-08-28 11:57:13', 1, 0), -(12, 1, 0, 4, 0, 0, 0, 'DE', 'TEST COMP', 'TESSST', 'TEST TEST', 'TEST 123-123 123', 'TEST123-312', '10115', 'Berlin', '', '+49 30 084669845 ', '', '23423523', '', '2023-08-28 11:58:45', '2023-08-28 11:58:45', 1, 0); +(1, 17, 0, 1, 0, 0, 0, 'Anonymous', 'Anonymous', 'Anonymous', 'Anonymous', 'Anonymous', '', '00000', 'Anonymous', '', '0000000000', '0000000000', '0000', '0000', '2023-08-28 13:26:22', '2023-08-28 13:26:22', 1, 0), +(2, 8, 0, 2, 0, 0, 0, 'Mon adresse', 'My Company', 'DOE', 'John', '16, Main street', '2nd floor', '75002', 'Paris ', '', '0102030405', '', '', '', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(3, 21, 35, 0, 0, 1, 0, 'supplier', 'Fashion', 'supplier', 'supplier', '767 Fifth Ave.', '', '10153', 'New York', '', '(212) 336-1440', '', '', '', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(4, 21, 35, 0, 1, 0, 0, 'manufacturer', 'Fashion', 'manufacturer', 'manufacturer', '767 Fifth Ave.', '', '10154', 'New York', '', '(212) 336-1666', '', '', '', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(5, 21, 12, 2, 0, 0, 0, 'My address', 'My Company', 'DOE', 'John', '16, Main street', '2nd floor', '33133', 'Miami', '', '0102030405', '', '', '', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(6, 8, 0, 0, 0, 2, 0, 'accessories_supplier', 'Accessories and Co', 'accessories', 'accessories', '42 Avenue Maréchal Soult', '', '64990', 'Bayonne', '', '0102030405', '', '', '', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(7, 1, 0, 3, 0, 0, 0, 'DE', 'TEST COMP', 'TESSST', 'TEST TEST', 'TEST 123-123 123', 'ADDRESS 123-123 2', '10115', 'Berlin', '', '+49 30 084669845', '', '23423523', '', '2023-08-28 13:49:09', '2023-08-28 13:49:09', 1, 0), +(8, 13, 0, 3, 0, 0, 0, 'NL', 'TEST COMP', 'AAAAAA', 'FFFFFF', 'TEST 123-123 123', 'TEST123-312 5555', '8442 MB', 'Rotterdam', '', '0513 683 950', '', '23423523', '', '2023-08-28 13:50:31', '2023-08-28 13:50:31', 1, 0); DROP TABLE IF EXISTS `ps_address_format`; CREATE TABLE `ps_address_format` ( `id_country` int(10) unsigned NOT NULL, `format` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id_country`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_address_format` (`id_country`, `format`) VALUES (1, 'firstname lastname\ncompany\nvat_number\naddress1\naddress2\npostcode city\nCountry:name\nphone'), @@ -1117,8 +1075,6 @@ INSERT INTO `ps_address_format` (`id_country`, `format`) VALUES (240, 'firstname lastname\ncompany\nvat_number\naddress1\naddress2\npostcode city\nCountry:name\nphone'), (241, 'firstname lastname\ncompany\nvat_number\naddress1\naddress2\npostcode city\nCountry:name\nphone'); -SET NAMES utf8mb4; - DROP TABLE IF EXISTS `ps_admin_filter`; CREATE TABLE `ps_admin_filter` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -1132,11 +1088,6 @@ CREATE TABLE `ps_admin_filter` ( UNIQUE KEY `admin_filter_search_id_idx` (`employee`,`shop`,`controller`,`action`,`filter_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -INSERT INTO `ps_admin_filter` (`id`, `employee`, `shop`, `controller`, `action`, `filter`, `filter_id`) VALUES -(1, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"date_add\",\"sortOrder\":\"DESC\",\"filters\":[]}', 'customer'), -(3, 1, 2, '', '', '{\"limit\":50,\"orderBy\":\"id_order\",\"sortOrder\":\"DESC\",\"filters\":[]}', 'order'), -(4, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"id_lang\",\"sortOrder\":\"ASC\",\"filters\":[]}', 'language'), -(5, 1, 1, '', '', '{\"limit\":50,\"orderBy\":\"id_meta\",\"sortOrder\":\"asc\",\"filters\":[]}', 'meta'); DROP TABLE IF EXISTS `ps_alias`; CREATE TABLE `ps_alias` ( @@ -1146,7 +1097,7 @@ CREATE TABLE `ps_alias` ( `active` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id_alias`), UNIQUE KEY `alias` (`alias`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_alias` (`id_alias`, `alias`, `search`, `active`) VALUES (1, 'bloose', 'blouse', 1), @@ -1157,10 +1108,10 @@ CREATE TABLE `ps_attachment` ( `id_attachment` int(10) unsigned NOT NULL AUTO_INCREMENT, `file` varchar(40) NOT NULL, `file_name` varchar(128) NOT NULL, - `file_size` bigint(20) unsigned NOT NULL DEFAULT '0', + `file_size` bigint(10) unsigned NOT NULL DEFAULT '0', `mime` varchar(128) NOT NULL, PRIMARY KEY (`id_attachment`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_attachment_lang`; @@ -1170,7 +1121,7 @@ CREATE TABLE `ps_attachment_lang` ( `name` varchar(32) DEFAULT NULL, `description` text, PRIMARY KEY (`id_attachment`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_attribute`; @@ -1188,32 +1139,32 @@ INSERT INTO `ps_attribute` (`id_attribute`, `id_attribute_group`, `color`, `posi (2, 1, '', 1), (3, 1, '', 2), (4, 1, '', 3), -(5, 2, '#AAB2BD', 0), -(6, 2, '#CFC4A6', 1), -(7, 2, '#f5f5dc', 2), -(8, 2, '#ffffff', 3), -(9, 2, '#faebd7', 4), -(10, 2, '#E84C3D', 5), -(11, 2, '#434A54', 6), -(12, 2, '#C19A6B', 7), -(13, 2, '#F39C11', 8), -(14, 2, '#5D9CEC', 9), -(15, 2, '#A0D468', 10), -(16, 2, '#F1C40F', 11), -(17, 2, '#964B00', 12), -(18, 2, '#FCCACD', 13), -(19, 3, '', 0), -(20, 3, '', 1), -(21, 3, '', 2), -(22, 4, '', 0), -(23, 4, '', 1), -(24, 4, '', 2), -(25, 4, '', 3), -(26, 5, '', 0), -(27, 5, '', 1), -(28, 5, '', 2), -(29, 5, '', 3), -(30, 5, '', 4); +(5, 1, '', 4), +(6, 2, '', 0), +(7, 2, '', 1), +(8, 2, '', 2), +(9, 2, '', 3), +(10, 3, '#AAB2BD', 0), +(11, 3, '#CFC4A6', 1), +(12, 3, '#f5f5dc', 2), +(13, 3, '#ffffff', 3), +(14, 3, '#faebd7', 4), +(15, 3, '#E84C3D', 5), +(16, 3, '#434A54', 6), +(17, 3, '#C19A6B', 7), +(18, 3, '#F39C11', 8), +(19, 3, '#5D9CEC', 9), +(20, 3, '#A0D468', 10), +(21, 3, '#F1C40F', 11), +(22, 3, '#964B00', 12), +(23, 3, '#FCCACD', 13), +(24, 4, '', 0), +(25, 4, '', 1), +(26, 4, '', 2), +(27, 5, '', 0), +(28, 5, '', 1), +(29, 5, '', 2), +(30, 5, '', 3); DROP TABLE IF EXISTS `ps_attribute_group`; CREATE TABLE `ps_attribute_group` ( @@ -1226,8 +1177,8 @@ CREATE TABLE `ps_attribute_group` ( INSERT INTO `ps_attribute_group` (`id_attribute_group`, `is_color_group`, `group_type`, `position`) VALUES (1, 0, 'select', 0), -(2, 1, 'color', 1), -(3, 0, 'select', 2), +(2, 0, 'select', 1), +(3, 1, 'color', 2), (4, 0, 'select', 3), (5, 0, 'select', 4); @@ -1243,18 +1194,21 @@ CREATE TABLE `ps_attribute_group_lang` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `ps_attribute_group_lang` (`id_attribute_group`, `id_lang`, `name`, `public_name`) VALUES -(1, 1, 'Size', 'Size'), -(1, 2, 'Größe', 'Größe'), -(1, 3, 'Grootte', 'Grootte'), -(2, 1, 'Color', 'Color'), -(2, 2, 'Farbe', 'Farbe'), -(2, 3, 'Kleur', 'Kleur'), -(3, 1, 'Dimension', 'Dimension'), -(3, 2, 'Dimension', 'Dimension'), -(3, 3, 'Dimension', 'Dimension'), -(4, 1, 'Paper Type', 'Paper Type'), -(4, 2, 'Paper Type', 'Paper Type'), -(4, 3, 'Paper Type', 'Paper Type'); +(1, 1, 'Mollie Subscription', 'Subscription'), +(1, 2, 'Mollie Subscription', 'Subscription'), +(1, 3, 'Mollie Subscription', 'Subscription'), +(2, 1, 'Size', 'Size'), +(2, 2, 'Grootte', 'Grootte'), +(2, 3, 'Größe', 'Größe'), +(3, 1, 'Color', 'Color'), +(3, 2, 'Kleur', 'Kleur'), +(3, 3, 'Farbe', 'Farbe'), +(4, 1, 'Dimension', 'Dimension'), +(4, 2, 'Dimension', 'Dimension'), +(4, 3, 'Dimension', 'Dimension'), +(5, 1, 'Paper Type', 'Paper Type'), +(5, 2, 'Paper Type', 'Paper Type'), +(5, 3, 'Paper Type', 'Paper Type'); DROP TABLE IF EXISTS `ps_attribute_group_shop`; CREATE TABLE `ps_attribute_group_shop` ( @@ -1267,15 +1221,10 @@ CREATE TABLE `ps_attribute_group_shop` ( INSERT INTO `ps_attribute_group_shop` (`id_attribute_group`, `id_shop`) VALUES (1, 1), -(1, 2), (2, 1), -(2, 2), (3, 1), -(3, 2), (4, 1), -(4, 2), -(5, 1), -(5, 2); +(5, 1); DROP TABLE IF EXISTS `ps_attribute_lang`; CREATE TABLE `ps_attribute_lang` ( @@ -1288,96 +1237,96 @@ CREATE TABLE `ps_attribute_lang` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `ps_attribute_lang` (`id_attribute`, `id_lang`, `name`) VALUES -(1, 1, 'S'), -(1, 2, 'S'), -(1, 3, 'S'), -(2, 1, 'M'), -(2, 2, 'M'), -(2, 3, 'M'), -(3, 1, 'L'), -(3, 2, 'L'), -(3, 3, 'L'), -(4, 1, 'XL'), -(4, 2, 'XL'), -(4, 3, 'XL'), -(5, 1, 'Grey'), -(5, 2, 'Grau'), -(5, 3, 'Grijs'), -(6, 1, 'Taupe'), -(6, 2, 'Taupe'), -(6, 3, 'Taupe'), -(7, 1, 'Beige'), -(7, 2, 'Beige'), -(7, 3, 'Beige'), -(8, 1, 'White'), -(8, 2, 'Weiß'), -(8, 3, 'Wit'), -(9, 1, 'Off White'), -(9, 2, 'Wollweiß'), -(9, 3, 'Gebroken wit'), -(10, 1, 'Red'), -(10, 2, 'Rot'), -(10, 3, 'Rood'), -(11, 1, 'Black'), -(11, 2, 'Schwarz'), -(11, 3, 'Zwart'), -(12, 1, 'Camel'), -(12, 2, 'Camel'), -(12, 3, 'Camel'), -(13, 1, 'Orange'), -(13, 2, 'Orange'), -(13, 3, 'Oranje'), -(14, 1, 'Blue'), -(14, 2, 'Blau'), -(14, 3, 'Blauw'), -(15, 1, 'Green'), -(15, 2, 'Grün'), -(15, 3, 'Groen'), -(16, 1, 'Yellow'), -(16, 2, 'Gelb'), -(16, 3, 'Geel'), -(17, 1, 'Brown'), -(17, 2, 'Braun'), -(17, 3, 'Bruin'), -(18, 1, 'Pink'), -(18, 2, 'Pink'), -(18, 3, 'Roze'), -(19, 1, '40x60cm'), -(19, 2, '40x60cm'), -(19, 3, '40x60cm'), -(20, 1, '60x90cm'), -(20, 2, '60x90cm'), -(20, 3, '60x90cm'), -(21, 1, '80x120cm'), -(21, 2, '80x120cm'), -(21, 3, '80x120cm'), -(22, 1, 'Ruled'), -(22, 2, 'Ruled'), -(22, 3, 'Ruled'), -(23, 1, 'Plain'), -(23, 2, 'Plain'), -(23, 3, 'Plain'), -(24, 1, 'Squarred'), -(24, 2, 'Squarred'), -(24, 3, 'Squarred'), -(25, 1, 'Doted'), -(25, 2, 'Doted'), -(25, 3, 'Doted'), -(26, 1, 'None'), -(26, 2, 'None'), -(26, 3, 'None'), -(27, 1, 'Daily'), -(27, 2, 'Daily'), -(27, 3, 'Daily'), -(28, 1, 'Weekly'), -(28, 2, 'Weekly'), -(28, 3, 'Weekly'), -(29, 1, 'Monthly'), -(29, 2, 'Monthly'), -(29, 3, 'Monthly'), -(30, 1, 'Yearly'), -(30, 2, 'Yearly'), -(30, 3, 'Yearly'); +(1, 1, 'None'), +(1, 2, 'None'), +(1, 3, 'None'), +(2, 1, 'Daily'), +(2, 2, 'Daily'), +(2, 3, 'Daily'), +(3, 1, 'Weekly'), +(3, 2, 'Weekly'), +(3, 3, 'Weekly'), +(4, 1, 'Monthly'), +(4, 2, 'Monthly'), +(4, 3, 'Monthly'), +(5, 1, 'Yearly'), +(5, 2, 'Yearly'), +(5, 3, 'Yearly'), +(6, 1, 'S'), +(6, 2, 'S'), +(6, 3, 'S'), +(7, 1, 'M'), +(7, 2, 'M'), +(7, 3, 'M'), +(8, 1, 'L'), +(8, 2, 'L'), +(8, 3, 'L'), +(9, 1, 'XL'), +(9, 2, 'XL'), +(9, 3, 'XL'), +(10, 1, 'Gray'), +(10, 2, 'Grijs'), +(10, 3, 'Grau'), +(11, 1, 'Taupe'), +(11, 2, 'Taupe'), +(11, 3, 'Taupe'), +(12, 1, 'Beige'), +(12, 2, 'Beige'), +(12, 3, 'Beige'), +(13, 1, 'White'), +(13, 2, 'Wit'), +(13, 3, 'Weiß'), +(14, 1, 'Off White'), +(14, 2, 'Gebroken wit'), +(14, 3, 'Wollweiß'), +(15, 1, 'Red'), +(15, 2, 'Rood'), +(15, 3, 'Rot'), +(16, 1, 'Black'), +(16, 2, 'Zwart'), +(16, 3, 'Schwarz'), +(17, 1, 'Camel'), +(17, 2, 'Camel'), +(17, 3, 'Camel'), +(18, 1, 'Orange'), +(18, 2, 'Oranje'), +(18, 3, 'Orange'), +(19, 1, 'Blue'), +(19, 2, 'Blauw'), +(19, 3, 'Blau'), +(20, 1, 'Green'), +(20, 2, 'Groen'), +(20, 3, 'Grün'), +(21, 1, 'Yellow'), +(21, 2, 'Geel'), +(21, 3, 'Gelb'), +(22, 1, 'Brown'), +(22, 2, 'Bruin'), +(22, 3, 'Braun'), +(23, 1, 'Pink'), +(23, 2, 'Roze'), +(23, 3, 'Pink'), +(24, 1, '40x60cm'), +(24, 2, '40x60cm'), +(24, 3, '40x60cm'), +(25, 1, '60x90cm'), +(25, 2, '60x90cm'), +(25, 3, '60x90cm'), +(26, 1, '80x120cm'), +(26, 2, '80x120cm'), +(26, 3, '80x120cm'), +(27, 1, 'Ruled'), +(27, 2, 'Ruled'), +(27, 3, 'Ruled'), +(28, 1, 'Plain'), +(28, 2, 'Plain'), +(28, 3, 'Plain'), +(29, 1, 'Squarred'), +(29, 2, 'Squarred'), +(29, 3, 'Squarred'), +(30, 1, 'Doted'), +(30, 2, 'Doted'), +(30, 3, 'Doted'); DROP TABLE IF EXISTS `ps_attribute_shop`; CREATE TABLE `ps_attribute_shop` ( @@ -1390,65 +1339,35 @@ CREATE TABLE `ps_attribute_shop` ( INSERT INTO `ps_attribute_shop` (`id_attribute`, `id_shop`) VALUES (1, 1), -(1, 2), (2, 1), -(2, 2), (3, 1), -(3, 2), (4, 1), -(4, 2), (5, 1), -(5, 2), (6, 1), -(6, 2), (7, 1), -(7, 2), (8, 1), -(8, 2), (9, 1), -(9, 2), (10, 1), -(10, 2), (11, 1), -(11, 2), (12, 1), -(12, 2), (13, 1), -(13, 2), (14, 1), -(14, 2), (15, 1), -(15, 2), (16, 1), -(16, 2), (17, 1), -(17, 2), (18, 1), -(18, 2), (19, 1), -(19, 2), (20, 1), -(20, 2), (21, 1), -(21, 2), (22, 1), -(22, 2), (23, 1), -(23, 2), (24, 1), -(24, 2), (25, 1), -(25, 2), (26, 1), -(26, 2), (27, 1), -(27, 2), (28, 1), -(28, 2), (29, 1), -(29, 2), -(30, 1), -(30, 2); +(30, 1); DROP TABLE IF EXISTS `ps_authorization_role`; CREATE TABLE `ps_authorization_role` ( @@ -1456,7 +1375,7 @@ CREATE TABLE `ps_authorization_role` ( `slug` varchar(191) NOT NULL, PRIMARY KEY (`id_authorization_role`), UNIQUE KEY `slug` (`slug`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (465, 'ROLE_MOD_MODULE_BLOCKREASSURANCE_CREATE'), @@ -1471,38 +1390,38 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (584, 'ROLE_MOD_MODULE_CONTACTFORM_DELETE'), (582, 'ROLE_MOD_MODULE_CONTACTFORM_READ'), (583, 'ROLE_MOD_MODULE_CONTACTFORM_UPDATE'), -(725, 'ROLE_MOD_MODULE_DASHACTIVITY_CREATE'), -(728, 'ROLE_MOD_MODULE_DASHACTIVITY_DELETE'), -(726, 'ROLE_MOD_MODULE_DASHACTIVITY_READ'), -(727, 'ROLE_MOD_MODULE_DASHACTIVITY_UPDATE'), -(645, 'ROLE_MOD_MODULE_DASHGOALS_CREATE'), -(648, 'ROLE_MOD_MODULE_DASHGOALS_DELETE'), -(646, 'ROLE_MOD_MODULE_DASHGOALS_READ'), -(647, 'ROLE_MOD_MODULE_DASHGOALS_UPDATE'), -(601, 'ROLE_MOD_MODULE_DASHPRODUCTS_CREATE'), -(604, 'ROLE_MOD_MODULE_DASHPRODUCTS_DELETE'), -(602, 'ROLE_MOD_MODULE_DASHPRODUCTS_READ'), -(603, 'ROLE_MOD_MODULE_DASHPRODUCTS_UPDATE'), -(593, 'ROLE_MOD_MODULE_DASHTRENDS_CREATE'), -(596, 'ROLE_MOD_MODULE_DASHTRENDS_DELETE'), -(594, 'ROLE_MOD_MODULE_DASHTRENDS_READ'), -(595, 'ROLE_MOD_MODULE_DASHTRENDS_UPDATE'), -(597, 'ROLE_MOD_MODULE_GRAPHNVD3_CREATE'), -(600, 'ROLE_MOD_MODULE_GRAPHNVD3_DELETE'), -(598, 'ROLE_MOD_MODULE_GRAPHNVD3_READ'), -(599, 'ROLE_MOD_MODULE_GRAPHNVD3_UPDATE'), -(673, 'ROLE_MOD_MODULE_GRIDHTML_CREATE'), -(676, 'ROLE_MOD_MODULE_GRIDHTML_DELETE'), -(674, 'ROLE_MOD_MODULE_GRIDHTML_READ'), -(675, 'ROLE_MOD_MODULE_GRIDHTML_UPDATE'), -(677, 'ROLE_MOD_MODULE_GSITEMAP_CREATE'), -(680, 'ROLE_MOD_MODULE_GSITEMAP_DELETE'), -(678, 'ROLE_MOD_MODULE_GSITEMAP_READ'), -(679, 'ROLE_MOD_MODULE_GSITEMAP_UPDATE'), -(637, 'ROLE_MOD_MODULE_PAGESNOTFOUND_CREATE'), -(640, 'ROLE_MOD_MODULE_PAGESNOTFOUND_DELETE'), -(638, 'ROLE_MOD_MODULE_PAGESNOTFOUND_READ'), -(639, 'ROLE_MOD_MODULE_PAGESNOTFOUND_UPDATE'), +(665, 'ROLE_MOD_MODULE_DASHACTIVITY_CREATE'), +(668, 'ROLE_MOD_MODULE_DASHACTIVITY_DELETE'), +(666, 'ROLE_MOD_MODULE_DASHACTIVITY_READ'), +(667, 'ROLE_MOD_MODULE_DASHACTIVITY_UPDATE'), +(745, 'ROLE_MOD_MODULE_DASHGOALS_CREATE'), +(748, 'ROLE_MOD_MODULE_DASHGOALS_DELETE'), +(746, 'ROLE_MOD_MODULE_DASHGOALS_READ'), +(747, 'ROLE_MOD_MODULE_DASHGOALS_UPDATE'), +(605, 'ROLE_MOD_MODULE_DASHPRODUCTS_CREATE'), +(608, 'ROLE_MOD_MODULE_DASHPRODUCTS_DELETE'), +(606, 'ROLE_MOD_MODULE_DASHPRODUCTS_READ'), +(607, 'ROLE_MOD_MODULE_DASHPRODUCTS_UPDATE'), +(725, 'ROLE_MOD_MODULE_DASHTRENDS_CREATE'), +(728, 'ROLE_MOD_MODULE_DASHTRENDS_DELETE'), +(726, 'ROLE_MOD_MODULE_DASHTRENDS_READ'), +(727, 'ROLE_MOD_MODULE_DASHTRENDS_UPDATE'), +(681, 'ROLE_MOD_MODULE_GRAPHNVD3_CREATE'), +(684, 'ROLE_MOD_MODULE_GRAPHNVD3_DELETE'), +(682, 'ROLE_MOD_MODULE_GRAPHNVD3_READ'), +(683, 'ROLE_MOD_MODULE_GRAPHNVD3_UPDATE'), +(733, 'ROLE_MOD_MODULE_GRIDHTML_CREATE'), +(736, 'ROLE_MOD_MODULE_GRIDHTML_DELETE'), +(734, 'ROLE_MOD_MODULE_GRIDHTML_READ'), +(735, 'ROLE_MOD_MODULE_GRIDHTML_UPDATE'), +(669, 'ROLE_MOD_MODULE_GSITEMAP_CREATE'), +(672, 'ROLE_MOD_MODULE_GSITEMAP_DELETE'), +(670, 'ROLE_MOD_MODULE_GSITEMAP_READ'), +(671, 'ROLE_MOD_MODULE_GSITEMAP_UPDATE'), +(673, 'ROLE_MOD_MODULE_PAGESNOTFOUND_CREATE'), +(676, 'ROLE_MOD_MODULE_PAGESNOTFOUND_DELETE'), +(674, 'ROLE_MOD_MODULE_PAGESNOTFOUND_READ'), +(675, 'ROLE_MOD_MODULE_PAGESNOTFOUND_UPDATE'), (569, 'ROLE_MOD_MODULE_PRODUCTCOMMENTS_CREATE'), (572, 'ROLE_MOD_MODULE_PRODUCTCOMMENTS_DELETE'), (570, 'ROLE_MOD_MODULE_PRODUCTCOMMENTS_READ'), @@ -1519,34 +1438,34 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (556, 'ROLE_MOD_MODULE_PS_BESTSELLERS_DELETE'), (554, 'ROLE_MOD_MODULE_PS_BESTSELLERS_READ'), (555, 'ROLE_MOD_MODULE_PS_BESTSELLERS_UPDATE'), -(713, 'ROLE_MOD_MODULE_PS_BRANDLIST_CREATE'), -(716, 'ROLE_MOD_MODULE_PS_BRANDLIST_DELETE'), -(714, 'ROLE_MOD_MODULE_PS_BRANDLIST_READ'), -(715, 'ROLE_MOD_MODULE_PS_BRANDLIST_UPDATE'), -(609, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_CREATE'), -(612, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_DELETE'), -(610, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_READ'), -(611, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_UPDATE'), -(681, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_CREATE'), -(684, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_DELETE'), -(682, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_READ'), -(683, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_UPDATE'), +(593, 'ROLE_MOD_MODULE_PS_BRANDLIST_CREATE'), +(596, 'ROLE_MOD_MODULE_PS_BRANDLIST_DELETE'), +(594, 'ROLE_MOD_MODULE_PS_BRANDLIST_READ'), +(595, 'ROLE_MOD_MODULE_PS_BRANDLIST_UPDATE'), +(753, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_CREATE'), +(756, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_DELETE'), +(754, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_READ'), +(755, 'ROLE_MOD_MODULE_PS_CASHONDELIVERY_UPDATE'), +(621, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_CREATE'), +(624, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_DELETE'), +(622, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_READ'), +(623, 'ROLE_MOD_MODULE_PS_CATEGORYPRODUCTS_UPDATE'), (573, 'ROLE_MOD_MODULE_PS_CATEGORYTREE_CREATE'), (576, 'ROLE_MOD_MODULE_PS_CATEGORYTREE_DELETE'), (574, 'ROLE_MOD_MODULE_PS_CATEGORYTREE_READ'), (575, 'ROLE_MOD_MODULE_PS_CATEGORYTREE_UPDATE'), -(705, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_CREATE'), -(708, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_DELETE'), -(706, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_READ'), -(707, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_UPDATE'), +(609, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_CREATE'), +(612, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_DELETE'), +(610, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_READ'), +(611, 'ROLE_MOD_MODULE_PS_CHECKPAYMENT_UPDATE'), (501, 'ROLE_MOD_MODULE_PS_CONTACTINFO_CREATE'), (504, 'ROLE_MOD_MODULE_PS_CONTACTINFO_DELETE'), (502, 'ROLE_MOD_MODULE_PS_CONTACTINFO_READ'), (503, 'ROLE_MOD_MODULE_PS_CONTACTINFO_UPDATE'), -(709, 'ROLE_MOD_MODULE_PS_CROSSSELLING_CREATE'), -(712, 'ROLE_MOD_MODULE_PS_CROSSSELLING_DELETE'), -(710, 'ROLE_MOD_MODULE_PS_CROSSSELLING_READ'), -(711, 'ROLE_MOD_MODULE_PS_CROSSSELLING_UPDATE'), +(721, 'ROLE_MOD_MODULE_PS_CROSSSELLING_CREATE'), +(724, 'ROLE_MOD_MODULE_PS_CROSSSELLING_DELETE'), +(722, 'ROLE_MOD_MODULE_PS_CROSSSELLING_READ'), +(723, 'ROLE_MOD_MODULE_PS_CROSSSELLING_UPDATE'), (509, 'ROLE_MOD_MODULE_PS_CURRENCYSELECTOR_CREATE'), (512, 'ROLE_MOD_MODULE_PS_CURRENCYSELECTOR_DELETE'), (510, 'ROLE_MOD_MODULE_PS_CURRENCYSELECTOR_READ'), @@ -1563,34 +1482,34 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (544, 'ROLE_MOD_MODULE_PS_CUSTOMTEXT_DELETE'), (542, 'ROLE_MOD_MODULE_PS_CUSTOMTEXT_READ'), (543, 'ROLE_MOD_MODULE_PS_CUSTOMTEXT_UPDATE'), -(653, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_CREATE'), -(656, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_DELETE'), -(654, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_READ'), -(655, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_UPDATE'), -(625, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_CREATE'), -(628, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_DELETE'), -(626, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_READ'), -(627, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_UPDATE'), -(665, 'ROLE_MOD_MODULE_PS_EMAILALERTS_CREATE'), -(668, 'ROLE_MOD_MODULE_PS_EMAILALERTS_DELETE'), -(666, 'ROLE_MOD_MODULE_PS_EMAILALERTS_READ'), -(667, 'ROLE_MOD_MODULE_PS_EMAILALERTS_UPDATE'), +(677, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_CREATE'), +(680, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_DELETE'), +(678, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_READ'), +(679, 'ROLE_MOD_MODULE_PS_DATAPRIVACY_UPDATE'), +(633, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_CREATE'), +(636, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_DELETE'), +(634, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_READ'), +(635, 'ROLE_MOD_MODULE_PS_DISTRIBUTIONAPICLIENT_UPDATE'), +(701, 'ROLE_MOD_MODULE_PS_EMAILALERTS_CREATE'), +(704, 'ROLE_MOD_MODULE_PS_EMAILALERTS_DELETE'), +(702, 'ROLE_MOD_MODULE_PS_EMAILALERTS_READ'), +(703, 'ROLE_MOD_MODULE_PS_EMAILALERTS_UPDATE'), (557, 'ROLE_MOD_MODULE_PS_EMAILSUBSCRIPTION_CREATE'), (560, 'ROLE_MOD_MODULE_PS_EMAILSUBSCRIPTION_DELETE'), (558, 'ROLE_MOD_MODULE_PS_EMAILSUBSCRIPTION_READ'), (559, 'ROLE_MOD_MODULE_PS_EMAILSUBSCRIPTION_UPDATE'), -(761, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_CREATE'), -(764, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_DELETE'), -(762, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_READ'), -(763, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_UPDATE'), +(805, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_CREATE'), +(808, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_DELETE'), +(806, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_READ'), +(807, 'ROLE_MOD_MODULE_PS_FACETEDSEARCH_UPDATE'), (533, 'ROLE_MOD_MODULE_PS_FEATUREDPRODUCTS_CREATE'), (536, 'ROLE_MOD_MODULE_PS_FEATUREDPRODUCTS_DELETE'), (534, 'ROLE_MOD_MODULE_PS_FEATUREDPRODUCTS_READ'), (535, 'ROLE_MOD_MODULE_PS_FEATUREDPRODUCTS_UPDATE'), -(621, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_CREATE'), -(624, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_DELETE'), -(622, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_READ'), -(623, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_UPDATE'), +(661, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_CREATE'), +(664, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_DELETE'), +(662, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_READ'), +(663, 'ROLE_MOD_MODULE_PS_GOOGLEANALYTICS_UPDATE'), (529, 'ROLE_MOD_MODULE_PS_IMAGESLIDER_CREATE'), (532, 'ROLE_MOD_MODULE_PS_IMAGESLIDER_DELETE'), (530, 'ROLE_MOD_MODULE_PS_IMAGESLIDER_READ'), @@ -1631,94 +1550,94 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (548, 'ROLE_MOD_MODULE_PS_SPECIALS_DELETE'), (546, 'ROLE_MOD_MODULE_PS_SPECIALS_READ'), (547, 'ROLE_MOD_MODULE_PS_SPECIALS_UPDATE'), -(701, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_CREATE'), -(704, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_DELETE'), -(702, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_READ'), -(703, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_UPDATE'), -(741, 'ROLE_MOD_MODULE_PS_THEMECUSTO_CREATE'), -(744, 'ROLE_MOD_MODULE_PS_THEMECUSTO_DELETE'), -(742, 'ROLE_MOD_MODULE_PS_THEMECUSTO_READ'), -(743, 'ROLE_MOD_MODULE_PS_THEMECUSTO_UPDATE'), -(733, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_CREATE'), -(736, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_DELETE'), -(734, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_READ'), -(735, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_UPDATE'), -(685, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_CREATE'), -(688, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_DELETE'), -(686, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_READ'), -(687, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_UPDATE'), -(697, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_CREATE'), -(700, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_DELETE'), -(698, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_READ'), -(699, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_UPDATE'), -(729, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_CREATE'), -(732, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_DELETE'), -(730, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_READ'), -(731, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_UPDATE'), -(737, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_CREATE'), -(740, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_DELETE'), -(738, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_READ'), -(739, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_UPDATE'), -(613, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_CREATE'), -(616, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_DELETE'), -(614, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_READ'), -(615, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_UPDATE'), -(669, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_CREATE'), -(672, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_DELETE'), -(670, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_READ'), -(671, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_UPDATE'), -(605, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_CREATE'), -(608, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_DELETE'), -(606, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_READ'), -(607, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_UPDATE'), -(717, 'ROLE_MOD_MODULE_STATSCARRIER_CREATE'), -(720, 'ROLE_MOD_MODULE_STATSCARRIER_DELETE'), -(718, 'ROLE_MOD_MODULE_STATSCARRIER_READ'), -(719, 'ROLE_MOD_MODULE_STATSCARRIER_UPDATE'), -(661, 'ROLE_MOD_MODULE_STATSCATALOG_CREATE'), -(664, 'ROLE_MOD_MODULE_STATSCATALOG_DELETE'), -(662, 'ROLE_MOD_MODULE_STATSCATALOG_READ'), -(663, 'ROLE_MOD_MODULE_STATSCATALOG_UPDATE'), -(693, 'ROLE_MOD_MODULE_STATSCHECKUP_CREATE'), -(696, 'ROLE_MOD_MODULE_STATSCHECKUP_DELETE'), -(694, 'ROLE_MOD_MODULE_STATSCHECKUP_READ'), -(695, 'ROLE_MOD_MODULE_STATSCHECKUP_UPDATE'), -(629, 'ROLE_MOD_MODULE_STATSDATA_CREATE'), -(632, 'ROLE_MOD_MODULE_STATSDATA_DELETE'), -(630, 'ROLE_MOD_MODULE_STATSDATA_READ'), -(631, 'ROLE_MOD_MODULE_STATSDATA_UPDATE'), -(633, 'ROLE_MOD_MODULE_STATSFORECAST_CREATE'), -(636, 'ROLE_MOD_MODULE_STATSFORECAST_DELETE'), -(634, 'ROLE_MOD_MODULE_STATSFORECAST_READ'), -(635, 'ROLE_MOD_MODULE_STATSFORECAST_UPDATE'), -(721, 'ROLE_MOD_MODULE_STATSNEWSLETTER_CREATE'), -(724, 'ROLE_MOD_MODULE_STATSNEWSLETTER_DELETE'), -(722, 'ROLE_MOD_MODULE_STATSNEWSLETTER_READ'), -(723, 'ROLE_MOD_MODULE_STATSNEWSLETTER_UPDATE'), -(689, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_CREATE'), -(692, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_DELETE'), -(690, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_READ'), -(691, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_UPDATE'), -(649, 'ROLE_MOD_MODULE_STATSPRODUCT_CREATE'), -(652, 'ROLE_MOD_MODULE_STATSPRODUCT_DELETE'), -(650, 'ROLE_MOD_MODULE_STATSPRODUCT_READ'), -(651, 'ROLE_MOD_MODULE_STATSPRODUCT_UPDATE'), -(757, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_CREATE'), -(760, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_DELETE'), -(758, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_READ'), -(759, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_UPDATE'), -(589, 'ROLE_MOD_MODULE_STATSSALES_CREATE'), -(592, 'ROLE_MOD_MODULE_STATSSALES_DELETE'), -(590, 'ROLE_MOD_MODULE_STATSSALES_READ'), -(591, 'ROLE_MOD_MODULE_STATSSALES_UPDATE'), -(657, 'ROLE_MOD_MODULE_STATSSEARCH_CREATE'), -(660, 'ROLE_MOD_MODULE_STATSSEARCH_DELETE'), -(658, 'ROLE_MOD_MODULE_STATSSEARCH_READ'), -(659, 'ROLE_MOD_MODULE_STATSSEARCH_UPDATE'), -(617, 'ROLE_MOD_MODULE_STATSSTOCK_CREATE'), -(620, 'ROLE_MOD_MODULE_STATSSTOCK_DELETE'), -(618, 'ROLE_MOD_MODULE_STATSSTOCK_READ'), -(619, 'ROLE_MOD_MODULE_STATSSTOCK_UPDATE'), +(653, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_CREATE'), +(656, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_DELETE'), +(654, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_READ'), +(655, 'ROLE_MOD_MODULE_PS_SUPPLIERLIST_UPDATE'), +(685, 'ROLE_MOD_MODULE_PS_THEMECUSTO_CREATE'), +(688, 'ROLE_MOD_MODULE_PS_THEMECUSTO_DELETE'), +(686, 'ROLE_MOD_MODULE_PS_THEMECUSTO_READ'), +(687, 'ROLE_MOD_MODULE_PS_THEMECUSTO_UPDATE'), +(641, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_CREATE'), +(644, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_DELETE'), +(642, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_READ'), +(643, 'ROLE_MOD_MODULE_PS_VIEWEDPRODUCT_UPDATE'), +(705, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_CREATE'), +(708, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_DELETE'), +(706, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_READ'), +(707, 'ROLE_MOD_MODULE_PS_WIREPAYMENT_UPDATE'), +(597, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_CREATE'), +(600, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_DELETE'), +(598, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_READ'), +(599, 'ROLE_MOD_MODULE_STATSBESTCATEGORIES_UPDATE'), +(757, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_CREATE'), +(760, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_DELETE'), +(758, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_READ'), +(759, 'ROLE_MOD_MODULE_STATSBESTCUSTOMERS_UPDATE'), +(713, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_CREATE'), +(716, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_DELETE'), +(714, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_READ'), +(715, 'ROLE_MOD_MODULE_STATSBESTMANUFACTURERS_UPDATE'), +(645, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_CREATE'), +(648, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_DELETE'), +(646, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_READ'), +(647, 'ROLE_MOD_MODULE_STATSBESTPRODUCTS_UPDATE'), +(737, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_CREATE'), +(740, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_DELETE'), +(738, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_READ'), +(739, 'ROLE_MOD_MODULE_STATSBESTSUPPLIERS_UPDATE'), +(637, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_CREATE'), +(640, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_DELETE'), +(638, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_READ'), +(639, 'ROLE_MOD_MODULE_STATSBESTVOUCHERS_UPDATE'), +(589, 'ROLE_MOD_MODULE_STATSCARRIER_CREATE'), +(592, 'ROLE_MOD_MODULE_STATSCARRIER_DELETE'), +(590, 'ROLE_MOD_MODULE_STATSCARRIER_READ'), +(591, 'ROLE_MOD_MODULE_STATSCARRIER_UPDATE'), +(617, 'ROLE_MOD_MODULE_STATSCATALOG_CREATE'), +(620, 'ROLE_MOD_MODULE_STATSCATALOG_DELETE'), +(618, 'ROLE_MOD_MODULE_STATSCATALOG_READ'), +(619, 'ROLE_MOD_MODULE_STATSCATALOG_UPDATE'), +(657, 'ROLE_MOD_MODULE_STATSCHECKUP_CREATE'), +(660, 'ROLE_MOD_MODULE_STATSCHECKUP_DELETE'), +(658, 'ROLE_MOD_MODULE_STATSCHECKUP_READ'), +(659, 'ROLE_MOD_MODULE_STATSCHECKUP_UPDATE'), +(749, 'ROLE_MOD_MODULE_STATSDATA_CREATE'), +(752, 'ROLE_MOD_MODULE_STATSDATA_DELETE'), +(750, 'ROLE_MOD_MODULE_STATSDATA_READ'), +(751, 'ROLE_MOD_MODULE_STATSDATA_UPDATE'), +(629, 'ROLE_MOD_MODULE_STATSFORECAST_CREATE'), +(632, 'ROLE_MOD_MODULE_STATSFORECAST_DELETE'), +(630, 'ROLE_MOD_MODULE_STATSFORECAST_READ'), +(631, 'ROLE_MOD_MODULE_STATSFORECAST_UPDATE'), +(709, 'ROLE_MOD_MODULE_STATSNEWSLETTER_CREATE'), +(712, 'ROLE_MOD_MODULE_STATSNEWSLETTER_DELETE'), +(710, 'ROLE_MOD_MODULE_STATSNEWSLETTER_READ'), +(711, 'ROLE_MOD_MODULE_STATSNEWSLETTER_UPDATE'), +(625, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_CREATE'), +(628, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_DELETE'), +(626, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_READ'), +(627, 'ROLE_MOD_MODULE_STATSPERSONALINFOS_UPDATE'), +(717, 'ROLE_MOD_MODULE_STATSPRODUCT_CREATE'), +(720, 'ROLE_MOD_MODULE_STATSPRODUCT_DELETE'), +(718, 'ROLE_MOD_MODULE_STATSPRODUCT_READ'), +(719, 'ROLE_MOD_MODULE_STATSPRODUCT_UPDATE'), +(649, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_CREATE'), +(652, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_DELETE'), +(650, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_READ'), +(651, 'ROLE_MOD_MODULE_STATSREGISTRATIONS_UPDATE'), +(601, 'ROLE_MOD_MODULE_STATSSALES_CREATE'), +(604, 'ROLE_MOD_MODULE_STATSSALES_DELETE'), +(602, 'ROLE_MOD_MODULE_STATSSALES_READ'), +(603, 'ROLE_MOD_MODULE_STATSSALES_UPDATE'), +(613, 'ROLE_MOD_MODULE_STATSSEARCH_CREATE'), +(616, 'ROLE_MOD_MODULE_STATSSEARCH_DELETE'), +(614, 'ROLE_MOD_MODULE_STATSSEARCH_READ'), +(615, 'ROLE_MOD_MODULE_STATSSEARCH_UPDATE'), +(729, 'ROLE_MOD_MODULE_STATSSTOCK_CREATE'), +(732, 'ROLE_MOD_MODULE_STATSSTOCK_DELETE'), +(730, 'ROLE_MOD_MODULE_STATSSTOCK_READ'), +(731, 'ROLE_MOD_MODULE_STATSSTOCK_UPDATE'), (1, 'ROLE_MOD_TAB_ADMINACCESS_CREATE'), (4, 'ROLE_MOD_TAB_ADMINACCESS_DELETE'), (2, 'ROLE_MOD_TAB_ADMINACCESS_READ'), @@ -1807,10 +1726,10 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (80, 'ROLE_MOD_TAB_ADMINDASHBOARD_DELETE'), (78, 'ROLE_MOD_TAB_ADMINDASHBOARD_READ'), (79, 'ROLE_MOD_TAB_ADMINDASHBOARD_UPDATE'), -(641, 'ROLE_MOD_TAB_ADMINDASHGOALS_CREATE'), -(644, 'ROLE_MOD_TAB_ADMINDASHGOALS_DELETE'), -(642, 'ROLE_MOD_TAB_ADMINDASHGOALS_READ'), -(643, 'ROLE_MOD_TAB_ADMINDASHGOALS_UPDATE'), +(741, 'ROLE_MOD_TAB_ADMINDASHGOALS_CREATE'), +(744, 'ROLE_MOD_TAB_ADMINDASHGOALS_DELETE'), +(742, 'ROLE_MOD_TAB_ADMINDASHGOALS_READ'), +(743, 'ROLE_MOD_TAB_ADMINDASHGOALS_UPDATE'), (81, 'ROLE_MOD_TAB_ADMINDELIVERYSLIP_CREATE'), (84, 'ROLE_MOD_TAB_ADMINDELIVERYSLIP_DELETE'), (82, 'ROLE_MOD_TAB_ADMINDELIVERYSLIP_READ'), @@ -2067,14 +1986,14 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (312, 'ROLE_MOD_TAB_ADMINPROFILES_DELETE'), (310, 'ROLE_MOD_TAB_ADMINPROFILES_READ'), (311, 'ROLE_MOD_TAB_ADMINPROFILES_UPDATE'), -(753, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_CREATE'), -(756, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_DELETE'), -(754, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_READ'), -(755, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_UPDATE'), -(749, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_CREATE'), -(752, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_DELETE'), -(750, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_READ'), -(751, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_UPDATE'), +(697, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_CREATE'), +(700, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_DELETE'), +(698, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_READ'), +(699, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOADVANCED_UPDATE'), +(693, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_CREATE'), +(696, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_DELETE'), +(694, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_READ'), +(695, 'ROLE_MOD_TAB_ADMINPSTHEMECUSTOCONFIGURATION_UPDATE'), (313, 'ROLE_MOD_TAB_ADMINREQUESTSQL_CREATE'), (316, 'ROLE_MOD_TAB_ADMINREQUESTSQL_DELETE'), (314, 'ROLE_MOD_TAB_ADMINREQUESTSQL_READ'), @@ -2163,10 +2082,10 @@ INSERT INTO `ps_authorization_role` (`id_authorization_role`, `slug`) VALUES (388, 'ROLE_MOD_TAB_ADMINTAXRULESGROUP_DELETE'), (386, 'ROLE_MOD_TAB_ADMINTAXRULESGROUP_READ'), (387, 'ROLE_MOD_TAB_ADMINTAXRULESGROUP_UPDATE'), -(745, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_CREATE'), -(748, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_DELETE'), -(746, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_READ'), -(747, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_UPDATE'), +(689, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_CREATE'), +(692, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_DELETE'), +(690, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_READ'), +(691, 'ROLE_MOD_TAB_ADMINTHEMESPARENT_UPDATE'), (389, 'ROLE_MOD_TAB_ADMINTHEMES_CREATE'), (392, 'ROLE_MOD_TAB_ADMINTHEMES_DELETE'), (390, 'ROLE_MOD_TAB_ADMINTHEMES_READ'), @@ -2238,40 +2157,39 @@ CREATE TABLE `ps_carrier` ( `id_reference` int(10) unsigned NOT NULL, `name` varchar(64) NOT NULL, `url` varchar(255) DEFAULT NULL, - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', - `shipping_handling` tinyint(3) unsigned NOT NULL DEFAULT '1', - `range_behavior` tinyint(3) unsigned NOT NULL DEFAULT '0', - `is_module` tinyint(3) unsigned NOT NULL DEFAULT '0', - `is_free` tinyint(3) unsigned NOT NULL DEFAULT '0', - `shipping_external` tinyint(3) unsigned NOT NULL DEFAULT '0', - `need_range` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', + `shipping_handling` tinyint(1) unsigned NOT NULL DEFAULT '1', + `range_behavior` tinyint(1) unsigned NOT NULL DEFAULT '0', + `is_module` tinyint(1) unsigned NOT NULL DEFAULT '0', + `is_free` tinyint(1) unsigned NOT NULL DEFAULT '0', + `shipping_external` tinyint(1) unsigned NOT NULL DEFAULT '0', + `need_range` tinyint(1) unsigned NOT NULL DEFAULT '0', `external_module_name` varchar(64) DEFAULT NULL, - `shipping_method` int(11) NOT NULL DEFAULT '0', + `shipping_method` int(2) NOT NULL DEFAULT '0', `position` int(10) unsigned NOT NULL DEFAULT '0', - `max_width` int(11) DEFAULT '0', - `max_height` int(11) DEFAULT '0', - `max_depth` int(11) DEFAULT '0', + `max_width` int(10) DEFAULT '0', + `max_height` int(10) DEFAULT '0', + `max_depth` int(10) DEFAULT '0', `max_weight` decimal(20,6) DEFAULT '0.000000', - `grade` int(11) DEFAULT '0', + `grade` int(10) DEFAULT '0', PRIMARY KEY (`id_carrier`), KEY `deleted` (`deleted`,`active`), KEY `reference` (`id_reference`,`deleted`,`active`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_carrier` (`id_carrier`, `id_reference`, `name`, `url`, `active`, `deleted`, `shipping_handling`, `range_behavior`, `is_module`, `is_free`, `shipping_external`, `need_range`, `external_module_name`, `shipping_method`, `position`, `max_width`, `max_height`, `max_depth`, `max_weight`, `grade`) VALUES (1, 1, 'Click and collect', '', 1, 0, 0, 0, 0, 1, 0, 0, '', 0, 0, 0, 0, 0, 0.000000, 0), -(2, 2, 'My carrier', '', 1, 1, 1, 0, 0, 0, 0, 0, '', 1, 1, 0, 0, 0, 0.000000, 0), -(3, 3, 'My cheap carrier', '', 1, 0, 1, 0, 0, 0, 0, 0, '', 2, 2, 0, 0, 0, 0.000000, 0), -(4, 4, 'My light carrier', '', 1, 0, 1, 0, 0, 0, 0, 0, '', 1, 3, 0, 0, 0, 0.000000, 0), -(5, 2, 'My carrier', '', 1, 0, 1, 0, 0, 0, 0, 0, '', 1, 1, 0, 0, 0, 0.000000, 0); +(2, 2, 'My carrier', '', 1, 0, 1, 0, 0, 0, 0, 0, '', 0, 1, 0, 0, 0, 0.000000, 0), +(3, 3, 'My cheap carrier', '', 0, 0, 1, 0, 0, 0, 0, 0, '', 2, 2, 0, 0, 0, 0.000000, 0), +(4, 4, 'My light carrier', '', 0, 0, 1, 0, 0, 0, 0, 0, '', 1, 3, 0, 0, 0, 0.000000, 0); DROP TABLE IF EXISTS `ps_carrier_group`; CREATE TABLE `ps_carrier_group` ( `id_carrier` int(10) unsigned NOT NULL, `id_group` int(10) unsigned NOT NULL, PRIMARY KEY (`id_carrier`,`id_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_carrier_group` (`id_carrier`, `id_group`) VALUES (1, 1), @@ -2285,98 +2203,65 @@ INSERT INTO `ps_carrier_group` (`id_carrier`, `id_group`) VALUES (3, 3), (4, 1), (4, 2), -(4, 3), -(5, 1), -(5, 2), -(5, 3); +(4, 3); DROP TABLE IF EXISTS `ps_carrier_lang`; CREATE TABLE `ps_carrier_lang` ( `id_carrier` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, `delay` varchar(512) DEFAULT NULL, PRIMARY KEY (`id_lang`,`id_shop`,`id_carrier`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_carrier_lang` (`id_carrier`, `id_shop`, `id_lang`, `delay`) VALUES (1, 1, 1, 'Pick up in-store'), (2, 1, 1, 'Delivery next day!'), (3, 1, 1, 'Buy more to pay less!'), (4, 1, 1, 'The lighter the cheaper!'), -(5, 1, 1, 'Delivery next day!'), -(1, 2, 1, 'Pick up in-store'), -(2, 2, 1, 'Delivery next day!'), -(3, 2, 1, 'Buy more to pay less!'), -(4, 2, 1, 'The lighter the cheaper!'), -(5, 2, 1, 'Delivery next day!'), -(1, 1, 2, 'Abholung im Geschäft'), -(2, 1, 2, 'Lieferung am nächsten Tag!'), +(1, 1, 2, 'Afhalen in de winkel'), +(2, 1, 2, 'De volgende dag in huis!'), (3, 1, 2, 'Buy more to pay less!'), (4, 1, 2, 'The lighter the cheaper!'), -(5, 1, 2, 'Lieferung am nächsten Tag!'), -(1, 2, 2, 'Abholung im Geschäft'), -(2, 2, 2, 'Lieferung am nächsten Tag!'), -(3, 2, 2, 'Buy more to pay less!'), -(4, 2, 2, 'The lighter the cheaper!'), -(5, 2, 2, 'Lieferung am nächsten Tag!'), -(1, 1, 3, 'Afhalen in de winkel'), -(2, 1, 3, 'De volgende dag in huis!'), +(1, 1, 3, 'Abholung im Geschäft'), +(2, 1, 3, 'Lieferung am nächsten Tag!'), (3, 1, 3, 'Buy more to pay less!'), -(4, 1, 3, 'The lighter the cheaper!'), -(5, 1, 3, 'De volgende dag in huis!'), -(1, 2, 3, 'Afhalen in de winkel'), -(2, 2, 3, 'De volgende dag in huis!'), -(3, 2, 3, 'Buy more to pay less!'), -(4, 2, 3, 'The lighter the cheaper!'), -(5, 2, 3, 'De volgende dag in huis!'); +(4, 1, 3, 'The lighter the cheaper!'); DROP TABLE IF EXISTS `ps_carrier_shop`; CREATE TABLE `ps_carrier_shop` ( - `id_carrier` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_carrier` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_carrier`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_carrier_shop` (`id_carrier`, `id_shop`) VALUES (1, 1), (2, 1), (3, 1), -(4, 1), -(5, 1), -(1, 2), -(2, 2), -(3, 2), -(4, 2), -(5, 2); +(4, 1); DROP TABLE IF EXISTS `ps_carrier_tax_rules_group_shop`; CREATE TABLE `ps_carrier_tax_rules_group_shop` ( - `id_carrier` int(10) unsigned NOT NULL, - `id_tax_rules_group` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_carrier` int(11) unsigned NOT NULL, + `id_tax_rules_group` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_carrier`,`id_tax_rules_group`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_carrier_tax_rules_group_shop` (`id_carrier`, `id_tax_rules_group`, `id_shop`) VALUES (1, 1, 1), -(1, 1, 2), (2, 1, 1), -(2, 1, 2), (3, 1, 1), -(3, 1, 2), -(4, 1, 1), -(4, 1, 2), -(5, 1, 1), -(5, 1, 2); +(4, 1, 1); DROP TABLE IF EXISTS `ps_carrier_zone`; CREATE TABLE `ps_carrier_zone` ( `id_carrier` int(10) unsigned NOT NULL, `id_zone` int(10) unsigned NOT NULL, PRIMARY KEY (`id_carrier`,`id_zone`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_carrier_zone` (`id_carrier`, `id_zone`) VALUES (1, 1), @@ -2385,21 +2270,13 @@ INSERT INTO `ps_carrier_zone` (`id_carrier`, `id_zone`) VALUES (3, 1), (3, 2), (4, 1), -(4, 2), -(5, 1), -(5, 2), -(5, 3), -(5, 4), -(5, 5), -(5, 6), -(5, 7), -(5, 8); +(4, 2); DROP TABLE IF EXISTS `ps_cart`; CREATE TABLE `ps_cart` ( `id_cart` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop_group` int(10) unsigned NOT NULL DEFAULT '1', - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop_group` int(11) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_carrier` int(10) unsigned NOT NULL, `delivery_option` text NOT NULL, `id_lang` int(10) unsigned NOT NULL, @@ -2409,11 +2286,11 @@ CREATE TABLE `ps_cart` ( `id_customer` int(10) unsigned NOT NULL, `id_guest` int(10) unsigned NOT NULL, `secure_key` varchar(32) NOT NULL DEFAULT '-1', - `recyclable` tinyint(3) unsigned NOT NULL DEFAULT '1', - `gift` tinyint(3) unsigned NOT NULL DEFAULT '0', + `recyclable` tinyint(1) unsigned NOT NULL DEFAULT '1', + `gift` tinyint(1) unsigned NOT NULL DEFAULT '0', `gift_message` text, `mobile_theme` tinyint(1) NOT NULL DEFAULT '0', - `allow_seperated_package` tinyint(3) unsigned NOT NULL DEFAULT '0', + `allow_seperated_package` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, `checkout_session_data` mediumtext, @@ -2428,37 +2305,15 @@ CREATE TABLE `ps_cart` ( KEY `id_shop_group` (`id_shop_group`), KEY `id_shop_2` (`id_shop`,`date_upd`), KEY `id_shop` (`id_shop`,`date_add`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cart` (`id_cart`, `id_shop_group`, `id_shop`, `id_carrier`, `delivery_option`, `id_lang`, `id_address_delivery`, `id_address_invoice`, `id_currency`, `id_customer`, `id_guest`, `secure_key`, `recyclable`, `gift`, `gift_message`, `mobile_theme`, `allow_seperated_package`, `date_add`, `date_upd`, `checkout_session_data`) VALUES -(1, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', NULL), -(2, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', NULL), -(3, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', NULL), -(4, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', NULL), -(5, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', NULL), -(6, 1, 2, 1, '{\"7\":\"1,\"}', 1, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-08 17:20:15', '2023-05-09 08:25:11', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"23271e817fe29b0d55854dd155af0545e941bdef\"}'), -(7, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 09:56:39', '2023-05-15 09:56:50', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(8, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 09:58:01', '2023-05-15 09:58:07', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(9, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 09:58:21', '2023-05-15 09:58:28', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(10, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 09:58:43', '2023-05-15 09:58:52', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(11, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 09:59:08', '2023-05-15 09:59:15', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(12, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:00:45', '2023-05-15 10:00:49', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checkout-payment-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(13, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:00:51', '2023-05-15 10:00:57', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(14, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:02:07', '2023-05-15 10:02:11', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checkout-payment-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(15, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:02:16', '2023-05-15 10:02:22', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(16, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:03:09', '2023-05-15 10:03:14', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(17, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:03:30', '2023-05-15 10:03:38', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(18, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:03:52', '2023-05-15 10:03:58', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(19, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:04:14', '2023-05-15 10:04:21', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"6b93efd2e8ab71e5a5cc0519e778b6279b19f955\"}'), -(20, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:11:07', '2023-05-15 10:11:36', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), -(21, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:25:04', '2023-05-15 10:25:13', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), -(22, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:26:08', '2023-05-15 10:26:16', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), -(23, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:26:57', '2023-05-15 10:27:04', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), -(24, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:27:43', '2023-05-15 10:27:50', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), -(25, 1, 2, 1, '{\"7\":\"1,\"}', 1, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:28:46', '2023-05-15 10:28:53', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"d20451c8b294bfeff2e7bb60202a498aa8a9f054\"}'), -(26, 1, 2, 1, '{\"7\":\"1,\"}', 1, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:29:21', '2023-05-15 10:29:28', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"d20451c8b294bfeff2e7bb60202a498aa8a9f054\"}'), -(27, 1, 2, 1, '{\"7\":\"1,\"}', 2, 7, 7, 1, 3, 124, '0c46e3398a8f3f024dc6569fc56ed4eb', 0, 0, '', 0, 0, '2023-05-15 10:30:11', '2023-05-15 10:30:12', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":false,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checkout-payment-step\":{\"step_is_reachable\":false,\"step_is_complete\":false},\"checksum\":\"baebafa63ae2b6a5948e4fd2f2e6a31598dddee0\"}'), -(28, 1, 1, 1, '{\"10\":\"1,\"}', 1, 10, 10, 1, 4, 916, '3374052bdf067ccff64d284a39dec0fd', 0, 0, '', 0, 0, '2023-08-28 11:54:59', '2023-08-28 11:55:46', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"3fe58cfa47c03f827f3d6c0ffa3bf5f1b86c8abb\"}'); +(1, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', NULL), +(2, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', NULL), +(3, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', NULL), +(4, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', NULL), +(5, 1, 1, 2, '{\"3\":\"2,\"}', 1, 5, 5, 1, 2, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 0, 0, '', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', NULL), +(6, 1, 1, 1, '{\"7\":\"1,\"}', 1, 7, 7, 1, 3, 3, '4c26b11e96bb59693af803acba66be93', 0, 0, '', 0, 0, '2023-08-28 13:50:45', '2023-08-28 13:50:55', '{\"checkout-personal-information-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-addresses-step\":{\"step_is_reachable\":true,\"step_is_complete\":true,\"use_same_address\":true},\"checkout-delivery-step\":{\"step_is_reachable\":true,\"step_is_complete\":true},\"checkout-payment-step\":{\"step_is_reachable\":true,\"step_is_complete\":false},\"checksum\":\"2499a8e41363d69605634ee5e6cdf9aca787e2c1\"}'); DROP TABLE IF EXISTS `ps_cart_cart_rule`; CREATE TABLE `ps_cart_cart_rule` ( @@ -2466,7 +2321,7 @@ CREATE TABLE `ps_cart_cart_rule` ( `id_cart_rule` int(10) unsigned NOT NULL, PRIMARY KEY (`id_cart`,`id_cart_rule`), KEY `id_cart_rule` (`id_cart_rule`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_product`; @@ -2482,7 +2337,7 @@ CREATE TABLE `ps_cart_product` ( PRIMARY KEY (`id_cart`,`id_product`,`id_product_attribute`,`id_customization`,`id_address_delivery`), KEY `id_product_attribute` (`id_product_attribute`), KEY `id_cart_order` (`id_cart`,`date_add`,`id_product`,`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cart_product` (`id_cart`, `id_product`, `id_address_delivery`, `id_shop`, `id_product_attribute`, `id_customization`, `quantity`, `date_add`) VALUES (1, 1, 3, 1, 1, 0, 1, '0000-00-00 00:00:00'), @@ -2492,29 +2347,7 @@ INSERT INTO `ps_cart_product` (`id_cart`, `id_product`, `id_address_delivery`, ` (3, 16, 3, 1, 28, 0, 1, '0000-00-00 00:00:00'), (4, 16, 3, 1, 29, 0, 1, '0000-00-00 00:00:00'), (5, 10, 3, 1, 25, 0, 1, '0000-00-00 00:00:00'), -(6, 2, 7, 2, 9, 0, 1, '2023-05-09 08:24:47'), -(7, 2, 7, 2, 9, 0, 1, '2023-05-15 09:56:39'), -(8, 2, 7, 2, 9, 0, 1, '2023-05-15 09:58:01'), -(9, 2, 7, 2, 9, 0, 1, '2023-05-15 09:58:22'), -(10, 2, 7, 2, 9, 0, 1, '2023-05-15 09:58:43'), -(11, 2, 7, 2, 9, 0, 1, '2023-05-15 09:59:08'), -(12, 2, 7, 2, 9, 0, 1, '2023-05-15 10:00:45'), -(13, 2, 7, 2, 9, 0, 1, '2023-05-15 10:00:51'), -(14, 2, 7, 2, 9, 0, 1, '2023-05-15 10:02:07'), -(15, 2, 7, 2, 9, 0, 1, '2023-05-15 10:02:16'), -(16, 2, 7, 2, 9, 0, 1, '2023-05-15 10:03:09'), -(17, 2, 7, 2, 9, 0, 1, '2023-05-15 10:03:30'), -(18, 2, 7, 2, 9, 0, 1, '2023-05-15 10:03:52'), -(19, 2, 7, 2, 9, 0, 1, '2023-05-15 10:04:14'), -(20, 2, 7, 2, 9, 0, 4, '2023-05-15 10:11:07'), -(21, 2, 7, 2, 9, 0, 4, '2023-05-15 10:25:04'), -(22, 2, 7, 2, 9, 0, 4, '2023-05-15 10:26:08'), -(23, 2, 7, 2, 9, 0, 4, '2023-05-15 10:26:57'), -(24, 2, 7, 2, 9, 0, 4, '2023-05-15 10:27:43'), -(25, 2, 7, 2, 9, 0, 4, '2023-05-15 10:28:46'), -(26, 2, 7, 2, 9, 0, 4, '2023-05-15 10:29:22'), -(27, 2, 7, 2, 9, 0, 4, '2023-05-15 10:30:11'), -(28, 3, 10, 1, 13, 0, 3, '2023-08-28 11:54:59'); +(6, 4, 7, 1, 16, 0, 4, '2023-08-28 13:50:45'); DROP TABLE IF EXISTS `ps_cart_rule`; CREATE TABLE `ps_cart_rule` ( @@ -2526,29 +2359,29 @@ CREATE TABLE `ps_cart_rule` ( `quantity` int(10) unsigned NOT NULL DEFAULT '0', `quantity_per_user` int(10) unsigned NOT NULL DEFAULT '0', `priority` int(10) unsigned NOT NULL DEFAULT '1', - `partial_use` tinyint(3) unsigned NOT NULL DEFAULT '0', + `partial_use` tinyint(1) unsigned NOT NULL DEFAULT '0', `code` varchar(254) NOT NULL, `minimum_amount` decimal(20,6) NOT NULL DEFAULT '0.000000', `minimum_amount_tax` tinyint(1) NOT NULL DEFAULT '0', `minimum_amount_currency` int(10) unsigned NOT NULL DEFAULT '0', `minimum_amount_shipping` tinyint(1) NOT NULL DEFAULT '0', - `country_restriction` tinyint(3) unsigned NOT NULL DEFAULT '0', - `carrier_restriction` tinyint(3) unsigned NOT NULL DEFAULT '0', - `group_restriction` tinyint(3) unsigned NOT NULL DEFAULT '0', - `cart_rule_restriction` tinyint(3) unsigned NOT NULL DEFAULT '0', - `product_restriction` tinyint(3) unsigned NOT NULL DEFAULT '0', - `shop_restriction` tinyint(3) unsigned NOT NULL DEFAULT '0', + `country_restriction` tinyint(1) unsigned NOT NULL DEFAULT '0', + `carrier_restriction` tinyint(1) unsigned NOT NULL DEFAULT '0', + `group_restriction` tinyint(1) unsigned NOT NULL DEFAULT '0', + `cart_rule_restriction` tinyint(1) unsigned NOT NULL DEFAULT '0', + `product_restriction` tinyint(1) unsigned NOT NULL DEFAULT '0', + `shop_restriction` tinyint(1) unsigned NOT NULL DEFAULT '0', `free_shipping` tinyint(1) NOT NULL DEFAULT '0', `reduction_percent` decimal(5,2) NOT NULL DEFAULT '0.00', `reduction_amount` decimal(20,6) NOT NULL DEFAULT '0.000000', - `reduction_tax` tinyint(3) unsigned NOT NULL DEFAULT '0', + `reduction_tax` tinyint(1) unsigned NOT NULL DEFAULT '0', `reduction_currency` int(10) unsigned NOT NULL DEFAULT '0', - `reduction_product` int(11) NOT NULL DEFAULT '0', - `reduction_exclude_special` tinyint(3) unsigned NOT NULL DEFAULT '0', + `reduction_product` int(10) NOT NULL DEFAULT '0', + `reduction_exclude_special` tinyint(1) unsigned NOT NULL DEFAULT '0', `gift_product` int(10) unsigned NOT NULL DEFAULT '0', `gift_product_attribute` int(10) unsigned NOT NULL DEFAULT '0', - `highlight` tinyint(3) unsigned NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `highlight` tinyint(1) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_cart_rule`), @@ -2558,7 +2391,7 @@ CREATE TABLE `ps_cart_rule` ( KEY `group_restriction_2` (`group_restriction`,`active`,`highlight`,`date_to`), KEY `date_from` (`date_from`), KEY `date_to` (`date_to`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_carrier`; @@ -2566,7 +2399,7 @@ CREATE TABLE `ps_cart_rule_carrier` ( `id_cart_rule` int(10) unsigned NOT NULL, `id_carrier` int(10) unsigned NOT NULL, PRIMARY KEY (`id_cart_rule`,`id_carrier`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_combination`; @@ -2576,7 +2409,7 @@ CREATE TABLE `ps_cart_rule_combination` ( PRIMARY KEY (`id_cart_rule_1`,`id_cart_rule_2`), KEY `id_cart_rule_1` (`id_cart_rule_1`), KEY `id_cart_rule_2` (`id_cart_rule_2`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_country`; @@ -2584,7 +2417,7 @@ CREATE TABLE `ps_cart_rule_country` ( `id_cart_rule` int(10) unsigned NOT NULL, `id_country` int(10) unsigned NOT NULL, PRIMARY KEY (`id_cart_rule`,`id_country`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_group`; @@ -2592,7 +2425,7 @@ CREATE TABLE `ps_cart_rule_group` ( `id_cart_rule` int(10) unsigned NOT NULL, `id_group` int(10) unsigned NOT NULL, PRIMARY KEY (`id_cart_rule`,`id_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_lang`; @@ -2601,7 +2434,7 @@ CREATE TABLE `ps_cart_rule_lang` ( `id_lang` int(10) unsigned NOT NULL, `name` varchar(254) NOT NULL, PRIMARY KEY (`id_cart_rule`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_product_rule`; @@ -2610,7 +2443,7 @@ CREATE TABLE `ps_cart_rule_product_rule` ( `id_product_rule_group` int(10) unsigned NOT NULL, `type` enum('products','categories','attributes','manufacturers','suppliers') NOT NULL, PRIMARY KEY (`id_product_rule`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_product_rule_group`; @@ -2619,7 +2452,7 @@ CREATE TABLE `ps_cart_rule_product_rule_group` ( `id_cart_rule` int(10) unsigned NOT NULL, `quantity` int(10) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id_product_rule_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_product_rule_value`; @@ -2627,7 +2460,7 @@ CREATE TABLE `ps_cart_rule_product_rule_value` ( `id_product_rule` int(10) unsigned NOT NULL, `id_item` int(10) unsigned NOT NULL, PRIMARY KEY (`id_product_rule`,`id_item`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cart_rule_shop`; @@ -2635,7 +2468,7 @@ CREATE TABLE `ps_cart_rule_shop` ( `id_cart_rule` int(10) unsigned NOT NULL, `id_shop` int(10) unsigned NOT NULL, PRIMARY KEY (`id_cart_rule`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_category`; @@ -2646,7 +2479,7 @@ CREATE TABLE `ps_category` ( `level_depth` tinyint(3) unsigned NOT NULL DEFAULT '0', `nleft` int(10) unsigned NOT NULL DEFAULT '0', `nright` int(10) unsigned NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, `position` int(10) unsigned NOT NULL DEFAULT '0', @@ -2658,18 +2491,18 @@ CREATE TABLE `ps_category` ( KEY `nright` (`nright`), KEY `activenleft` (`active`,`nleft`), KEY `activenright` (`active`,`nright`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_category` (`id_category`, `id_parent`, `id_shop_default`, `level_depth`, `nleft`, `nright`, `active`, `date_add`, `date_upd`, `position`, `is_root_category`) VALUES -(1, 0, 1, 0, 1, 18, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0, 0), -(2, 1, 1, 1, 2, 17, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0, 1), -(3, 2, 1, 2, 3, 8, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(4, 3, 1, 3, 4, 5, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1, 0), -(5, 3, 1, 3, 6, 7, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38', 2, 0), -(6, 2, 1, 2, 9, 14, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38', 2, 0), -(7, 6, 1, 3, 10, 11, 1, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 1, 0), -(8, 6, 1, 3, 12, 13, 1, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 2, 0), -(9, 2, 1, 2, 15, 16, 1, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3, 0); +(1, 0, 1, 0, 1, 18, 1, '2023-08-28 13:26:17', '2023-08-28 13:26:17', 0, 0), +(2, 1, 1, 1, 2, 17, 1, '2023-08-28 13:26:17', '2023-08-28 13:26:17', 0, 1), +(3, 2, 1, 2, 3, 8, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 0), +(4, 3, 1, 3, 4, 5, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 0), +(5, 3, 1, 3, 6, 7, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(6, 2, 1, 2, 9, 14, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(7, 6, 1, 3, 10, 11, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 0), +(8, 6, 1, 3, 12, 13, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1, 0), +(9, 2, 1, 2, 15, 16, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 2, 0); DROP TABLE IF EXISTS `ps_category_group`; CREATE TABLE `ps_category_group` ( @@ -2678,7 +2511,7 @@ CREATE TABLE `ps_category_group` ( PRIMARY KEY (`id_category`,`id_group`), KEY `id_category` (`id_category`), KEY `id_group` (`id_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_category_group` (`id_category`, `id_group`) VALUES (1, 1), @@ -2713,7 +2546,7 @@ INSERT INTO `ps_category_group` (`id_category`, `id_group`) VALUES DROP TABLE IF EXISTS `ps_category_lang`; CREATE TABLE `ps_category_lang` ( `id_category` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, `name` varchar(128) NOT NULL, `description` text, @@ -2724,63 +2557,36 @@ CREATE TABLE `ps_category_lang` ( `meta_description` varchar(512) DEFAULT NULL, PRIMARY KEY (`id_category`,`id_shop`,`id_lang`), KEY `category_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_category_lang` (`id_category`, `id_shop`, `id_lang`, `name`, `description`, `additional_description`, `link_rewrite`, `meta_title`, `meta_keywords`, `meta_description`) VALUES (1, 1, 1, 'Root', '', '', 'root', '', '', ''), -(1, 1, 2, 'Stammverzeichnis', '', '', 'stammverzeichnis', '', '', ''), -(1, 1, 3, 'Root', '', '', 'root', '', '', ''), -(1, 2, 1, 'Root', '', '', 'root', '', '', ''), -(1, 2, 2, 'Stammverzeichnis', '', '', 'stammverzeichnis', '', '', ''), -(1, 2, 3, 'Root', '', '', 'root', '', '', ''), +(1, 1, 2, 'Root', '', '', 'root', '', '', ''), +(1, 1, 3, 'Stammverzeichnis', '', '', 'stammverzeichnis', '', '', ''), (2, 1, 1, 'Home', '', '', 'home', '', '', ''), -(2, 1, 2, 'Startseite', '', '', 'startseite', '', '', ''), -(2, 1, 3, 'Home', '', '', 'home', '', '', ''), -(2, 2, 1, 'Home', '', '', 'home', '', '', ''), -(2, 2, 2, 'Startseite', '', '', 'startseite', '', '', ''), -(2, 2, 3, 'Home', '', '', 'home', '', '', ''), +(2, 1, 2, 'Home', '', '', 'home', '', '', ''), +(2, 1, 3, 'Startseite', '', '', 'startseite', '', '', ''), (3, 1, 1, 'Clothes', '

Discover our favorites fashionable discoveries, a selection of cool items to integrate in your wardrobe. Compose a unique style with personality which matches your own.

', '', 'clothes', '', '', ''), (3, 1, 2, 'Clothes', '

Discover our favorites fashionable discoveries, a selection of cool items to integrate in your wardrobe. Compose a unique style with personality which matches your own.

', '', 'clothes', '', '', ''), (3, 1, 3, 'Clothes', '

Discover our favorites fashionable discoveries, a selection of cool items to integrate in your wardrobe. Compose a unique style with personality which matches your own.

', '', 'clothes', '', '', ''), -(3, 2, 1, 'Clothes', '

Discover our favorites fashionable discoveries, a selection of cool items to integrate in your wardrobe. Compose a unique style with personality which matches your own.

', '', 'clothes', '', '', ''), -(3, 2, 2, 'Clothes', '

Discover our favorites fashionable discoveries, a selection of cool items to integrate in your wardrobe. Compose a unique style with personality which matches your own.

', '', 'clothes', '', '', ''), -(3, 2, 3, 'Clothes', '

Discover our favorites fashionable discoveries, a selection of cool items to integrate in your wardrobe. Compose a unique style with personality which matches your own.

', '', 'clothes', '', '', ''), (4, 1, 1, 'Men', '

T-shirts, sweaters, hoodies and men\'s accessories. From basics to original creations, for every style.

', '', 'men', '', '', ''), (4, 1, 2, 'Men', '

T-shirts, sweaters, hoodies and men\'s accessories. From basics to original creations, for every style.

', '', 'men', '', '', ''), (4, 1, 3, 'Men', '

T-shirts, sweaters, hoodies and men\'s accessories. From basics to original creations, for every style.

', '', 'men', '', '', ''), -(4, 2, 1, 'Men', '

T-shirts, sweaters, hoodies and men\'s accessories. From basics to original creations, for every style.

', '', 'men', '', '', ''), -(4, 2, 2, 'Men', '

T-shirts, sweaters, hoodies and men\'s accessories. From basics to original creations, for every style.

', '', 'men', '', '', ''), -(4, 2, 3, 'Men', '

T-shirts, sweaters, hoodies and men\'s accessories. From basics to original creations, for every style.

', '', 'men', '', '', ''), (5, 1, 1, 'Women', '

T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, for every style.

', '', 'women', '', '', ''), (5, 1, 2, 'Women', '

T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, for every style.

', '', 'women', '', '', ''), (5, 1, 3, 'Women', '

T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, for every style.

', '', 'women', '', '', ''), -(5, 2, 1, 'Women', '

T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, for every style.

', '', 'women', '', '', ''), -(5, 2, 2, 'Women', '

T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, for every style.

', '', 'women', '', '', ''), -(5, 2, 3, 'Women', '

T-shirts, sweaters, hoodies and women\'s accessories. From basics to original creations, for every style.

', '', 'women', '', '', ''), (6, 1, 1, 'Accessories', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), -(6, 1, 2, 'Zubehör', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), -(6, 1, 3, 'Accessoires', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), -(6, 2, 1, 'Accessories', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), -(6, 2, 2, 'Zubehör', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), -(6, 2, 3, 'Accessoires', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), +(6, 1, 2, 'Accessoires', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), +(6, 1, 3, 'Zubehör', '

Items and accessories for your desk, kitchen or living room. Make your house a home with our eye-catching designs.

', '', 'accessories', '', '', ''), (7, 1, 1, 'Stationery', '

Notebooks, agendas, office accessories and more. Everything you need to combine the pleasant and the useful, either at work or at home.

', '', 'stationery', '', '', ''), (7, 1, 2, 'Stationery', '

Notebooks, agendas, office accessories and more. Everything you need to combine the pleasant and the useful, either at work or at home.

', '', 'stationery', '', '', ''), (7, 1, 3, 'Stationery', '

Notebooks, agendas, office accessories and more. Everything you need to combine the pleasant and the useful, either at work or at home.

', '', 'stationery', '', '', ''), -(7, 2, 1, 'Stationery', '

Notebooks, agendas, office accessories and more. Everything you need to combine the pleasant and the useful, either at work or at home.

', '', 'stationery', '', '', ''), -(7, 2, 2, 'Stationery', '

Notebooks, agendas, office accessories and more. Everything you need to combine the pleasant and the useful, either at work or at home.

', '', 'stationery', '', '', ''), -(7, 2, 3, 'Stationery', '

Notebooks, agendas, office accessories and more. Everything you need to combine the pleasant and the useful, either at work or at home.

', '', 'stationery', '', '', ''), (8, 1, 1, 'Home Accessories', '

Details matter! Liven up your interior with our selection of home accessories.

', '', 'home-accessories', '', '', ''), (8, 1, 2, 'Home Accessories', '

Details matter! Liven up your interior with our selection of home accessories.

', '', 'home-accessories', '', '', ''), (8, 1, 3, 'Home Accessories', '

Details matter! Liven up your interior with our selection of home accessories.

', '', 'home-accessories', '', '', ''), -(8, 2, 1, 'Home Accessories', '

Details matter! Liven up your interior with our selection of home accessories.

', '', 'home-accessories', '', '', ''), -(8, 2, 2, 'Home Accessories', '

Details matter! Liven up your interior with our selection of home accessories.

', '', 'home-accessories', '', '', ''), -(8, 2, 3, 'Home Accessories', '

Details matter! Liven up your interior with our selection of home accessories.

', '', 'home-accessories', '', '', ''), (9, 1, 1, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''), (9, 1, 2, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''), -(9, 1, 3, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''), -(9, 2, 1, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''), -(9, 2, 2, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''), -(9, 2, 3, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''); +(9, 1, 3, 'Art', '

Framed poster and vector images, all you need to give personality to your walls or bring your creative projects to life.

', '', 'art', '', '', ''); DROP TABLE IF EXISTS `ps_category_product`; CREATE TABLE `ps_category_product` ( @@ -2790,7 +2596,7 @@ CREATE TABLE `ps_category_product` ( PRIMARY KEY (`id_category`,`id_product`), KEY `id_product` (`id_product`), KEY `id_category` (`id_category`,`position`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_category_product` (`id_category`, `id_product`, `position`) VALUES (2, 1, 1), @@ -2852,37 +2658,28 @@ CREATE TABLE `ps_category_shop` ( `id_shop` int(11) NOT NULL, `position` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_category`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_category_shop` (`id_category`, `id_shop`, `position`) VALUES (1, 1, 0), -(1, 2, 0), (2, 1, 0), -(2, 2, 0), (3, 1, 0), -(3, 2, 1), (4, 1, 0), -(4, 2, 1), (5, 1, 1), -(5, 2, 2), (6, 1, 1), -(6, 2, 2), (7, 1, 0), -(7, 2, 1), (8, 1, 1), -(8, 2, 2), -(9, 1, 2), -(9, 2, 3); +(9, 1, 2); DROP TABLE IF EXISTS `ps_cms`; CREATE TABLE `ps_cms` ( `id_cms` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_cms_category` int(10) unsigned NOT NULL, `position` int(10) unsigned NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', - `indexation` tinyint(3) unsigned NOT NULL DEFAULT '1', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', + `indexation` tinyint(1) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id_cms`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms` (`id_cms`, `id_cms_category`, `position`, `active`, `indexation`) VALUES (1, 1, 0, 1, 0), @@ -2896,16 +2693,16 @@ CREATE TABLE `ps_cms_category` ( `id_cms_category` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_parent` int(10) unsigned NOT NULL, `level_depth` tinyint(3) unsigned NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, `position` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_cms_category`), KEY `category_parent` (`id_parent`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms_category` (`id_cms_category`, `id_parent`, `level_depth`, `active`, `date_add`, `date_upd`, `position`) VALUES -(1, 0, 1, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0); +(1, 0, 1, 1, '2023-08-28 13:26:17', '2023-08-28 13:26:17', 0); DROP TABLE IF EXISTS `ps_cms_category_lang`; CREATE TABLE `ps_cms_category_lang` ( @@ -2920,27 +2717,23 @@ CREATE TABLE `ps_cms_category_lang` ( `meta_description` varchar(512) DEFAULT NULL, PRIMARY KEY (`id_cms_category`,`id_shop`,`id_lang`), KEY `category_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms_category_lang` (`id_cms_category`, `id_lang`, `id_shop`, `name`, `description`, `link_rewrite`, `meta_title`, `meta_keywords`, `meta_description`) VALUES (1, 1, 1, 'Home', '', 'home', '', '', ''), -(1, 2, 1, 'Startseite', '', 'startseite', '', '', ''), -(1, 3, 1, 'Home', '', 'home', '', '', ''), -(1, 1, 2, 'Home', '', 'home', '', '', ''), -(1, 2, 2, 'Startseite', '', 'startseite', '', '', ''), -(1, 3, 2, 'Home', '', 'home', '', '', ''); +(1, 2, 1, 'Home', '', 'home', '', '', ''), +(1, 3, 1, 'Startseite', '', 'startseite', '', '', ''); DROP TABLE IF EXISTS `ps_cms_category_shop`; CREATE TABLE `ps_cms_category_shop` ( `id_cms_category` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_cms_category`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms_category_shop` (`id_cms_category`, `id_shop`) VALUES -(1, 1), -(1, 2); +(1, 1); DROP TABLE IF EXISTS `ps_cms_lang`; CREATE TABLE `ps_cms_lang` ( @@ -2954,48 +2747,33 @@ CREATE TABLE `ps_cms_lang` ( `content` longtext, `link_rewrite` varchar(128) NOT NULL, PRIMARY KEY (`id_cms`,`id_shop`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms_lang` (`id_cms`, `id_lang`, `id_shop`, `meta_title`, `head_seo_title`, `meta_description`, `meta_keywords`, `content`, `link_rewrite`) VALUES (1, 1, 1, 'Delivery', '', 'Our terms and conditions of delivery', 'conditions, delivery, delay, shipment, pack', '

Shipments and returns

Your pack shipment

Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.

Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.

Boxes are amply sized and your items are well-protected.

', 'delivery'), (1, 2, 1, 'Delivery', '', 'Our terms and conditions of delivery', 'conditions, delivery, delay, shipment, pack', '

Shipments and returns

Your pack shipment

Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.

Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.

Boxes are amply sized and your items are well-protected.

', 'delivery'), (1, 3, 1, 'Delivery', '', 'Our terms and conditions of delivery', 'conditions, delivery, delay, shipment, pack', '

Shipments and returns

Your pack shipment

Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.

Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.

Boxes are amply sized and your items are well-protected.

', 'delivery'), -(1, 1, 2, 'Delivery', '', 'Our terms and conditions of delivery', 'conditions, delivery, delay, shipment, pack', '

Shipments and returns

Your pack shipment

Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.

Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.

Boxes are amply sized and your items are well-protected.

', 'delivery'), -(1, 2, 2, 'Delivery', '', 'Our terms and conditions of delivery', 'conditions, delivery, delay, shipment, pack', '

Shipments and returns

Your pack shipment

Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.

Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.

Boxes are amply sized and your items are well-protected.

', 'delivery'), -(1, 3, 2, 'Delivery', '', 'Our terms and conditions of delivery', 'conditions, delivery, delay, shipment, pack', '

Shipments and returns

Your pack shipment

Packages are generally dispatched within 2 days after receipt of payment and are shipped via UPS with tracking and drop-off without signature. If you prefer delivery by UPS Extra with required signature, an additional cost will be applied, so please contact us before choosing this method. Whichever shipment choice you make, we will provide you with a link to track your package online.

Shipping fees include handling and packing fees as well as postage costs. Handling fees are fixed, whereas transport fees vary according to total weight of the shipment. We advise you to group your items in one order. We cannot group two distinct orders placed separately, and shipping fees will apply to each of them. Your package will be dispatched at your own risk, but special care is taken to protect fragile objects.

Boxes are amply sized and your items are well-protected.

', 'delivery'), (2, 1, 1, 'Legal Notice', '', 'Legal notice', 'notice, legal, credits', '

Legal

Credits

Concept and production:

This Online store was created using Prestashop Shopping Cart Software,check out PrestaShop\'s ecommerce blog for news and advices about selling online and running your ecommerce website.

', 'legal-notice'), (2, 2, 1, 'Legal Notice', '', 'Legal notice', 'notice, legal, credits', '

Legal

Credits

Concept and production:

This Online store was created using Prestashop Shopping Cart Software,check out PrestaShop\'s ecommerce blog for news and advices about selling online and running your ecommerce website.

', 'legal-notice'), (2, 3, 1, 'Legal Notice', '', 'Legal notice', 'notice, legal, credits', '

Legal

Credits

Concept and production:

This Online store was created using Prestashop Shopping Cart Software,check out PrestaShop\'s ecommerce blog for news and advices about selling online and running your ecommerce website.

', 'legal-notice'), -(2, 1, 2, 'Legal Notice', '', 'Legal notice', 'notice, legal, credits', '

Legal

Credits

Concept and production:

This Online store was created using Prestashop Shopping Cart Software,check out PrestaShop\'s ecommerce blog for news and advices about selling online and running your ecommerce website.

', 'legal-notice'), -(2, 2, 2, 'Legal Notice', '', 'Legal notice', 'notice, legal, credits', '

Legal

Credits

Concept and production:

This Online store was created using Prestashop Shopping Cart Software,check out PrestaShop\'s ecommerce blog for news and advices about selling online and running your ecommerce website.

', 'legal-notice'), -(2, 3, 2, 'Legal Notice', '', 'Legal notice', 'notice, legal, credits', '

Legal

Credits

Concept and production:

This Online store was created using Prestashop Shopping Cart Software,check out PrestaShop\'s ecommerce blog for news and advices about selling online and running your ecommerce website.

', 'legal-notice'), (3, 1, 1, 'Terms and conditions of use', '', 'Our terms and conditions of use', 'conditions, terms, use, sell', '

Terms and conditions of use

\n

Rule 1

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\n

Rule 2

\n

Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

\n

Rule 3

\n

Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

', 'terms-and-conditions-of-use'), (3, 2, 1, 'Terms and conditions of use', '', 'Our terms and conditions of use', 'conditions, terms, use, sell', '

Terms and conditions of use

\n

Rule 1

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\n

Rule 2

\n

Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

\n

Rule 3

\n

Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

', 'terms-and-conditions-of-use'), (3, 3, 1, 'Terms and conditions of use', '', 'Our terms and conditions of use', 'conditions, terms, use, sell', '

Terms and conditions of use

\n

Rule 1

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\n

Rule 2

\n

Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

\n

Rule 3

\n

Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

', 'terms-and-conditions-of-use'), -(3, 1, 2, 'Terms and conditions of use', '', 'Our terms and conditions of use', 'conditions, terms, use, sell', '

Terms and conditions of use

\n

Rule 1

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\n

Rule 2

\n

Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

\n

Rule 3

\n

Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

', 'terms-and-conditions-of-use'), -(3, 2, 2, 'Terms and conditions of use', '', 'Our terms and conditions of use', 'conditions, terms, use, sell', '

Terms and conditions of use

\n

Rule 1

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\n

Rule 2

\n

Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

\n

Rule 3

\n

Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

', 'terms-and-conditions-of-use'), -(3, 3, 2, 'Terms and conditions of use', '', 'Our terms and conditions of use', 'conditions, terms, use, sell', '

Terms and conditions of use

\n

Rule 1

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

\n

Rule 2

\n

Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

\n

Rule 3

\n

Tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniamю

', 'terms-and-conditions-of-use'), (4, 1, 1, 'About us', '', 'Learn more about us', 'about us, informations', '

About us

\n
\n
\n
\n

Our company

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididun.

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet conse ctetur adipisicing elit.

\n
    \n
  • Top quality products
    • \n
  • Best customer service
    • \n
  • 30-days money back guarantee
    • \n
\n
\n
\n
\n
\n

Our team

\n

Lorem set sint occaecat cupidatat non

\n

Eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.

\n
\n
\n
\n
\n

Testimonials

\n
\n
“Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.”
\n
\n

Lorem ipsum dolor sit

\n
\n
“Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod.”
\n
\n

Ipsum dolor sit

\n
\n
\n
', 'about-us'), (4, 2, 1, 'About us', '', 'Learn more about us', 'about us, informations', '

About us

\n
\n
\n
\n

Our company

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididun.

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet conse ctetur adipisicing elit.

\n
    \n
  • Top quality products
    • \n
  • Best customer service
    • \n
  • 30-days money back guarantee
    • \n
\n
\n
\n
\n
\n

Our team

\n

Lorem set sint occaecat cupidatat non

\n

Eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.

\n
\n
\n
\n
\n

Testimonials

\n
\n
“Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.”
\n
\n

Lorem ipsum dolor sit

\n
\n
“Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod.”
\n
\n

Ipsum dolor sit

\n
\n
\n
', 'about-us'), (4, 3, 1, 'About us', '', 'Learn more about us', 'about us, informations', '

About us

\n
\n
\n
\n

Our company

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididun.

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet conse ctetur adipisicing elit.

\n
    \n
  • Top quality products
    • \n
  • Best customer service
    • \n
  • 30-days money back guarantee
    • \n
\n
\n
\n
\n
\n

Our team

\n

Lorem set sint occaecat cupidatat non

\n

Eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.

\n
\n
\n
\n
\n

Testimonials

\n
\n
“Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.”
\n
\n

Lorem ipsum dolor sit

\n
\n
“Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod.”
\n
\n

Ipsum dolor sit

\n
\n
\n
', 'about-us'), -(4, 1, 2, 'About us', '', 'Learn more about us', 'about us, informations', '

About us

\n
\n
\n
\n

Our company

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididun.

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet conse ctetur adipisicing elit.

\n
    \n
  • Top quality products
    • \n
  • Best customer service
    • \n
  • 30-days money back guarantee
    • \n
\n
\n
\n
\n
\n

Our team

\n

Lorem set sint occaecat cupidatat non

\n

Eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.

\n
\n
\n
\n
\n

Testimonials

\n
\n
“Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.”
\n
\n

Lorem ipsum dolor sit

\n
\n
“Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod.”
\n
\n

Ipsum dolor sit

\n
\n
\n
', 'about-us'), -(4, 2, 2, 'About us', '', 'Learn more about us', 'about us, informations', '

About us

\n
\n
\n
\n

Our company

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididun.

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet conse ctetur adipisicing elit.

\n
    \n
  • Top quality products
    • \n
  • Best customer service
    • \n
  • 30-days money back guarantee
    • \n
\n
\n
\n
\n
\n

Our team

\n

Lorem set sint occaecat cupidatat non

\n

Eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.

\n
\n
\n
\n
\n

Testimonials

\n
\n
“Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.”
\n
\n

Lorem ipsum dolor sit

\n
\n
“Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod.”
\n
\n

Ipsum dolor sit

\n
\n
\n
', 'about-us'), -(4, 3, 2, 'About us', '', 'Learn more about us', 'about us, informations', '

About us

\n
\n
\n
\n

Our company

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididun.

\n

Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Lorem ipsum dolor sit amet conse ctetur adipisicing elit.

\n
    \n
  • Top quality products
    • \n
  • Best customer service
    • \n
  • 30-days money back guarantee
    • \n
\n
\n
\n
\n
\n

Our team

\n

Lorem set sint occaecat cupidatat non

\n

Eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo.

\n
\n
\n
\n
\n

Testimonials

\n
\n
“Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim.”
\n
\n

Lorem ipsum dolor sit

\n
\n
“Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Lorem ipsum dolor sit amet conse ctetur adipisicing elit. Lorem ipsum dolor sit amet conse ctetur adipisicing elit, sed do eiusmod.”
\n
\n

Ipsum dolor sit

\n
\n
\n
', 'about-us'), (5, 1, 1, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'), (5, 2, 1, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'), -(5, 3, 1, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'), -(5, 1, 2, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'), -(5, 2, 2, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'), -(5, 3, 2, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'); +(5, 3, 1, 'Secure payment', '', 'Our secure payment method', 'secure payment, ssl, visa, mastercard, paypal', '

Secure payment

\r\n

Our secure payment

With SSL

\r\n

Using Visa/Mastercard/Paypal

About this service

', 'secure-payment'); DROP TABLE IF EXISTS `ps_cms_role`; CREATE TABLE `ps_cms_role` ( - `id_cms_role` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_cms_role` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(50) NOT NULL, - `id_cms` int(10) unsigned NOT NULL, + `id_cms` int(11) unsigned NOT NULL, PRIMARY KEY (`id_cms_role`,`id_cms`), UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms_role` (`id_cms_role`, `name`, `id_cms`) VALUES (1, 'LEGAL_CONDITIONS', 3), @@ -3003,39 +2781,34 @@ INSERT INTO `ps_cms_role` (`id_cms_role`, `name`, `id_cms`) VALUES DROP TABLE IF EXISTS `ps_cms_role_lang`; CREATE TABLE `ps_cms_role_lang` ( - `id_cms_role` int(10) unsigned NOT NULL, - `id_lang` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_cms_role` int(11) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `name` varchar(128) DEFAULT NULL, PRIMARY KEY (`id_cms_role`,`id_lang`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_cms_shop`; CREATE TABLE `ps_cms_shop` ( - `id_cms` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_cms` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_cms`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_cms_shop` (`id_cms`, `id_shop`) VALUES (1, 1), (2, 1), (3, 1), (4, 1), -(5, 1), -(1, 2), -(2, 2), -(3, 2), -(4, 2), -(5, 2); +(5, 1); DROP TABLE IF EXISTS `ps_configuration`; CREATE TABLE `ps_configuration` ( `id_configuration` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop_group` int(10) unsigned DEFAULT NULL, - `id_shop` int(10) unsigned DEFAULT NULL, + `id_shop_group` int(11) unsigned DEFAULT NULL, + `id_shop` int(11) unsigned DEFAULT NULL, `name` varchar(254) NOT NULL, `value` text, `date_add` datetime NOT NULL, @@ -3044,17 +2817,17 @@ CREATE TABLE `ps_configuration` ( KEY `name` (`name`), KEY `id_shop` (`id_shop`), KEY `id_shop_group` (`id_shop_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, `name`, `value`, `date_add`, `date_upd`) VALUES -(1, NULL, NULL, 'PS_LANG_DEFAULT', '1', '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(2, NULL, NULL, 'PS_VERSION_DB', '8.0.1', '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(3, NULL, NULL, 'PS_INSTALL_VERSION', '8.0.1', '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(4, NULL, NULL, 'PS_CARRIER_DEFAULT', '1', '2023-05-02 12:16:56', '2023-05-02 12:16:56'), -(5, NULL, NULL, 'PS_GROUP_FEATURE_ACTIVE', '1', '2023-05-02 12:16:56', '2023-05-02 12:16:56'), +(1, NULL, NULL, 'PS_LANG_DEFAULT', '1', '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(2, NULL, NULL, 'PS_VERSION_DB', '8.0.1', '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(3, NULL, NULL, 'PS_INSTALL_VERSION', '8.0.1', '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(4, NULL, NULL, 'PS_CARRIER_DEFAULT', '1', '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(5, NULL, NULL, 'PS_GROUP_FEATURE_ACTIVE', '1', '2023-08-28 13:26:17', '2023-08-28 13:26:17'), (6, NULL, NULL, 'PS_CURRENCY_DEFAULT', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(7, NULL, NULL, 'PS_COUNTRY_DEFAULT', '17', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-08-28 11:52:30'), +(7, NULL, NULL, 'PS_COUNTRY_DEFAULT', '17', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(8, NULL, NULL, 'PS_REWRITING_SETTINGS', '1', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (9, NULL, NULL, 'PS_ORDER_OUT_OF_STOCK', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (10, NULL, NULL, 'PS_LAST_QTIES', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (11, NULL, NULL, 'PS_CONDITIONS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3075,7 +2848,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (26, NULL, NULL, 'PS_TAX', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (27, NULL, NULL, 'PS_SHOP_ENABLE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (28, NULL, NULL, 'PS_NB_DAYS_NEW_PRODUCT', '20', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(29, NULL, NULL, 'PS_SSL_ENABLED', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(29, NULL, NULL, 'PS_SSL_ENABLED', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (30, NULL, NULL, 'PS_WEIGHT_UNIT', 'kg', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (31, NULL, NULL, 'PS_BLOCK_CART_AJAX', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (32, NULL, NULL, 'PS_ORDER_RETURN', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3121,7 +2894,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (72, NULL, NULL, 'PS_PRICE_ROUND_MODE', '2', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (73, NULL, NULL, 'PS_1_3_2_UPDATE_DATE', '2011-12-27 10:20:42', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (74, NULL, NULL, 'PS_CONDITIONS_CMS_ID', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(75, NULL, NULL, 'PS_VOLUME_UNIT', 'L', '0000-00-00 00:00:00', '2023-05-08 16:58:43'), +(75, NULL, NULL, 'PS_VOLUME_UNIT', 'L', '0000-00-00 00:00:00', '2023-08-28 13:47:08'), (76, NULL, NULL, 'PS_CIPHER_ALGORITHM', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (77, NULL, NULL, 'PS_ATTRIBUTE_CATEGORY_DISPLAY', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (78, NULL, NULL, 'PS_CUSTOMER_SERVICE_FILE_UPLOAD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3135,8 +2908,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (86, NULL, NULL, 'PS_SMARTY_FORCE_COMPILE', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (87, NULL, NULL, 'PS_DISTANCE_UNIT', 'km', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (88, NULL, NULL, 'PS_STORES_DISPLAY_CMS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(89, NULL, NULL, 'SHOP_LOGO_WIDTH', '100', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(90, NULL, NULL, 'SHOP_LOGO_HEIGHT', '28', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(89, NULL, NULL, 'SHOP_LOGO_WIDTH', '100', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(90, NULL, NULL, 'SHOP_LOGO_HEIGHT', '28', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (91, NULL, NULL, 'EDITORIAL_IMAGE_WIDTH', '530', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (92, NULL, NULL, 'EDITORIAL_IMAGE_HEIGHT', '228', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (93, NULL, NULL, 'PS_STATSDATA_CUSTOMER_PAGESVIEWS', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3145,15 +2918,15 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (96, NULL, NULL, 'PS_GEOLOCATION_ENABLED', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (97, NULL, NULL, 'PS_ALLOWED_COUNTRIES', 'AF;ZA;AX;AL;DZ;DE;AD;AO;AI;AQ;AG;AN;SA;AR;AM;AW;AU;AT;AZ;BS;BH;BD;BB;BY;BE;BZ;BJ;BM;BT;BO;BA;BW;BV;BR;BN;BG;BF;MM;BI;KY;KH;CM;CA;CV;CF;CL;CN;CX;CY;CC;CO;KM;CG;CD;CK;KR;KP;CR;CI;HR;CU;DK;DJ;DM;EG;IE;SV;AE;EC;ER;ES;EE;ET;FK;FO;FJ;FI;FR;GA;GM;GE;GS;GH;GI;GR;GD;GL;GP;GU;GT;GG;GN;GQ;GW;GY;GF;HT;HM;HN;HK;HU;IM;MU;VG;VI;IN;ID;IR;IQ;IS;IL;IT;JM;JP;JE;JO;KZ;KE;KG;KI;KW;LA;LS;LV;LB;LR;LY;LI;LT;LU;MO;MK;MG;MY;MW;MV;ML;MT;MP;MA;MH;MQ;MR;YT;MX;FM;MD;MC;MN;ME;MS;MZ;NA;NR;NP;NI;NE;NG;NU;NF;NO;NC;NZ;IO;OM;UG;UZ;PK;PW;PS;PA;PG;PY;NL;PE;PH;PN;PL;PF;PR;PT;QA;DO;CZ;RE;RO;GB;RU;RW;EH;BL;KN;SM;MF;PM;VA;VC;LC;SB;WS;AS;ST;SN;RS;SC;SL;SG;SK;SI;SO;SD;LK;SE;CH;SR;SJ;SZ;SY;TJ;TW;TZ;TD;TF;TH;TL;TG;TK;TO;TT;TN;TM;TC;TR;TV;UA;UY;US;VU;VE;VN;WF;YE;ZM;ZW', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (98, NULL, NULL, 'PS_GEOLOCATION_BEHAVIOR', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(99, NULL, NULL, 'PS_LOCALE_LANGUAGE', 'en', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(100, NULL, NULL, 'PS_LOCALE_COUNTRY', 'GB', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(99, NULL, NULL, 'PS_LOCALE_LANGUAGE', 'en', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(100, NULL, NULL, 'PS_LOCALE_COUNTRY', 'GB', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (101, NULL, NULL, 'PS_ATTACHMENT_MAXIMUM_SIZE', '8', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (102, NULL, NULL, 'PS_SMARTY_CACHE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (103, NULL, NULL, 'PS_DIMENSION_UNIT', 'cm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (104, NULL, NULL, 'PS_GUEST_CHECKOUT_ENABLED', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(105, NULL, NULL, 'PS_DISPLAY_SUPPLIERS', NULL, '0000-00-00 00:00:00', '2023-08-28 11:40:31'), -(106, NULL, NULL, 'PS_DISPLAY_MANUFACTURERS', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), -(107, NULL, NULL, 'PS_DISPLAY_BEST_SELLERS', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(105, NULL, NULL, 'PS_DISPLAY_SUPPLIERS', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), +(106, NULL, NULL, 'PS_DISPLAY_MANUFACTURERS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), +(107, NULL, NULL, 'PS_DISPLAY_BEST_SELLERS', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (108, NULL, NULL, 'PS_CATALOG_MODE', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (109, NULL, NULL, 'PS_GEOLOCATION_WHITELIST', '127;::1;188.165.122;209.185.108;209.185.253;209.85.238;209.85.238.11;209.85.238.4;216.239.33.96;216.239.33.97;216.239.33.98;216.239.33.99;216.239.37.98;216.239.37.99;216.239.39.98;216.239.39.99;216.239.41.96;216.239.41.97;216.239.41.98;216.239.41.99;216.239.45.4;216.239.46;216.239.51.96;216.239.51.97;216.239.51.98;216.239.51.99;216.239.53.98;216.239.53.99;216.239.57.96;91.240.109;216.239.57.97;216.239.57.98;216.239.57.99;216.239.59.98;216.239.59.99;216.33.229.163;64.233.173.193;64.233.173.194;64.233.173.195;64.233.173.196;64.233.173.197;64.233.173.198;64.233.173.199;64.233.173.200;64.233.173.201;64.233.173.202;64.233.173.203;64.233.173.204;64.233.173.205;64.233.173.206;64.233.173.207;64.233.173.208;64.233.173.209;64.233.173.210;64.233.173.211;64.233.173.212;64.233.173.213;64.233.173.214;64.233.173.215;64.233.173.216;64.233.173.217;64.233.173.218;64.233.173.219;64.233.173.220;64.233.173.221;64.233.173.222;64.233.173.223;64.233.173.224;64.233.173.225;64.233.173.226;64.233.173.227;64.233.173.228;64.233.173.229;64.233.173.230;64.233.173.231;64.233.173.232;64.233.173.233;64.233.173.234;64.233.173.235;64.233.173.236;64.233.173.237;64.233.173.238;64.233.173.239;64.233.173.240;64.233.173.241;64.233.173.242;64.233.173.243;64.233.173.244;64.233.173.245;64.233.173.246;64.233.173.247;64.233.173.248;64.233.173.249;64.233.173.250;64.233.173.251;64.233.173.252;64.233.173.253;64.233.173.254;64.233.173.255;64.68.80;64.68.81;64.68.82;64.68.83;64.68.84;64.68.85;64.68.86;64.68.87;64.68.88;64.68.89;64.68.90.1;64.68.90.10;64.68.90.11;64.68.90.12;64.68.90.129;64.68.90.13;64.68.90.130;64.68.90.131;64.68.90.132;64.68.90.133;64.68.90.134;64.68.90.135;64.68.90.136;64.68.90.137;64.68.90.138;64.68.90.139;64.68.90.14;64.68.90.140;64.68.90.141;64.68.90.142;64.68.90.143;64.68.90.144;64.68.90.145;64.68.90.146;64.68.90.147;64.68.90.148;64.68.90.149;64.68.90.15;64.68.90.150;64.68.90.151;64.68.90.152;64.68.90.153;64.68.90.154;64.68.90.155;64.68.90.156;64.68.90.157;64.68.90.158;64.68.90.159;64.68.90.16;64.68.90.160;64.68.90.161;64.68.90.162;64.68.90.163;64.68.90.164;64.68.90.165;64.68.90.166;64.68.90.167;64.68.90.168;64.68.90.169;64.68.90.17;64.68.90.170;64.68.90.171;64.68.90.172;64.68.90.173;64.68.90.174;64.68.90.175;64.68.90.176;64.68.90.177;64.68.90.178;64.68.90.179;64.68.90.18;64.68.90.180;64.68.90.181;64.68.90.182;64.68.90.183;64.68.90.184;64.68.90.185;64.68.90.186;64.68.90.187;64.68.90.188;64.68.90.189;64.68.90.19;64.68.90.190;64.68.90.191;64.68.90.192;64.68.90.193;64.68.90.194;64.68.90.195;64.68.90.196;64.68.90.197;64.68.90.198;64.68.90.199;64.68.90.2;64.68.90.20;64.68.90.200;64.68.90.201;64.68.90.202;64.68.90.203;64.68.90.204;64.68.90.205;64.68.90.206;64.68.90.207;64.68.90.208;64.68.90.21;64.68.90.22;64.68.90.23;64.68.90.24;64.68.90.25;64.68.90.26;64.68.90.27;64.68.90.28;64.68.90.29;64.68.90.3;64.68.90.30;64.68.90.31;64.68.90.32;64.68.90.33;64.68.90.34;64.68.90.35;64.68.90.36;64.68.90.37;64.68.90.38;64.68.90.39;64.68.90.4;64.68.90.40;64.68.90.41;64.68.90.42;64.68.90.43;64.68.90.44;64.68.90.45;64.68.90.46;64.68.90.47;64.68.90.48;64.68.90.49;64.68.90.5;64.68.90.50;64.68.90.51;64.68.90.52;64.68.90.53;64.68.90.54;64.68.90.55;64.68.90.56;64.68.90.57;64.68.90.58;64.68.90.59;64.68.90.6;64.68.90.60;64.68.90.61;64.68.90.62;64.68.90.63;64.68.90.64;64.68.90.65;64.68.90.66;64.68.90.67;64.68.90.68;64.68.90.69;64.68.90.7;64.68.90.70;64.68.90.71;64.68.90.72;64.68.90.73;64.68.90.74;64.68.90.75;64.68.90.76;64.68.90.77;64.68.90.78;64.68.90.79;64.68.90.8;64.68.90.80;64.68.90.9;64.68.91;64.68.92;66.249.64;66.249.65;66.249.66;66.249.67;66.249.68;66.249.69;66.249.70;66.249.71;66.249.72;66.249.73;66.249.78;66.249.79;72.14.199;8.6.48', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (110, NULL, NULL, 'PS_LOGS_BY_EMAIL', '4', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3178,7 +2951,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (129, NULL, NULL, 'PS_OS_OUTOFSTOCK_UNPAID', '12', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (130, NULL, NULL, 'PS_OS_COD_VALIDATION', '13', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (131, NULL, NULL, 'PS_LEGACY_IMAGES', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(132, NULL, NULL, 'PS_IMAGE_QUALITY', 'png', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), +(132, NULL, NULL, 'PS_IMAGE_QUALITY', 'png', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (133, NULL, NULL, 'PS_PNG_QUALITY', '7', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (134, NULL, NULL, 'PS_JPEG_QUALITY', '90', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (135, NULL, NULL, 'PS_WEBP_QUALITY', '80', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3191,10 +2964,10 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (142, NULL, NULL, 'PS_FEATURE_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (143, NULL, NULL, 'PS_COMBINATION_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (144, NULL, NULL, 'PS_SPECIFIC_PRICE_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(145, NULL, NULL, 'PS_VIRTUAL_PROD_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '2023-05-02 12:18:39'), +(145, NULL, NULL, 'PS_VIRTUAL_PROD_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '2023-08-28 13:28:03'), (146, NULL, NULL, 'PS_CUSTOMIZATION_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (147, NULL, NULL, 'PS_CART_RULE_FEATURE_ACTIVE', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(148, NULL, NULL, 'PS_PACK_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '2023-05-02 12:18:39'), +(148, NULL, NULL, 'PS_PACK_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '2023-08-28 13:28:04'), (149, NULL, NULL, 'PS_ALIAS_FEATURE_ACTIVE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (150, NULL, NULL, 'PS_TAX_ADDRESS_TYPE', 'id_address_delivery', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (151, NULL, NULL, 'PS_SHOP_DEFAULT', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3231,14 +3004,14 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (182, NULL, NULL, 'MB_INTER_METHODS', '5', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (183, NULL, NULL, 'BANK_WIRE_CURRENCIES', '2,1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (184, NULL, NULL, 'CHEQUE_CURRENCIES', '2,1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(185, NULL, NULL, 'PRODUCTS_VIEWED_NBR', '8', '0000-00-00 00:00:00', '2023-05-02 12:18:37'), +(185, NULL, NULL, 'PRODUCTS_VIEWED_NBR', '8', '0000-00-00 00:00:00', '2023-08-28 13:27:57'), (186, NULL, NULL, 'BLOCK_CATEG_DHTML', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (187, NULL, NULL, 'BLOCK_CATEG_MAX_DEPTH', '4', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (188, NULL, NULL, 'MANUFACTURER_DISPLAY_FORM', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (189, NULL, NULL, 'MANUFACTURER_DISPLAY_TEXT', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (190, NULL, NULL, 'MANUFACTURER_DISPLAY_TEXT_NB', '5', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(191, NULL, NULL, 'NEW_PRODUCTS_NBR', '8', '0000-00-00 00:00:00', '2023-05-02 12:17:01'), -(192, NULL, NULL, 'PS_TOKEN_ENABLE', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(191, NULL, NULL, 'NEW_PRODUCTS_NBR', '8', '0000-00-00 00:00:00', '2023-08-28 13:26:23'), +(192, NULL, NULL, 'PS_TOKEN_ENABLE', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (193, NULL, NULL, 'PS_STATS_RENDER', 'graphnvd3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (194, NULL, NULL, 'PS_STATS_OLD_CONNECT_AUTO_CLEAN', 'never', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (195, NULL, NULL, 'PS_STATS_GRID_RENDER', 'gridhtml', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3257,11 +3030,11 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (208, NULL, NULL, 'BLOCKADVERT_LINK', 'https://www.prestashop.com', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (209, NULL, NULL, 'BLOCKSTORE_IMG', 'store.jpg', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (210, NULL, NULL, 'BLOCKADVERT_IMG_EXT', 'jpg', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(211, NULL, NULL, 'MOD_BLOCKTOPMENU_ITEMS', 'CAT3,CAT6,CAT9', '0000-00-00 00:00:00', '2023-05-02 12:17:01'), +(211, NULL, NULL, 'MOD_BLOCKTOPMENU_ITEMS', 'CAT3,CAT6,CAT9', '0000-00-00 00:00:00', '2023-08-28 13:26:23'), (212, NULL, NULL, 'MOD_BLOCKTOPMENU_SEARCH', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(213, NULL, NULL, 'BLOCKSOCIAL_FACEBOOK', NULL, '0000-00-00 00:00:00', '2023-05-02 12:17:02'), -(214, NULL, NULL, 'BLOCKSOCIAL_TWITTER', NULL, '0000-00-00 00:00:00', '2023-05-02 12:17:02'), -(215, NULL, NULL, 'BLOCKSOCIAL_RSS', NULL, '0000-00-00 00:00:00', '2023-05-02 12:17:02'), +(213, NULL, NULL, 'BLOCKSOCIAL_FACEBOOK', NULL, '0000-00-00 00:00:00', '2023-08-28 13:26:24'), +(214, NULL, NULL, 'BLOCKSOCIAL_TWITTER', NULL, '0000-00-00 00:00:00', '2023-08-28 13:26:24'), +(215, NULL, NULL, 'BLOCKSOCIAL_RSS', NULL, '0000-00-00 00:00:00', '2023-08-28 13:26:24'), (216, NULL, NULL, 'BLOCKCONTACTINFOS_COMPANY', 'Your company', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (217, NULL, NULL, 'BLOCKCONTACTINFOS_ADDRESS', 'Address line 1\nCity\nCountry', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (218, NULL, NULL, 'BLOCKCONTACTINFOS_PHONE', '0123-456-789', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3276,22 +3049,22 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (227, NULL, NULL, 'UPGRADER_BACKUPFILES_FILENAME', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (228, NULL, NULL, 'BLOCKREINSURANCE_NBBLOCKS', '5', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (229, NULL, NULL, 'HOMESLIDER_WIDTH', '535', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(230, NULL, NULL, 'HOMESLIDER_SPEED', '5000', '0000-00-00 00:00:00', '2023-05-02 12:17:01'), +(230, NULL, NULL, 'HOMESLIDER_SPEED', '5000', '0000-00-00 00:00:00', '2023-08-28 13:26:23'), (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), +(237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(239, NULL, NULL, 'PS_SHOP_ACTIVITY', NULL, '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(239, NULL, NULL, 'PS_SHOP_ACTIVITY', '0', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (240, NULL, NULL, 'PS_LOGO', 'logo.png', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (241, NULL, NULL, 'PS_FAVICON', 'favicon.ico', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (242, NULL, NULL, 'PS_STORES_ICON', 'logo_stores.png', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (243, NULL, NULL, 'PS_ROOT_CATEGORY', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (244, NULL, NULL, 'PS_HOME_CATEGORY', '2', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(245, NULL, NULL, 'PS_CONFIGURATION_AGREMENT', '1', '0000-00-00 00:00:00', '2023-05-02 12:16:57'), +(245, NULL, NULL, 'PS_CONFIGURATION_AGREMENT', '1', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (246, NULL, NULL, 'PS_MAIL_SERVER', 'smtp.', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (247, NULL, NULL, 'PS_MAIL_USER', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (248, NULL, NULL, 'PS_MAIL_PASSWD', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3302,7 +3075,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (253, NULL, NULL, 'PS_MAIL_DKIM_DOMAIN', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (254, NULL, NULL, 'PS_MAIL_DKIM_SELECTOR', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (255, NULL, NULL, 'PS_MAIL_DKIM_KEY', '', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(256, NULL, NULL, 'NW_SALT', 'KWnKBNs3egtivwWo', '0000-00-00 00:00:00', '2023-05-02 12:17:02'), +(256, NULL, NULL, 'NW_SALT', 'HKF4qtXkaKcEYpqr', '0000-00-00 00:00:00', '2023-08-28 13:26:24'), (257, NULL, NULL, 'PS_PAYMENT_LOGO_CMS_ID', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (258, NULL, NULL, 'HOME_FEATURED_NBR', '8', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (259, NULL, NULL, 'SEK_MIN_OCCURENCES', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3313,7 +3086,7 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (264, NULL, NULL, 'PS_ATTRIBUTE_ANCHOR_SEPARATOR', '-', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (265, NULL, NULL, 'CONF_AVERAGE_PRODUCT_MARGIN', '40', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (266, NULL, NULL, 'PS_DASHBOARD_SIMULATION', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(267, NULL, NULL, 'PS_USE_HTMLPURIFIER', '1', '0000-00-00 00:00:00', '2023-08-28 11:40:31'), +(267, NULL, NULL, 'PS_USE_HTMLPURIFIER', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (268, NULL, NULL, 'PS_SMARTY_LOCAL', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (269, NULL, NULL, 'PS_SMARTY_CLEAR_CACHE', 'everytime', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (270, NULL, NULL, 'PS_DETECT_LANG', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3336,190 +3109,150 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (287, NULL, NULL, 'PS_CATALOG_MODE_WITH_PRICES', '0', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (288, NULL, NULL, 'PS_MAIL_THEME', 'modern', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (289, NULL, NULL, 'PS_ORDER_PRODUCTS_NB_PER_PAGE', '8', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(290, NULL, NULL, 'PS_LOGS_EMAIL_RECEIVERS', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-05-02 12:16:59'), +(290, NULL, NULL, 'PS_LOGS_EMAIL_RECEIVERS', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (291, NULL, NULL, 'PS_SHOW_LABEL_OOS_LISTING_PAGES', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (292, NULL, NULL, 'ADDONS_API_MODULE_CHANNEL', 'stable', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (293, NULL, NULL, 'PS_SECURITY_TOKEN', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (294, NULL, NULL, 'PS_SECURITY_PASSWORD_POLICY_MAXIMUM_LENGTH', '72', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (295, NULL, NULL, 'PS_SECURITY_PASSWORD_POLICY_MINIMUM_LENGTH', '8', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (296, NULL, NULL, 'PS_SECURITY_PASSWORD_POLICY_MINIMUM_SCORE', '3', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(297, NULL, NULL, 'PS_INSTALL_XML_LOADERS_ID', '{\"authorization_role:TAB_ADMINACCESS_CREATE\":1,\"authorization_role:TAB_ADMINACCESS_READ\":2,\"authorization_role:TAB_ADMINACCESS_UPDATE\":3,\"authorization_role:TAB_ADMINACCESS_DELETE\":4,\"authorization_role:TAB_ADMINADDRESSES_CREATE\":5,\"authorization_role:TAB_ADMINADDRESSES_READ\":6,\"authorization_role:TAB_ADMINADDRESSES_UPDATE\":7,\"authorization_role:TAB_ADMINADDRESSES_DELETE\":8,\"authorization_role:TAB_ADMINADMINPREFERENCES_CREATE\":9,\"authorization_role:TAB_ADMINADMINPREFERENCES_READ\":10,\"authorization_role:TAB_ADMINADMINPREFERENCES_UPDATE\":11,\"authorization_role:TAB_ADMINADMINPREFERENCES_DELETE\":12,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_CREATE\":13,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_READ\":14,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_UPDATE\":15,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_DELETE\":16,\"authorization_role:TAB_ADMINATTACHMENTS_CREATE\":17,\"authorization_role:TAB_ADMINATTACHMENTS_READ\":18,\"authorization_role:TAB_ADMINATTACHMENTS_UPDATE\":19,\"authorization_role:TAB_ADMINATTACHMENTS_DELETE\":20,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_CREATE\":21,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_READ\":22,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_UPDATE\":23,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_DELETE\":24,\"authorization_role:TAB_ADMINBACKUP_CREATE\":25,\"authorization_role:TAB_ADMINBACKUP_READ\":26,\"authorization_role:TAB_ADMINBACKUP_UPDATE\":27,\"authorization_role:TAB_ADMINBACKUP_DELETE\":28,\"authorization_role:TAB_ADMINCARRIERS_CREATE\":29,\"authorization_role:TAB_ADMINCARRIERS_READ\":30,\"authorization_role:TAB_ADMINCARRIERS_UPDATE\":31,\"authorization_role:TAB_ADMINCARRIERS_DELETE\":32,\"authorization_role:TAB_ADMINCARTRULES_CREATE\":33,\"authorization_role:TAB_ADMINCARTRULES_READ\":34,\"authorization_role:TAB_ADMINCARTRULES_UPDATE\":35,\"authorization_role:TAB_ADMINCARTRULES_DELETE\":36,\"authorization_role:TAB_ADMINCARTS_CREATE\":37,\"authorization_role:TAB_ADMINCARTS_READ\":38,\"authorization_role:TAB_ADMINCARTS_UPDATE\":39,\"authorization_role:TAB_ADMINCARTS_DELETE\":40,\"authorization_role:TAB_ADMINCATALOG_CREATE\":41,\"authorization_role:TAB_ADMINCATALOG_READ\":42,\"authorization_role:TAB_ADMINCATALOG_UPDATE\":43,\"authorization_role:TAB_ADMINCATALOG_DELETE\":44,\"authorization_role:TAB_ADMINCATEGORIES_CREATE\":45,\"authorization_role:TAB_ADMINCATEGORIES_READ\":46,\"authorization_role:TAB_ADMINCATEGORIES_UPDATE\":47,\"authorization_role:TAB_ADMINCATEGORIES_DELETE\":48,\"authorization_role:TAB_ADMINCMSCONTENT_CREATE\":49,\"authorization_role:TAB_ADMINCMSCONTENT_READ\":50,\"authorization_role:TAB_ADMINCMSCONTENT_UPDATE\":51,\"authorization_role:TAB_ADMINCMSCONTENT_DELETE\":52,\"authorization_role:TAB_ADMINCONTACTS_CREATE\":53,\"authorization_role:TAB_ADMINCONTACTS_READ\":54,\"authorization_role:TAB_ADMINCONTACTS_UPDATE\":55,\"authorization_role:TAB_ADMINCONTACTS_DELETE\":56,\"authorization_role:TAB_ADMINCOUNTRIES_CREATE\":57,\"authorization_role:TAB_ADMINCOUNTRIES_READ\":58,\"authorization_role:TAB_ADMINCOUNTRIES_UPDATE\":59,\"authorization_role:TAB_ADMINCOUNTRIES_DELETE\":60,\"authorization_role:TAB_ADMINCURRENCIES_CREATE\":61,\"authorization_role:TAB_ADMINCURRENCIES_READ\":62,\"authorization_role:TAB_ADMINCURRENCIES_UPDATE\":63,\"authorization_role:TAB_ADMINCURRENCIES_DELETE\":64,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_CREATE\":65,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_READ\":66,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_UPDATE\":67,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_DELETE\":68,\"authorization_role:TAB_ADMINCUSTOMERS_CREATE\":69,\"authorization_role:TAB_ADMINCUSTOMERS_READ\":70,\"authorization_role:TAB_ADMINCUSTOMERS_UPDATE\":71,\"authorization_role:TAB_ADMINCUSTOMERS_DELETE\":72,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_CREATE\":73,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_READ\":74,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_UPDATE\":75,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_DELETE\":76,\"authorization_role:TAB_ADMINDASHBOARD_CREATE\":77,\"authorization_role:TAB_ADMINDASHBOARD_READ\":78,\"authorization_role:TAB_ADMINDASHBOARD_UPDATE\":79,\"authorization_role:TAB_ADMINDASHBOARD_DELETE\":80,\"authorization_role:TAB_ADMINDELIVERYSLIP_CREATE\":81,\"authorization_role:TAB_ADMINDELIVERYSLIP_READ\":82,\"authorization_role:TAB_ADMINDELIVERYSLIP_UPDATE\":83,\"authorization_role:TAB_ADMINDELIVERYSLIP_DELETE\":84,\"authorization_role:TAB_ADMINEMAILS_CREATE\":85,\"authorization_role:TAB_ADMINEMAILS_READ\":86,\"authorization_role:TAB_ADMINEMAILS_UPDATE\":87,\"authorization_role:TAB_ADMINEMAILS_DELETE\":88,\"authorization_role:TAB_ADMINEMPLOYEES_CREATE\":89,\"authorization_role:TAB_ADMINEMPLOYEES_READ\":90,\"authorization_role:TAB_ADMINEMPLOYEES_UPDATE\":91,\"authorization_role:TAB_ADMINEMPLOYEES_DELETE\":92,\"authorization_role:TAB_ADMINFEATURES_CREATE\":93,\"authorization_role:TAB_ADMINFEATURES_READ\":94,\"authorization_role:TAB_ADMINFEATURES_UPDATE\":95,\"authorization_role:TAB_ADMINFEATURES_DELETE\":96,\"authorization_role:TAB_ADMINGENDERS_CREATE\":97,\"authorization_role:TAB_ADMINGENDERS_READ\":98,\"authorization_role:TAB_ADMINGENDERS_UPDATE\":99,\"authorization_role:TAB_ADMINGENDERS_DELETE\":100,\"authorization_role:TAB_ADMINGEOLOCATION_CREATE\":101,\"authorization_role:TAB_ADMINGEOLOCATION_READ\":102,\"authorization_role:TAB_ADMINGEOLOCATION_UPDATE\":103,\"authorization_role:TAB_ADMINGEOLOCATION_DELETE\":104,\"authorization_role:TAB_ADMINGROUPS_CREATE\":105,\"authorization_role:TAB_ADMINGROUPS_READ\":106,\"authorization_role:TAB_ADMINGROUPS_UPDATE\":107,\"authorization_role:TAB_ADMINGROUPS_DELETE\":108,\"authorization_role:TAB_ADMINIMAGES_CREATE\":109,\"authorization_role:TAB_ADMINIMAGES_READ\":110,\"authorization_role:TAB_ADMINIMAGES_UPDATE\":111,\"authorization_role:TAB_ADMINIMAGES_DELETE\":112,\"authorization_role:TAB_ADMINIMPORT_CREATE\":113,\"authorization_role:TAB_ADMINIMPORT_READ\":114,\"authorization_role:TAB_ADMINIMPORT_UPDATE\":115,\"authorization_role:TAB_ADMINIMPORT_DELETE\":116,\"authorization_role:TAB_ADMININFORMATION_CREATE\":117,\"authorization_role:TAB_ADMININFORMATION_READ\":118,\"authorization_role:TAB_ADMININFORMATION_UPDATE\":119,\"authorization_role:TAB_ADMININFORMATION_DELETE\":120,\"authorization_role:TAB_ADMININTERNATIONAL_CREATE\":121,\"authorization_role:TAB_ADMININTERNATIONAL_READ\":122,\"authorization_role:TAB_ADMININTERNATIONAL_UPDATE\":123,\"authorization_role:TAB_ADMININTERNATIONAL_DELETE\":124,\"authorization_role:TAB_ADMININVOICES_CREATE\":125,\"authorization_role:TAB_ADMININVOICES_READ\":126,\"authorization_role:TAB_ADMININVOICES_UPDATE\":127,\"authorization_role:TAB_ADMININVOICES_DELETE\":128,\"authorization_role:TAB_ADMINLANGUAGES_CREATE\":129,\"authorization_role:TAB_ADMINLANGUAGES_READ\":130,\"authorization_role:TAB_ADMINLANGUAGES_UPDATE\":131,\"authorization_role:TAB_ADMINLANGUAGES_DELETE\":132,\"authorization_role:TAB_ADMINLINKWIDGET_CREATE\":133,\"authorization_role:TAB_ADMINLINKWIDGET_READ\":134,\"authorization_role:TAB_ADMINLINKWIDGET_UPDATE\":135,\"authorization_role:TAB_ADMINLINKWIDGET_DELETE\":136,\"authorization_role:TAB_ADMINLOCALIZATION_CREATE\":137,\"authorization_role:TAB_ADMINLOCALIZATION_READ\":138,\"authorization_role:TAB_ADMINLOCALIZATION_UPDATE\":139,\"authorization_role:TAB_ADMINLOCALIZATION_DELETE\":140,\"authorization_role:TAB_ADMINLOGS_CREATE\":141,\"authorization_role:TAB_ADMINLOGS_READ\":142,\"authorization_role:TAB_ADMINLOGS_UPDATE\":143,\"authorization_role:TAB_ADMINLOGS_DELETE\":144,\"authorization_role:TAB_ADMINMAINTENANCE_CREATE\":145,\"authorization_role:TAB_ADMINMAINTENANCE_READ\":146,\"authorization_role:TAB_ADMINMAINTENANCE_UPDATE\":147,\"authorization_role:TAB_ADMINMAINTENANCE_DELETE\":148,\"authorization_role:TAB_ADMINMANUFACTURERS_CREATE\":149,\"authorization_role:TAB_ADMINMANUFACTURERS_READ\":150,\"authorization_role:TAB_ADMINMANUFACTURERS_UPDATE\":151,\"authorization_role:TAB_ADMINMANUFACTURERS_DELETE\":152,\"authorization_role:TAB_ADMINMETA_CREATE\":153,\"authorization_role:TAB_ADMINMETA_READ\":154,\"authorization_role:TAB_ADMINMETA_UPDATE\":155,\"authorization_role:TAB_ADMINMETA_DELETE\":156,\"authorization_role:TAB_ADMINMODULES_CREATE\":157,\"authorization_role:TAB_ADMINMODULES_READ\":158,\"authorization_role:TAB_ADMINMODULES_UPDATE\":159,\"authorization_role:TAB_ADMINMODULES_DELETE\":160,\"authorization_role:TAB_ADMINMODULESPOSITIONS_CREATE\":161,\"authorization_role:TAB_ADMINMODULESPOSITIONS_READ\":162,\"authorization_role:TAB_ADMINMODULESPOSITIONS_UPDATE\":163,\"authorization_role:TAB_ADMINMODULESPOSITIONS_DELETE\":164,\"authorization_role:TAB_ADMINMODULESUPDATES_CREATE\":165,\"authorization_role:TAB_ADMINMODULESUPDATES_READ\":166,\"authorization_role:TAB_ADMINMODULESUPDATES_UPDATE\":167,\"authorization_role:TAB_ADMINMODULESUPDATES_DELETE\":168,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_CREATE\":169,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_READ\":170,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_UPDATE\":171,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_DELETE\":172,\"authorization_role:TAB_ADMINMODULESSF_CREATE\":173,\"authorization_role:TAB_ADMINMODULESSF_READ\":174,\"authorization_role:TAB_ADMINMODULESSF_UPDATE\":175,\"authorization_role:TAB_ADMINMODULESSF_DELETE\":176,\"authorization_role:TAB_ADMINORDERMESSAGE_CREATE\":177,\"authorization_role:TAB_ADMINORDERMESSAGE_READ\":178,\"authorization_role:TAB_ADMINORDERMESSAGE_UPDATE\":179,\"authorization_role:TAB_ADMINORDERMESSAGE_DELETE\":180,\"authorization_role:TAB_ADMINORDERPREFERENCES_CREATE\":181,\"authorization_role:TAB_ADMINORDERPREFERENCES_READ\":182,\"authorization_role:TAB_ADMINORDERPREFERENCES_UPDATE\":183,\"authorization_role:TAB_ADMINORDERPREFERENCES_DELETE\":184,\"authorization_role:TAB_ADMINORDERS_CREATE\":185,\"authorization_role:TAB_ADMINORDERS_READ\":186,\"authorization_role:TAB_ADMINORDERS_UPDATE\":187,\"authorization_role:TAB_ADMINORDERS_DELETE\":188,\"authorization_role:TAB_ADMINOUTSTANDING_CREATE\":189,\"authorization_role:TAB_ADMINOUTSTANDING_READ\":190,\"authorization_role:TAB_ADMINOUTSTANDING_UPDATE\":191,\"authorization_role:TAB_ADMINOUTSTANDING_DELETE\":192,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_CREATE\":193,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_READ\":194,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_UPDATE\":195,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_DELETE\":196,\"authorization_role:TAB_ADMINPARENTCARTRULES_CREATE\":197,\"authorization_role:TAB_ADMINPARENTCARTRULES_READ\":198,\"authorization_role:TAB_ADMINPARENTCARTRULES_UPDATE\":199,\"authorization_role:TAB_ADMINPARENTCARTRULES_DELETE\":200,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_CREATE\":201,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_READ\":202,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_UPDATE\":203,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_DELETE\":204,\"authorization_role:TAB_ADMINPARENTCUSTOMER_CREATE\":205,\"authorization_role:TAB_ADMINPARENTCUSTOMER_READ\":206,\"authorization_role:TAB_ADMINPARENTCUSTOMER_UPDATE\":207,\"authorization_role:TAB_ADMINPARENTCUSTOMER_DELETE\":208,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_CREATE\":209,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_READ\":210,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_UPDATE\":211,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_DELETE\":212,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_CREATE\":213,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_READ\":214,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_UPDATE\":215,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_DELETE\":216,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_CREATE\":217,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_READ\":218,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_UPDATE\":219,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_DELETE\":220,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_CREATE\":221,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_READ\":222,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_UPDATE\":223,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_DELETE\":224,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_CREATE\":225,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_READ\":226,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_UPDATE\":227,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_DELETE\":228,\"authorization_role:TAB_ADMINPARENTMODULESSF_CREATE\":229,\"authorization_role:TAB_ADMINPARENTMODULESSF_READ\":230,\"authorization_role:TAB_ADMINPARENTMODULESSF_UPDATE\":231,\"authorization_role:TAB_ADMINPARENTMODULESSF_DELETE\":232,\"authorization_role:TAB_ADMINPARENTMETA_CREATE\":233,\"authorization_role:TAB_ADMINPARENTMETA_READ\":234,\"authorization_role:TAB_ADMINPARENTMETA_UPDATE\":235,\"authorization_role:TAB_ADMINPARENTMETA_DELETE\":236,\"authorization_role:TAB_ADMINPARENTMODULES_CREATE\":237,\"authorization_role:TAB_ADMINPARENTMODULES_READ\":238,\"authorization_role:TAB_ADMINPARENTMODULES_UPDATE\":239,\"authorization_role:TAB_ADMINPARENTMODULES_DELETE\":240,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_CREATE\":241,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_READ\":242,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_UPDATE\":243,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_DELETE\":244,\"authorization_role:TAB_ADMINPARENTORDERS_CREATE\":245,\"authorization_role:TAB_ADMINPARENTORDERS_READ\":246,\"authorization_role:TAB_ADMINPARENTORDERS_UPDATE\":247,\"authorization_role:TAB_ADMINPARENTORDERS_DELETE\":248,\"authorization_role:TAB_ADMINPARENTPAYMENT_CREATE\":249,\"authorization_role:TAB_ADMINPARENTPAYMENT_READ\":250,\"authorization_role:TAB_ADMINPARENTPAYMENT_UPDATE\":251,\"authorization_role:TAB_ADMINPARENTPAYMENT_DELETE\":252,\"authorization_role:TAB_ADMINPARENTPREFERENCES_CREATE\":253,\"authorization_role:TAB_ADMINPARENTPREFERENCES_READ\":254,\"authorization_role:TAB_ADMINPARENTPREFERENCES_UPDATE\":255,\"authorization_role:TAB_ADMINPARENTPREFERENCES_DELETE\":256,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_CREATE\":257,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_READ\":258,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_UPDATE\":259,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_DELETE\":260,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_CREATE\":261,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_READ\":262,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_UPDATE\":263,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_DELETE\":264,\"authorization_role:TAB_ADMINPARENTSHIPPING_CREATE\":265,\"authorization_role:TAB_ADMINPARENTSHIPPING_READ\":266,\"authorization_role:TAB_ADMINPARENTSHIPPING_UPDATE\":267,\"authorization_role:TAB_ADMINPARENTSHIPPING_DELETE\":268,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE\":269,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_READ\":270,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE\":271,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE\":272,\"authorization_role:TAB_ADMINPARENTSTORES_CREATE\":273,\"authorization_role:TAB_ADMINPARENTSTORES_READ\":274,\"authorization_role:TAB_ADMINPARENTSTORES_UPDATE\":275,\"authorization_role:TAB_ADMINPARENTSTORES_DELETE\":276,\"authorization_role:TAB_ADMINPARENTTAXES_CREATE\":277,\"authorization_role:TAB_ADMINPARENTTAXES_READ\":278,\"authorization_role:TAB_ADMINPARENTTAXES_UPDATE\":279,\"authorization_role:TAB_ADMINPARENTTAXES_DELETE\":280,\"authorization_role:TAB_ADMINPARENTTHEMES_CREATE\":281,\"authorization_role:TAB_ADMINPARENTTHEMES_READ\":282,\"authorization_role:TAB_ADMINPARENTTHEMES_UPDATE\":283,\"authorization_role:TAB_ADMINPARENTTHEMES_DELETE\":284,\"authorization_role:TAB_ADMINPAYMENT_CREATE\":285,\"authorization_role:TAB_ADMINPAYMENT_READ\":286,\"authorization_role:TAB_ADMINPAYMENT_UPDATE\":287,\"authorization_role:TAB_ADMINPAYMENT_DELETE\":288,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_CREATE\":289,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_READ\":290,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_UPDATE\":291,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_DELETE\":292,\"authorization_role:TAB_ADMINPERFORMANCE_CREATE\":293,\"authorization_role:TAB_ADMINPERFORMANCE_READ\":294,\"authorization_role:TAB_ADMINPERFORMANCE_UPDATE\":295,\"authorization_role:TAB_ADMINPERFORMANCE_DELETE\":296,\"authorization_role:TAB_ADMINPPREFERENCES_CREATE\":297,\"authorization_role:TAB_ADMINPPREFERENCES_READ\":298,\"authorization_role:TAB_ADMINPPREFERENCES_UPDATE\":299,\"authorization_role:TAB_ADMINPPREFERENCES_DELETE\":300,\"authorization_role:TAB_ADMINPREFERENCES_CREATE\":301,\"authorization_role:TAB_ADMINPREFERENCES_READ\":302,\"authorization_role:TAB_ADMINPREFERENCES_UPDATE\":303,\"authorization_role:TAB_ADMINPREFERENCES_DELETE\":304,\"authorization_role:TAB_ADMINPRODUCTS_CREATE\":305,\"authorization_role:TAB_ADMINPRODUCTS_READ\":306,\"authorization_role:TAB_ADMINPRODUCTS_UPDATE\":307,\"authorization_role:TAB_ADMINPRODUCTS_DELETE\":308,\"authorization_role:TAB_ADMINPROFILES_CREATE\":309,\"authorization_role:TAB_ADMINPROFILES_READ\":310,\"authorization_role:TAB_ADMINPROFILES_UPDATE\":311,\"authorization_role:TAB_ADMINPROFILES_DELETE\":312,\"authorization_role:TAB_ADMINREQUESTSQL_CREATE\":313,\"authorization_role:TAB_ADMINREQUESTSQL_READ\":314,\"authorization_role:TAB_ADMINREQUESTSQL_UPDATE\":315,\"authorization_role:TAB_ADMINREQUESTSQL_DELETE\":316,\"authorization_role:TAB_ADMINRETURN_CREATE\":317,\"authorization_role:TAB_ADMINRETURN_READ\":318,\"authorization_role:TAB_ADMINRETURN_UPDATE\":319,\"authorization_role:TAB_ADMINRETURN_DELETE\":320,\"authorization_role:TAB_ADMINSEARCHCONF_CREATE\":321,\"authorization_role:TAB_ADMINSEARCHCONF_READ\":322,\"authorization_role:TAB_ADMINSEARCHCONF_UPDATE\":323,\"authorization_role:TAB_ADMINSEARCHCONF_DELETE\":324,\"authorization_role:TAB_ADMINSEARCHENGINES_CREATE\":325,\"authorization_role:TAB_ADMINSEARCHENGINES_READ\":326,\"authorization_role:TAB_ADMINSEARCHENGINES_UPDATE\":327,\"authorization_role:TAB_ADMINSEARCHENGINES_DELETE\":328,\"authorization_role:TAB_ADMINSHIPPING_CREATE\":329,\"authorization_role:TAB_ADMINSHIPPING_READ\":330,\"authorization_role:TAB_ADMINSHIPPING_UPDATE\":331,\"authorization_role:TAB_ADMINSHIPPING_DELETE\":332,\"authorization_role:TAB_ADMINSHOPGROUP_CREATE\":333,\"authorization_role:TAB_ADMINSHOPGROUP_READ\":334,\"authorization_role:TAB_ADMINSHOPGROUP_UPDATE\":335,\"authorization_role:TAB_ADMINSHOPGROUP_DELETE\":336,\"authorization_role:TAB_ADMINSHOPURL_CREATE\":337,\"authorization_role:TAB_ADMINSHOPURL_READ\":338,\"authorization_role:TAB_ADMINSHOPURL_UPDATE\":339,\"authorization_role:TAB_ADMINSHOPURL_DELETE\":340,\"authorization_role:TAB_ADMINSLIP_CREATE\":341,\"authorization_role:TAB_ADMINSLIP_READ\":342,\"authorization_role:TAB_ADMINSLIP_UPDATE\":343,\"authorization_role:TAB_ADMINSLIP_DELETE\":344,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_CREATE\":345,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_READ\":346,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_UPDATE\":347,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_DELETE\":348,\"authorization_role:TAB_ADMINSTATES_CREATE\":349,\"authorization_role:TAB_ADMINSTATES_READ\":350,\"authorization_role:TAB_ADMINSTATES_UPDATE\":351,\"authorization_role:TAB_ADMINSTATES_DELETE\":352,\"authorization_role:TAB_ADMINSTATS_CREATE\":353,\"authorization_role:TAB_ADMINSTATS_READ\":354,\"authorization_role:TAB_ADMINSTATS_UPDATE\":355,\"authorization_role:TAB_ADMINSTATS_DELETE\":356,\"authorization_role:TAB_ADMINSTATUSES_CREATE\":357,\"authorization_role:TAB_ADMINSTATUSES_READ\":358,\"authorization_role:TAB_ADMINSTATUSES_UPDATE\":359,\"authorization_role:TAB_ADMINSTATUSES_DELETE\":360,\"authorization_role:TAB_ADMINSTOCK_CREATE\":361,\"authorization_role:TAB_ADMINSTOCK_READ\":362,\"authorization_role:TAB_ADMINSTOCK_UPDATE\":363,\"authorization_role:TAB_ADMINSTOCK_DELETE\":364,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_CREATE\":365,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_READ\":366,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_UPDATE\":367,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_DELETE\":368,\"authorization_role:TAB_ADMINSTORES_CREATE\":369,\"authorization_role:TAB_ADMINSTORES_READ\":370,\"authorization_role:TAB_ADMINSTORES_UPDATE\":371,\"authorization_role:TAB_ADMINSTORES_DELETE\":372,\"authorization_role:TAB_ADMINSUPPLIERS_CREATE\":373,\"authorization_role:TAB_ADMINSUPPLIERS_READ\":374,\"authorization_role:TAB_ADMINSUPPLIERS_UPDATE\":375,\"authorization_role:TAB_ADMINSUPPLIERS_DELETE\":376,\"authorization_role:TAB_ADMINTAGS_CREATE\":377,\"authorization_role:TAB_ADMINTAGS_READ\":378,\"authorization_role:TAB_ADMINTAGS_UPDATE\":379,\"authorization_role:TAB_ADMINTAGS_DELETE\":380,\"authorization_role:TAB_ADMINTAXES_CREATE\":381,\"authorization_role:TAB_ADMINTAXES_READ\":382,\"authorization_role:TAB_ADMINTAXES_UPDATE\":383,\"authorization_role:TAB_ADMINTAXES_DELETE\":384,\"authorization_role:TAB_ADMINTAXRULESGROUP_CREATE\":385,\"authorization_role:TAB_ADMINTAXRULESGROUP_READ\":386,\"authorization_role:TAB_ADMINTAXRULESGROUP_UPDATE\":387,\"authorization_role:TAB_ADMINTAXRULESGROUP_DELETE\":388,\"authorization_role:TAB_ADMINTHEMES_CREATE\":389,\"authorization_role:TAB_ADMINTHEMES_READ\":390,\"authorization_role:TAB_ADMINTHEMES_UPDATE\":391,\"authorization_role:TAB_ADMINTHEMES_DELETE\":392,\"authorization_role:TAB_ADMINTRACKING_CREATE\":393,\"authorization_role:TAB_ADMINTRACKING_READ\":394,\"authorization_role:TAB_ADMINTRACKING_UPDATE\":395,\"authorization_role:TAB_ADMINTRACKING_DELETE\":396,\"authorization_role:TAB_ADMINTRANSLATIONS_CREATE\":397,\"authorization_role:TAB_ADMINTRANSLATIONS_READ\":398,\"authorization_role:TAB_ADMINTRANSLATIONS_UPDATE\":399,\"authorization_role:TAB_ADMINTRANSLATIONS_DELETE\":400,\"authorization_role:TAB_ADMINWAREHOUSES_CREATE\":401,\"authorization_role:TAB_ADMINWAREHOUSES_READ\":402,\"authorization_role:TAB_ADMINWAREHOUSES_UPDATE\":403,\"authorization_role:TAB_ADMINWAREHOUSES_DELETE\":404,\"authorization_role:TAB_ADMINWEBSERVICE_CREATE\":405,\"authorization_role:TAB_ADMINWEBSERVICE_READ\":406,\"authorization_role:TAB_ADMINWEBSERVICE_UPDATE\":407,\"authorization_role:TAB_ADMINWEBSERVICE_DELETE\":408,\"authorization_role:TAB_ADMINZONES_CREATE\":409,\"authorization_role:TAB_ADMINZONES_READ\":410,\"authorization_role:TAB_ADMINZONES_UPDATE\":411,\"authorization_role:TAB_ADMINZONES_DELETE\":412,\"authorization_role:TAB_CONFIGURE_CREATE\":413,\"authorization_role:TAB_CONFIGURE_READ\":414,\"authorization_role:TAB_CONFIGURE_UPDATE\":415,\"authorization_role:TAB_CONFIGURE_DELETE\":416,\"authorization_role:TAB_IMPROVE_CREATE\":417,\"authorization_role:TAB_IMPROVE_READ\":418,\"authorization_role:TAB_IMPROVE_UPDATE\":419,\"authorization_role:TAB_IMPROVE_DELETE\":420,\"authorization_role:TAB_SELL_CREATE\":421,\"authorization_role:TAB_SELL_READ\":422,\"authorization_role:TAB_SELL_UPDATE\":423,\"authorization_role:TAB_SELL_DELETE\":424,\"authorization_role:TAB_SHOPPARAMETERS_CREATE\":425,\"authorization_role:TAB_SHOPPARAMETERS_READ\":426,\"authorization_role:TAB_SHOPPARAMETERS_UPDATE\":427,\"authorization_role:TAB_SHOPPARAMETERS_DELETE\":428,\"authorization_role:TAB_ADMINPARENTMAILTHEME_CREATE\":429,\"authorization_role:TAB_ADMINPARENTMAILTHEME_READ\":430,\"authorization_role:TAB_ADMINPARENTMAILTHEME_UPDATE\":431,\"authorization_role:TAB_ADMINPARENTMAILTHEME_DELETE\":432,\"authorization_role:TAB_ADMINMAILTHEME_CREATE\":433,\"authorization_role:TAB_ADMINMAILTHEME_READ\":434,\"authorization_role:TAB_ADMINMAILTHEME_UPDATE\":435,\"authorization_role:TAB_ADMINMAILTHEME_DELETE\":436,\"authorization_role:TAB_ADMINMODULESMANAGE_CREATE\":437,\"authorization_role:TAB_ADMINMODULESMANAGE_READ\":438,\"authorization_role:TAB_ADMINMODULESMANAGE_UPDATE\":439,\"authorization_role:TAB_ADMINMODULESMANAGE_DELETE\":440,\"authorization_role:TAB_ADMINFEATUREFLAG_CREATE\":441,\"authorization_role:TAB_ADMINFEATUREFLAG_READ\":442,\"authorization_role:TAB_ADMINFEATUREFLAG_UPDATE\":443,\"authorization_role:TAB_ADMINFEATUREFLAG_DELETE\":444,\"authorization_role:TAB_ADMINPARENTSECURITY_CREATE\":445,\"authorization_role:TAB_ADMINPARENTSECURITY_READ\":446,\"authorization_role:TAB_ADMINPARENTSECURITY_UPDATE\":447,\"authorization_role:TAB_ADMINPARENTSECURITY_DELETE\":448,\"authorization_role:TAB_ADMINSECURITY_CREATE\":449,\"authorization_role:TAB_ADMINSECURITY_READ\":450,\"authorization_role:TAB_ADMINSECURITY_UPDATE\":451,\"authorization_role:TAB_ADMINSECURITY_DELETE\":452,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_CREATE\":453,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_READ\":454,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_UPDATE\":455,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_DELETE\":456,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_CREATE\":457,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_READ\":458,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_UPDATE\":459,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_DELETE\":460,\"profile:SuperAdmin\":\"1\",\"access:access_1_0\":0,\"access:access_1_1\":0,\"access:access_1_2\":0,\"access:access_1_3\":0,\"access:access_1_9\":0,\"access:access_1_10\":0,\"access:access_1_11\":0,\"access:access_1_13\":0,\"access:access_1_14\":0,\"access:access_1_15\":0,\"access:access_1_16\":0,\"access:access_1_19\":0,\"access:access_1_20\":0,\"access:access_1_21\":0,\"access:access_1_22\":0,\"access:access_1_23\":0,\"access:access_1_24\":0,\"access:access_1_25\":0,\"access:access_1_26\":0,\"access:access_1_27\":0,\"access:access_1_29\":0,\"access:access_1_30\":0,\"access:access_1_32\":0,\"access:access_1_33\":0,\"access:access_1_34\":0,\"access:access_1_35\":0,\"access:access_1_36\":0,\"access:access_1_37\":0,\"access:access_1_39\":0,\"access:access_1_40\":0,\"access:access_1_41\":0,\"access:access_1_42\":0,\"access:access_1_43\":0,\"access:access_1_44\":0,\"access:access_1_45\":0,\"access:access_1_46\":0,\"access:access_1_47\":0,\"access:access_1_49\":0,\"access:access_1_50\":0,\"access:access_1_51\":0,\"access:access_1_53\":0,\"access:access_1_54\":0,\"access:access_1_55\":0,\"access:access_1_56\":0,\"access:access_1_57\":0,\"access:access_1_58\":0,\"access:access_1_59\":0,\"access:access_1_60\":0,\"access:access_1_62\":0,\"access:access_1_63\":0,\"access:access_1_64\":0,\"access:access_1_67\":0,\"access:access_1_68\":0,\"access:access_1_69\":0,\"access:access_1_70\":0,\"access:access_1_71\":0,\"access:access_1_72\":0,\"access:access_1_73\":0,\"access:access_1_74\":0,\"access:access_1_75\":0,\"access:access_1_76\":0,\"access:access_1_77\":0,\"access:access_1_78\":0,\"access:access_1_79\":0,\"access:access_1_81\":0,\"access:access_1_82\":0,\"access:access_1_83\":0,\"access:access_1_84\":0,\"access:access_1_85\":0,\"access:access_1_87\":0,\"access:access_1_88\":0,\"access:access_1_89\":0,\"access:access_1_90\":0,\"access:access_1_91\":0,\"access:access_1_93\":0,\"access:access_1_98\":0,\"access:access_1_99\":0,\"access:access_1_100\":0,\"access:access_1_101\":0,\"access:access_1_102\":0,\"access:access_1_103\":0,\"access:access_1_104\":0,\"access:access_1_105\":0,\"access:access_1_106\":0,\"access:access_1_107\":0,\"access:access_1_108\":0,\"access:access_1_109\":0,\"access:access_1_110\":0,\"access:access_1_111\":0,\"access:access_1_112\":0,\"access:access_1_113\":0,\"access:access_1_114\":0,\"access:access_1_115\":0,\"access:access_1_116\":0,\"access:access_1_117\":0,\"access:access_1_118\":0,\"access:access_1_119\":0,\"access:access_1_120\":0,\"access:access_1_121\":0,\"access:access_1_122\":0,\"access:access_1_123\":0,\"access:access_1_124\":0,\"access:access_1_125\":0,\"access:access_1_126\":0,\"access:access_1_127\":0,\"access:access_1_128\":0,\"access:access_1_129\":0,\"access:access_1_130\":0,\"access:access_1_131\":0,\"access:access_1_132\":0,\"access:access_1_133\":0,\"access:access_1_134\":0,\"access:access_1_135\":0,\"access:access_1_136\":0,\"access:access_1_137\":0,\"access:access_1_138\":0,\"access:access_1_139\":0,\"access:access_1_140\":0,\"access:access_1_141\":0,\"access:access_1_142\":0,\"access:access_1_143\":0,\"access:access_1_144\":0,\"access:access_1_145\":0,\"access:access_1_146\":0,\"access:access_1_147\":0,\"access:access_1_148\":0,\"access:access_1_149\":0,\"access:access_1_150\":0,\"access:access_1_151\":0,\"access:access_1_152\":0,\"access:access_1_153\":0,\"access:access_1_154\":0,\"access:access_1_155\":0,\"access:access_1_156\":0,\"access:access_1_157\":0,\"access:access_1_158\":0,\"access:access_1_159\":0,\"access:access_1_160\":0,\"access:access_1_161\":0,\"access:access_1_162\":0,\"access:access_1_163\":0,\"access:access_1_164\":0,\"access:access_1_165\":0,\"access:access_1_166\":0,\"access:access_1_167\":0,\"access:access_1_168\":0,\"access:access_1_169\":0,\"access:access_1_170\":0,\"access:access_1_171\":0,\"access:access_1_172\":0,\"access:access_1_173\":0,\"access:access_1_174\":0,\"access:access_1_175\":0,\"access:access_1_176\":0,\"access:access_1_177\":0,\"access:access_1_178\":0,\"access:access_1_179\":0,\"access:access_1_180\":0,\"access:access_1_181\":0,\"access:access_1_182\":0,\"access:access_1_183\":0,\"access:access_1_184\":0,\"access:access_1_185\":0,\"access:access_1_186\":0,\"access:access_1_187\":0,\"access:access_1_188\":0,\"access:access_1_189\":0,\"access:access_1_190\":0,\"access:access_1_191\":0,\"access:access_1_192\":0,\"access:access_1_193\":0,\"access:access_1_194\":0,\"access:access_1_195\":0,\"access:access_1_196\":0,\"access:access_1_197\":0,\"access:access_1_198\":0,\"access:access_1_199\":0,\"access:access_1_200\":0,\"access:access_1_201\":0,\"access:access_1_202\":0,\"access:access_1_203\":0,\"access:access_1_204\":0,\"access:access_1_205\":0,\"access:access_1_206\":0,\"access:access_1_207\":0,\"access:access_1_208\":0,\"access:access_1_209\":0,\"access:access_1_210\":0,\"access:access_1_211\":0,\"access:access_1_212\":0,\"access:access_1_213\":0,\"access:access_1_214\":0,\"access:access_1_215\":0,\"access:access_1_216\":0,\"access:access_1_217\":0,\"access:access_1_218\":0,\"access:access_1_219\":0,\"access:access_1_220\":0,\"access:access_1_221\":0,\"access:access_1_222\":0,\"access:access_1_223\":0,\"access:access_1_224\":0,\"access:access_1_225\":0,\"access:access_1_226\":0,\"access:access_1_227\":0,\"access:access_1_228\":0,\"access:access_1_229\":0,\"access:access_1_230\":0,\"access:access_1_231\":0,\"access:access_1_232\":0,\"access:access_1_233\":0,\"access:access_1_234\":0,\"access:access_1_235\":0,\"access:access_1_236\":0,\"access:access_1_237\":0,\"access:access_1_238\":0,\"access:access_1_239\":0,\"access:access_1_240\":0,\"access:access_1_241\":0,\"access:access_1_242\":0,\"access:access_1_243\":0,\"access:access_1_244\":0,\"access:access_1_245\":0,\"access:access_1_246\":0,\"access:access_1_247\":0,\"access:access_1_248\":0,\"access:access_1_249\":0,\"access:access_1_250\":0,\"access:access_1_251\":0,\"access:access_1_252\":0,\"access:access_1_253\":0,\"access:access_1_254\":0,\"access:access_1_255\":0,\"access:access_1_256\":0,\"access:access_1_257\":0,\"access:access_1_258\":0,\"access:access_1_259\":0,\"access:access_1_260\":0,\"access:access_1_261\":0,\"access:access_1_262\":0,\"access:access_1_263\":0,\"access:access_1_264\":0,\"access:access_1_265\":0,\"access:access_1_266\":0,\"access:access_1_267\":0,\"access:access_1_268\":0,\"access:access_1_269\":0,\"access:access_1_270\":0,\"access:access_1_271\":0,\"access:access_1_272\":0,\"access:access_1_273\":0,\"access:access_1_274\":0,\"access:access_1_275\":0,\"access:access_1_276\":0,\"access:access_1_277\":0,\"access:access_1_278\":0,\"access:access_1_279\":0,\"access:access_1_280\":0,\"access:access_1_281\":0,\"access:access_1_282\":0,\"access:access_1_283\":0,\"access:access_1_284\":0,\"access:access_1_285\":0,\"access:access_1_286\":0,\"access:access_1_287\":0,\"access:access_1_288\":0,\"access:access_1_289\":0,\"access:access_1_290\":0,\"access:access_1_291\":0,\"access:access_1_292\":0,\"access:access_1_293\":0,\"access:access_1_294\":0,\"access:access_1_295\":0,\"access:access_1_296\":0,\"access:access_1_297\":0,\"access:access_1_298\":0,\"access:access_1_299\":0,\"access:access_1_300\":0,\"access:access_1_301\":0,\"access:access_1_302\":0,\"access:access_1_303\":0,\"access:access_1_304\":0,\"access:access_1_305\":0,\"access:access_1_306\":0,\"access:access_1_307\":0,\"access:access_1_308\":0,\"access:access_1_309\":0,\"access:access_1_314\":0,\"access:access_1_315\":0,\"access:access_1_316\":0,\"access:access_1_317\":0,\"access:access_1_318\":0,\"access:access_1_319\":0,\"access:access_1_320\":0,\"access:access_1_321\":0,\"access:access_1_322\":0,\"access:access_1_323\":0,\"access:access_1_324\":0,\"access:access_1_325\":0,\"access:access_1_326\":0,\"access:access_1_327\":0,\"access:access_1_328\":0,\"access:access_1_329\":0,\"access:access_1_330\":0,\"access:access_1_331\":0,\"access:access_1_332\":0,\"access:access_1_333\":0,\"access:access_1_334\":0,\"access:access_1_335\":0,\"access:access_1_336\":0,\"access:access_1_337\":0,\"access:access_1_338\":0,\"access:access_1_339\":0,\"access:access_1_340\":0,\"access:access_1_341\":0,\"access:access_1_342\":0,\"access:access_1_343\":0,\"access:access_1_344\":0,\"access:access_1_345\":0,\"access:access_1_346\":0,\"access:access_1_347\":0,\"access:access_1_348\":0,\"access:access_1_349\":0,\"access:access_1_350\":0,\"access:access_1_351\":0,\"access:access_1_352\":0,\"access:access_1_353\":0,\"access:access_1_354\":0,\"access:access_1_355\":0,\"access:access_1_356\":0,\"access:access_1_357\":0,\"access:access_1_358\":0,\"access:access_1_359\":0,\"access:access_1_360\":0,\"access:access_1_361\":0,\"access:access_1_373\":0,\"access:access_1_374\":0,\"access:access_1_375\":0,\"access:access_1_376\":0,\"access:access_1_381\":0,\"access:access_1_382\":0,\"access:access_1_383\":0,\"access:access_1_384\":0,\"access:access_1_385\":0,\"access:access_1_386\":0,\"access:access_1_387\":0,\"access:access_1_388\":0,\"access:access_1_393\":0,\"access:access_1_394\":0,\"access:access_1_395\":0,\"access:access_1_396\":0,\"access:access_1_397\":0,\"access:access_1_398\":0,\"access:access_1_399\":0,\"access:access_1_400\":0,\"access:access_1_401\":0,\"access:access_1_402\":0,\"access:access_1_403\":0,\"access:access_1_404\":0,\"access:access_1_405\":0,\"access:access_1_406\":0,\"access:access_1_407\":0,\"access:access_1_408\":0,\"access:access_1_413\":0,\"access:access_1_414\":0,\"access:access_1_415\":0,\"access:access_1_416\":0,\"access:access_1_417\":0,\"access:access_1_418\":0,\"access:access_1_419\":0,\"access:access_1_420\":0,\"access:access_1_421\":0,\"access:access_1_422\":0,\"access:access_1_423\":0,\"access:access_1_424\":0,\"access:access_1_425\":0,\"access:access_1_426\":0,\"access:access_1_427\":0,\"access:access_1_428\":0,\"access:access_1_429\":0,\"access:access_1_430\":0,\"access:access_1_431\":0,\"access:access_1_432\":0,\"access:access_1_433\":0,\"access:access_1_434\":0,\"access:access_1_435\":0,\"access:access_1_436\":0,\"access:access_1_437\":0,\"access:access_1_438\":0,\"access:access_1_439\":0,\"access:access_1_440\":0,\"access:access_1_441\":0,\"access:access_1_442\":0,\"access:access_1_443\":0,\"access:access_1_444\":0,\"access:access_1_445\":0,\"access:access_1_446\":0,\"access:access_1_447\":0,\"access:access_1_448\":0,\"access:access_1_449\":0,\"access:access_1_450\":0,\"access:access_1_451\":0,\"access:access_1_452\":0,\"access:access_1_453\":0,\"access:access_1_454\":0,\"access:access_1_455\":0,\"access:access_1_456\":0,\"access:access_1_457\":0,\"access:access_1_458\":0,\"access:access_1_459\":0,\"access:access_1_460\":0,\"access:access_1_461\":0,\"access:access_1_462\":0,\"access:access_1_463\":0,\"access:access_1_464\":0,\"access:access_1_465\":0,\"access:access_1_466\":0,\"access:access_1_467\":0,\"access:access_1_468\":0,\"access:access_1_469\":0,\"access:access_1_470\":0,\"access:access_1_471\":0,\"access:access_1_472\":0,\"access:access_1_473\":0,\"access:access_1_474\":0,\"access:access_1_475\":0,\"access:access_1_476\":0,\"access:access_1_477\":0,\"access:access_1_478\":0,\"access:access_1_479\":0,\"access:access_1_480\":0,\"access:access_1_481\":0,\"access:access_1_482\":0,\"access:access_1_483\":0,\"access:access_1_484\":0,\"access:access_1_485\":0,\"access:access_1_486\":0,\"access:access_1_487\":0,\"access:access_1_488\":0,\"access:access_1_489\":0,\"access:access_1_490\":0,\"access:access_1_491\":0,\"access:access_1_492\":0,\"access:access_1_493\":0,\"access:access_1_494\":0,\"access:access_1_495\":0,\"access:access_1_496\":0,\"access:access_1_497\":0,\"access:access_1_498\":0,\"access:access_1_499\":0,\"access:access_1_500\":0,\"access:access_1_501\":0,\"access:access_1_502\":0,\"access:access_1_503\":0,\"zone:Europe\":\"1\",\"zone:North_America\":\"2\",\"zone:Asia\":\"3\",\"zone:Africa\":\"4\",\"zone:Oceania\":\"5\",\"zone:South_America\":\"6\",\"zone:Europe_out_E_U\":\"7\",\"zone:Central_America_Antilla\":\"8\",\"country:DE\":1,\"country:AT\":2,\"country:BE\":3,\"country:CA\":4,\"country:CN\":5,\"country:ES\":6,\"country:FI\":7,\"country:FR\":8,\"country:GR\":9,\"country:IT\":10,\"country:JP\":11,\"country:LU\":12,\"country:NL\":13,\"country:PL\":14,\"country:PT\":15,\"country:CZ\":16,\"country:GB\":17,\"country:SE\":18,\"country:CH\":19,\"country:DK\":20,\"country:US\":21,\"country:HK\":22,\"country:NO\":23,\"country:AU\":24,\"country:SG\":25,\"country:IE\":26,\"country:NZ\":27,\"country:KR\":28,\"country:IL\":29,\"country:ZA\":30,\"country:NG\":31,\"country:CI\":32,\"country:TG\":33,\"country:BO\":34,\"country:MU\":35,\"country:RO\":36,\"country:SK\":37,\"country:DZ\":38,\"country:AS\":39,\"country:AD\":40,\"country:AO\":41,\"country:AI\":42,\"country:AG\":43,\"country:AR\":44,\"country:AM\":45,\"country:AW\":46,\"country:AZ\":47,\"country:BS\":48,\"country:BH\":49,\"country:BD\":50,\"country:BB\":51,\"country:BY\":52,\"country:BZ\":53,\"country:BJ\":54,\"country:BM\":55,\"country:BT\":56,\"country:BW\":57,\"country:BR\":58,\"country:BN\":59,\"country:BF\":60,\"country:MM\":61,\"country:BI\":62,\"country:KH\":63,\"country:CM\":64,\"country:CV\":65,\"country:CF\":66,\"country:TD\":67,\"country:CL\":68,\"country:CO\":69,\"country:KM\":70,\"country:CD\":71,\"country:CG\":72,\"country:CR\":73,\"country:HR\":74,\"country:CU\":75,\"country:CY\":76,\"country:DJ\":77,\"country:DM\":78,\"country:DO\":79,\"country:TL\":80,\"country:EC\":81,\"country:EG\":82,\"country:SV\":83,\"country:GQ\":84,\"country:ER\":85,\"country:EE\":86,\"country:ET\":87,\"country:FK\":88,\"country:FO\":89,\"country:FJ\":90,\"country:GA\":91,\"country:GM\":92,\"country:GE\":93,\"country:GH\":94,\"country:GD\":95,\"country:GL\":96,\"country:GI\":97,\"country:GP\":98,\"country:GU\":99,\"country:GT\":100,\"country:GG\":101,\"country:GN\":102,\"country:GW\":103,\"country:GY\":104,\"country:HT\":105,\"country:VA\":106,\"country:HN\":107,\"country:IS\":108,\"country:IN\":109,\"country:ID\":110,\"country:IR\":111,\"country:IQ\":112,\"country:IM\":113,\"country:JM\":114,\"country:JE\":115,\"country:JO\":116,\"country:KZ\":117,\"country:KE\":118,\"country:KI\":119,\"country:KP\":120,\"country:KW\":121,\"country:KG\":122,\"country:LA\":123,\"country:LV\":124,\"country:LB\":125,\"country:LS\":126,\"country:LR\":127,\"country:LY\":128,\"country:LI\":129,\"country:LT\":130,\"country:MO\":131,\"country:MK\":132,\"country:MG\":133,\"country:MW\":134,\"country:MY\":135,\"country:MV\":136,\"country:ML\":137,\"country:MT\":138,\"country:MH\":139,\"country:MQ\":140,\"country:MR\":141,\"country:HU\":142,\"country:YT\":143,\"country:MX\":144,\"country:FM\":145,\"country:MD\":146,\"country:MC\":147,\"country:MN\":148,\"country:ME\":149,\"country:MS\":150,\"country:MA\":151,\"country:MZ\":152,\"country:NA\":153,\"country:NR\":154,\"country:NP\":155,\"country:NC\":156,\"country:NI\":157,\"country:NE\":158,\"country:NU\":159,\"country:NF\":160,\"country:MP\":161,\"country:OM\":162,\"country:PK\":163,\"country:PW\":164,\"country:PS\":165,\"country:PA\":166,\"country:PG\":167,\"country:PY\":168,\"country:PE\":169,\"country:PH\":170,\"country:PN\":171,\"country:PR\":172,\"country:QA\":173,\"country:RE\":174,\"country:RU\":175,\"country:RW\":176,\"country:BL\":177,\"country:KN\":178,\"country:LC\":179,\"country:MF\":180,\"country:PM\":181,\"country:VC\":182,\"country:WS\":183,\"country:SM\":184,\"country:ST\":185,\"country:SA\":186,\"country:SN\":187,\"country:RS\":188,\"country:SC\":189,\"country:SL\":190,\"country:SI\":191,\"country:SB\":192,\"country:SO\":193,\"country:GS\":194,\"country:LK\":195,\"country:SD\":196,\"country:SR\":197,\"country:SJ\":198,\"country:SZ\":199,\"country:SY\":200,\"country:TW\":201,\"country:TJ\":202,\"country:TZ\":203,\"country:TH\":204,\"country:TK\":205,\"country:TO\":206,\"country:TT\":207,\"country:TN\":208,\"country:TR\":209,\"country:TM\":210,\"country:TC\":211,\"country:TV\":212,\"country:UG\":213,\"country:UA\":214,\"country:AE\":215,\"country:UY\":216,\"country:UZ\":217,\"country:VU\":218,\"country:VE\":219,\"country:VN\":220,\"country:VG\":221,\"country:VI\":222,\"country:WF\":223,\"country:EH\":224,\"country:YE\":225,\"country:ZM\":226,\"country:ZW\":227,\"country:AL\":228,\"country:AF\":229,\"country:AQ\":230,\"country:BA\":231,\"country:IO\":232,\"country:BG\":233,\"country:KY\":234,\"country:CX\":235,\"country:CC\":236,\"country:CK\":237,\"country:GF\":238,\"country:PF\":239,\"country:TF\":240,\"country:AX\":241,\"address_format:address_format_1\":\"0\",\"address_format:address_format_2\":\"0\",\"address_format:address_format_3\":\"0\",\"address_format:address_format_4\":\"0\",\"address_format:address_format_5\":\"0\",\"address_format:address_format_6\":\"0\",\"address_format:address_format_7\":\"0\",\"address_format:address_format_8\":\"0\",\"address_format:address_format_9\":\"0\",\"address_format:address_format_10\":\"0\",\"address_format:address_format_11\":\"0\",\"address_format:address_format_12\":\"0\",\"address_format:address_format_13\":\"0\",\"address_format:address_format_14\":\"0\",\"address_format:address_format_15\":\"0\",\"address_format:address_format_16\":\"0\",\"address_format:address_format_17\":\"0\",\"address_format:address_format_18\":\"0\",\"address_format:address_format_19\":\"0\",\"address_format:address_format_20\":\"0\",\"address_format:address_format_21\":\"0\",\"address_format:address_format_22\":\"0\",\"address_format:address_format_23\":\"0\",\"address_format:address_format_24\":\"0\",\"address_format:address_format_25\":\"0\",\"address_format:address_format_26\":\"0\",\"address_format:address_format_27\":\"0\",\"address_format:address_format_28\":\"0\",\"address_format:address_format_29\":\"0\",\"address_format:address_format_30\":\"0\",\"address_format:address_format_31\":\"0\",\"address_format:address_format_32\":\"0\",\"address_format:address_format_33\":\"0\",\"address_format:address_format_34\":\"0\",\"address_format:address_format_35\":\"0\",\"address_format:address_format_36\":\"0\",\"address_format:address_format_37\":\"0\",\"address_format:address_format_38\":\"0\",\"address_format:address_format_39\":\"0\",\"address_format:address_format_40\":\"0\",\"address_format:address_format_41\":\"0\",\"address_format:address_format_42\":\"0\",\"address_format:address_format_43\":\"0\",\"address_format:address_format_44\":\"0\",\"address_format:address_format_45\":\"0\",\"address_format:address_format_46\":\"0\",\"address_format:address_format_47\":\"0\",\"address_format:address_format_48\":\"0\",\"address_format:address_format_49\":\"0\",\"address_format:address_format_50\":\"0\",\"address_format:address_format_51\":\"0\",\"address_format:address_format_52\":\"0\",\"address_format:address_format_53\":\"0\",\"address_format:address_format_54\":\"0\",\"address_format:address_format_55\":\"0\",\"address_format:address_format_56\":\"0\",\"address_format:address_format_57\":\"0\",\"address_format:address_format_58\":\"0\",\"address_format:address_format_59\":\"0\",\"address_format:address_format_60\":\"0\",\"address_format:address_format_61\":\"0\",\"address_format:address_format_62\":\"0\",\"address_format:address_format_63\":\"0\",\"address_format:address_format_64\":\"0\",\"address_format:address_format_65\":\"0\",\"address_format:address_format_66\":\"0\",\"address_format:address_format_67\":\"0\",\"address_format:address_format_68\":\"0\",\"address_format:address_format_69\":\"0\",\"address_format:address_format_70\":\"0\",\"address_format:address_format_71\":\"0\",\"address_format:address_format_72\":\"0\",\"address_format:address_format_73\":\"0\",\"address_format:address_format_74\":\"0\",\"address_format:address_format_75\":\"0\",\"address_format:address_format_76\":\"0\",\"address_format:address_format_77\":\"0\",\"address_format:address_format_78\":\"0\",\"address_format:address_format_79\":\"0\",\"address_format:address_format_80\":\"0\",\"address_format:address_format_81\":\"0\",\"address_format:address_format_82\":\"0\",\"address_format:address_format_83\":\"0\",\"address_format:address_format_84\":\"0\",\"address_format:address_format_85\":\"0\",\"address_format:address_format_86\":\"0\",\"address_format:address_format_87\":\"0\",\"address_format:address_format_88\":\"0\",\"address_format:address_format_89\":\"0\",\"address_format:address_format_90\":\"0\",\"address_format:address_format_91\":\"0\",\"address_format:address_format_92\":\"0\",\"address_format:address_format_93\":\"0\",\"address_format:address_format_94\":\"0\",\"address_format:address_format_95\":\"0\",\"address_format:address_format_96\":\"0\",\"address_format:address_format_97\":\"0\",\"address_format:address_format_98\":\"0\",\"address_format:address_format_99\":\"0\",\"address_format:address_format_100\":\"0\",\"address_format:address_format_101\":\"0\",\"address_format:address_format_102\":\"0\",\"address_format:address_format_103\":\"0\",\"address_format:address_format_104\":\"0\",\"address_format:address_format_105\":\"0\",\"address_format:address_format_107\":\"0\",\"address_format:address_format_108\":\"0\",\"address_format:address_format_109\":\"0\",\"address_format:address_format_110\":\"0\",\"address_format:address_format_111\":\"0\",\"address_format:address_format_112\":\"0\",\"address_format:address_format_113\":\"0\",\"address_format:address_format_114\":\"0\",\"address_format:address_format_115\":\"0\",\"address_format:address_format_116\":\"0\",\"address_format:address_format_117\":\"0\",\"address_format:address_format_118\":\"0\",\"address_format:address_format_119\":\"0\",\"address_format:address_format_120\":\"0\",\"address_format:address_format_121\":\"0\",\"address_format:address_format_122\":\"0\",\"address_format:address_format_123\":\"0\",\"address_format:address_format_124\":\"0\",\"address_format:address_format_125\":\"0\",\"address_format:address_format_126\":\"0\",\"address_format:address_format_127\":\"0\",\"address_format:address_format_128\":\"0\",\"address_format:address_format_129\":\"0\",\"address_format:address_format_130\":\"0\",\"address_format:address_format_131\":\"0\",\"address_format:address_format_132\":\"0\",\"address_format:address_format_133\":\"0\",\"address_format:address_format_134\":\"0\",\"address_format:address_format_135\":\"0\",\"address_format:address_format_136\":\"0\",\"address_format:address_format_137\":\"0\",\"address_format:address_format_138\":\"0\",\"address_format:address_format_139\":\"0\",\"address_format:address_format_140\":\"0\",\"address_format:address_format_141\":\"0\",\"address_format:address_format_142\":\"0\",\"address_format:address_format_143\":\"0\",\"address_format:address_format_144\":\"0\",\"address_format:address_format_145\":\"0\",\"address_format:address_format_146\":\"0\",\"address_format:address_format_147\":\"0\",\"address_format:address_format_148\":\"0\",\"address_format:address_format_149\":\"0\",\"address_format:address_format_150\":\"0\",\"address_format:address_format_151\":\"0\",\"address_format:address_format_152\":\"0\",\"address_format:address_format_153\":\"0\",\"address_format:address_format_154\":\"0\",\"address_format:address_format_155\":\"0\",\"address_format:address_format_156\":\"0\",\"address_format:address_format_158\":\"0\",\"address_format:address_format_159\":\"0\",\"address_format:address_format_160\":\"0\",\"address_format:address_format_161\":\"0\",\"address_format:address_format_162\":\"0\",\"address_format:address_format_163\":\"0\",\"address_format:address_format_164\":\"0\",\"address_format:address_format_165\":\"0\",\"address_format:address_format_166\":\"0\",\"address_format:address_format_167\":\"0\",\"address_format:address_format_168\":\"0\",\"address_format:address_format_169\":\"0\",\"address_format:address_format_170\":\"0\",\"address_format:address_format_171\":\"0\",\"address_format:address_format_172\":\"0\",\"address_format:address_format_173\":\"0\",\"address_format:address_format_174\":\"0\",\"address_format:address_format_175\":\"0\",\"address_format:address_format_176\":\"0\",\"address_format:address_format_177\":\"0\",\"address_format:address_format_178\":\"0\",\"address_format:address_format_179\":\"0\",\"address_format:address_format_180\":\"0\",\"address_format:address_format_181\":\"0\",\"address_format:address_format_182\":\"0\",\"address_format:address_format_183\":\"0\",\"address_format:address_format_184\":\"0\",\"address_format:address_format_185\":\"0\",\"address_format:address_format_186\":\"0\",\"address_format:address_format_187\":\"0\",\"address_format:address_format_188\":\"0\",\"address_format:address_format_189\":\"0\",\"address_format:address_format_190\":\"0\",\"address_format:address_format_191\":\"0\",\"address_format:address_format_192\":\"0\",\"address_format:address_format_193\":\"0\",\"address_format:address_format_194\":\"0\",\"address_format:address_format_195\":\"0\",\"address_format:address_format_196\":\"0\",\"address_format:address_format_197\":\"0\",\"address_format:address_format_198\":\"0\",\"address_format:address_format_199\":\"0\",\"address_format:address_format_200\":\"0\",\"address_format:address_format_201\":\"0\",\"address_format:address_format_202\":\"0\",\"address_format:address_format_203\":\"0\",\"address_format:address_format_204\":\"0\",\"address_format:address_format_205\":\"0\",\"address_format:address_format_206\":\"0\",\"address_format:address_format_207\":\"0\",\"address_format:address_format_208\":\"0\",\"address_format:address_format_209\":\"0\",\"address_format:address_format_210\":\"0\",\"address_format:address_format_211\":\"0\",\"address_format:address_format_212\":\"0\",\"address_format:address_format_213\":\"0\",\"address_format:address_format_214\":\"0\",\"address_format:address_format_215\":\"0\",\"address_format:address_format_216\":\"0\",\"address_format:address_format_217\":\"0\",\"address_format:address_format_218\":\"0\",\"address_format:address_format_219\":\"0\",\"address_format:address_format_220\":\"0\",\"address_format:address_format_221\":\"0\",\"address_format:address_format_222\":\"0\",\"address_format:address_format_223\":\"0\",\"address_format:address_format_224\":\"0\",\"address_format:address_format_225\":\"0\",\"address_format:address_format_226\":\"0\",\"address_format:address_format_227\":\"0\",\"address_format:address_format_228\":\"0\",\"address_format:address_format_229\":\"0\",\"address_format:address_format_230\":\"0\",\"address_format:address_format_231\":\"0\",\"address_format:address_format_232\":\"0\",\"address_format:address_format_233\":\"0\",\"address_format:address_format_235\":\"0\",\"address_format:address_format_236\":\"0\",\"address_format:address_format_237\":\"0\",\"address_format:address_format_238\":\"0\",\"address_format:address_format_239\":\"0\",\"address_format:address_format_240\":\"0\",\"address_format:address_format_241\":\"0\",\"address_format:address_format_242\":\"0\",\"address_format:address_format_243\":\"0\",\"address_format:address_format_244\":\"0\",\"carrier:carrier_1\":\"1\",\"group:Visitor\":\"1\",\"group:Guest\":\"2\",\"group:Customer\":\"3\",\"carrier_group:carrier_group_1_1\":0,\"carrier_group:carrier_group_1_2\":0,\"carrier_group:carrier_group_1_3\":0,\"carrier_tax_rules_group_shop:carrier_tax_rules_group_shop_1_1_1\":0,\"carrier_zone:carrier_zone_1_1\":0,\"category:Root\":\"1\",\"category:Home\":\"2\",\"category_group:category_group_1_1\":0,\"category_group:category_group_1_2\":0,\"category_group:category_group_1_3\":0,\"cms_category:Home\":\"1\",\"cms:Delivery\":\"1\",\"cms:Legal_Notice\":\"2\",\"cms:Terms_and_conditions_of_use\":\"3\",\"cms:About_us\":\"4\",\"cms:Secure_payment\":\"5\",\"cms_role:\":\"2\",\"configuration:PS_CURRENCY_DEFAULT\":6,\"configuration:PS_COUNTRY_DEFAULT\":7,\"configuration:PS_REWRITING_SETTINGS\":8,\"configuration:PS_ORDER_OUT_OF_STOCK\":9,\"configuration:PS_LAST_QTIES\":10,\"configuration:PS_CONDITIONS\":11,\"configuration:PS_RECYCLABLE_PACK\":12,\"configuration:PS_GIFT_WRAPPING\":13,\"configuration:PS_GIFT_WRAPPING_PRICE\":14,\"configuration:PS_STOCK_MANAGEMENT\":15,\"configuration:PS_NAVIGATION_PIPE\":16,\"configuration:PS_PRODUCTS_PER_PAGE\":17,\"configuration:PS_PURCHASE_MINIMUM\":18,\"configuration:PS_PRODUCTS_ORDER_WAY\":19,\"configuration:PS_PRODUCTS_ORDER_BY\":20,\"configuration:PS_DISPLAY_QTIES\":21,\"configuration:PS_SHIPPING_HANDLING\":22,\"configuration:PS_SHIPPING_FREE_PRICE\":23,\"configuration:PS_SHIPPING_FREE_WEIGHT\":24,\"configuration:PS_SHIPPING_METHOD\":25,\"configuration:PS_TAX\":26,\"configuration:PS_SHOP_ENABLE\":27,\"configuration:PS_NB_DAYS_NEW_PRODUCT\":28,\"configuration:PS_SSL_ENABLED\":29,\"configuration:PS_WEIGHT_UNIT\":30,\"configuration:PS_BLOCK_CART_AJAX\":31,\"configuration:PS_ORDER_RETURN\":32,\"configuration:PS_ORDER_RETURN_NB_DAYS\":33,\"configuration:PS_MAIL_TYPE\":34,\"configuration:PS_PRODUCT_PICTURE_MAX_SIZE\":35,\"configuration:PS_PRODUCT_PICTURE_WIDTH\":36,\"configuration:PS_PRODUCT_PICTURE_HEIGHT\":37,\"configuration:PS_INVOICE_PREFIX\":38,\"configuration:PS_INVCE_INVOICE_ADDR_RULES\":39,\"configuration:PS_INVCE_DELIVERY_ADDR_RULES\":40,\"configuration:PS_DELIVERY_PREFIX\":41,\"configuration:PS_DELIVERY_NUMBER\":42,\"configuration:PS_RETURN_PREFIX\":43,\"configuration:PS_INVOICE\":44,\"configuration:PS_PASSWD_TIME_BACK\":45,\"configuration:PS_PASSWD_TIME_FRONT\":46,\"configuration:PS_PASSWD_RESET_VALIDITY\":47,\"configuration:PS_DISP_UNAVAILABLE_ATTR\":48,\"configuration:PS_SEARCH_INDEXATION\":49,\"configuration:PS_SEARCH_FUZZY\":50,\"configuration:PS_SEARCH_FUZZY_MAX_LOOP\":51,\"configuration:PS_SEARCH_MAX_WORD_LENGTH\":52,\"configuration:PS_SEARCH_MINWORDLEN\":53,\"configuration:PS_SEARCH_BLACKLIST\":54,\"configuration:PS_SEARCH_WEIGHT_PNAME\":55,\"configuration:PS_SEARCH_WEIGHT_REF\":56,\"configuration:PS_SEARCH_WEIGHT_SHORTDESC\":57,\"configuration:PS_SEARCH_WEIGHT_DESC\":58,\"configuration:PS_SEARCH_WEIGHT_CNAME\":59,\"configuration:PS_SEARCH_WEIGHT_MNAME\":60,\"configuration:PS_SEARCH_WEIGHT_TAG\":61,\"configuration:PS_SEARCH_WEIGHT_ATTRIBUTE\":62,\"configuration:PS_SEARCH_WEIGHT_FEATURE\":63,\"configuration:PS_SEARCH_AJAX\":64,\"configuration:PS_TIMEZONE\":65,\"configuration:PS_THEME_V11\":66,\"configuration:PRESTASTORE_LIVE\":67,\"configuration:PS_TIN_ACTIVE\":68,\"configuration:PS_SHOW_ALL_MODULES\":69,\"configuration:PS_BACKUP_ALL\":70,\"configuration:PS_1_3_UPDATE_DATE\":71,\"configuration:PS_PRICE_ROUND_MODE\":72,\"configuration:PS_1_3_2_UPDATE_DATE\":73,\"configuration:PS_CONDITIONS_CMS_ID\":74,\"configuration:PS_VOLUME_UNIT\":75,\"configuration:PS_CIPHER_ALGORITHM\":76,\"configuration:PS_ATTRIBUTE_CATEGORY_DISPLAY\":77,\"configuration:PS_CUSTOMER_SERVICE_FILE_UPLOAD\":78,\"configuration:PS_CUSTOMER_SERVICE_SIGNATURE\":79,\"configuration:PS_BLOCK_BESTSELLERS_DISPLAY\":80,\"configuration:PS_BLOCK_NEWPRODUCTS_DISPLAY\":81,\"configuration:PS_BLOCK_SPECIALS_DISPLAY\":82,\"configuration:PS_STOCK_MVT_REASON_DEFAULT\":83,\"configuration:PS_SPECIFIC_PRICE_PRIORITIES\":84,\"configuration:PS_TAX_DISPLAY\":85,\"configuration:PS_SMARTY_FORCE_COMPILE\":86,\"configuration:PS_DISTANCE_UNIT\":87,\"configuration:PS_STORES_DISPLAY_CMS\":88,\"configuration:SHOP_LOGO_WIDTH\":89,\"configuration:SHOP_LOGO_HEIGHT\":90,\"configuration:EDITORIAL_IMAGE_WIDTH\":91,\"configuration:EDITORIAL_IMAGE_HEIGHT\":92,\"configuration:PS_STATSDATA_CUSTOMER_PAGESVIEWS\":93,\"configuration:PS_STATSDATA_PAGESVIEWS\":94,\"configuration:PS_STATSDATA_PLUGINS\":95,\"configuration:PS_GEOLOCATION_ENABLED\":96,\"configuration:PS_ALLOWED_COUNTRIES\":97,\"configuration:PS_GEOLOCATION_BEHAVIOR\":98,\"configuration:PS_LOCALE_LANGUAGE\":99,\"configuration:PS_LOCALE_COUNTRY\":100,\"configuration:PS_ATTACHMENT_MAXIMUM_SIZE\":101,\"configuration:PS_SMARTY_CACHE\":102,\"configuration:PS_DIMENSION_UNIT\":103,\"configuration:PS_GUEST_CHECKOUT_ENABLED\":104,\"configuration:PS_DISPLAY_SUPPLIERS\":105,\"configuration:PS_DISPLAY_MANUFACTURERS\":106,\"configuration:PS_DISPLAY_BEST_SELLERS\":107,\"configuration:PS_CATALOG_MODE\":108,\"configuration:PS_GEOLOCATION_WHITELIST\":109,\"configuration:PS_LOGS_BY_EMAIL\":110,\"configuration:PS_COOKIE_CHECKIP\":111,\"configuration:PS_COOKIE_SAMESITE\":112,\"configuration:PS_USE_ECOTAX\":113,\"configuration:PS_CANONICAL_REDIRECT\":114,\"configuration:PS_IMG_UPDATE_TIME\":115,\"configuration:PS_BACKUP_DROP_TABLE\":116,\"configuration:PS_OS_CHEQUE\":117,\"configuration:PS_OS_PAYMENT\":118,\"configuration:PS_OS_PREPARATION\":119,\"configuration:PS_OS_SHIPPING\":120,\"configuration:PS_OS_DELIVERED\":121,\"configuration:PS_OS_CANCELED\":122,\"configuration:PS_OS_REFUND\":123,\"configuration:PS_OS_ERROR\":124,\"configuration:PS_OS_OUTOFSTOCK\":125,\"configuration:PS_OS_BANKWIRE\":126,\"configuration:PS_OS_WS_PAYMENT\":127,\"configuration:PS_OS_OUTOFSTOCK_PAID\":128,\"configuration:PS_OS_OUTOFSTOCK_UNPAID\":129,\"configuration:PS_OS_COD_VALIDATION\":130,\"configuration:PS_LEGACY_IMAGES\":131,\"configuration:PS_IMAGE_QUALITY\":132,\"configuration:PS_PNG_QUALITY\":133,\"configuration:PS_JPEG_QUALITY\":134,\"configuration:PS_WEBP_QUALITY\":135,\"configuration:PS_COOKIE_LIFETIME_FO\":136,\"configuration:PS_COOKIE_LIFETIME_BO\":137,\"configuration:PS_RESTRICT_DELIVERED_COUNTRIES\":138,\"configuration:PS_SHOW_NEW_ORDERS\":139,\"configuration:PS_SHOW_NEW_CUSTOMERS\":140,\"configuration:PS_SHOW_NEW_MESSAGES\":141,\"configuration:PS_FEATURE_FEATURE_ACTIVE\":142,\"configuration:PS_COMBINATION_FEATURE_ACTIVE\":143,\"configuration:PS_SPECIFIC_PRICE_FEATURE_ACTIVE\":144,\"configuration:PS_VIRTUAL_PROD_FEATURE_ACTIVE\":145,\"configuration:PS_CUSTOMIZATION_FEATURE_ACTIVE\":146,\"configuration:PS_CART_RULE_FEATURE_ACTIVE\":147,\"configuration:PS_PACK_FEATURE_ACTIVE\":148,\"configuration:PS_ALIAS_FEATURE_ACTIVE\":149,\"configuration:PS_TAX_ADDRESS_TYPE\":150,\"configuration:PS_SHOP_DEFAULT\":151,\"configuration:PS_CARRIER_DEFAULT_SORT\":152,\"configuration:PS_STOCK_MVT_INC_REASON_DEFAULT\":153,\"configuration:PS_STOCK_MVT_DEC_REASON_DEFAULT\":154,\"configuration:PS_ADVANCED_STOCK_MANAGEMENT\":155,\"configuration:PS_STOCK_MVT_TRANSFER_TO\":156,\"configuration:PS_STOCK_MVT_TRANSFER_FROM\":157,\"configuration:PS_CARRIER_DEFAULT_ORDER\":158,\"configuration:PS_STOCK_MVT_SUPPLY_ORDER\":159,\"configuration:PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON\":160,\"configuration:PS_STOCK_CUSTOMER_RETURN_REASON\":161,\"configuration:PS_STOCK_MVT_INC_EMPLOYEE_EDITION\":162,\"configuration:PS_STOCK_MVT_DEC_EMPLOYEE_EDITION\":163,\"configuration:PS_STOCK_CUSTOMER_ORDER_REASON\":164,\"configuration:PS_UNIDENTIFIED_GROUP\":165,\"configuration:PS_GUEST_GROUP\":166,\"configuration:PS_CUSTOMER_GROUP\":167,\"configuration:PS_SMARTY_CONSOLE\":168,\"configuration:PS_INVOICE_MODEL\":169,\"configuration:PS_LIMIT_UPLOAD_IMAGE_VALUE\":170,\"configuration:PS_LIMIT_UPLOAD_FILE_VALUE\":171,\"configuration:MB_PAY_TO_EMAIL\":172,\"configuration:MB_SECRET_WORD\":173,\"configuration:MB_HIDE_LOGIN\":174,\"configuration:MB_ID_LOGO\":175,\"configuration:MB_ID_LOGO_WALLET\":176,\"configuration:MB_PARAMETERS\":177,\"configuration:MB_PARAMETERS_2\":178,\"configuration:MB_DISPLAY_MODE\":179,\"configuration:MB_CANCEL_URL\":180,\"configuration:MB_LOCAL_METHODS\":181,\"configuration:MB_INTER_METHODS\":182,\"configuration:BANK_WIRE_CURRENCIES\":183,\"configuration:CHEQUE_CURRENCIES\":184,\"configuration:PRODUCTS_VIEWED_NBR\":185,\"configuration:BLOCK_CATEG_DHTML\":186,\"configuration:BLOCK_CATEG_MAX_DEPTH\":187,\"configuration:MANUFACTURER_DISPLAY_FORM\":188,\"configuration:MANUFACTURER_DISPLAY_TEXT\":189,\"configuration:MANUFACTURER_DISPLAY_TEXT_NB\":190,\"configuration:NEW_PRODUCTS_NBR\":191,\"configuration:PS_TOKEN_ENABLE\":192,\"configuration:PS_STATS_RENDER\":193,\"configuration:PS_STATS_OLD_CONNECT_AUTO_CLEAN\":194,\"configuration:PS_STATS_GRID_RENDER\":195,\"configuration:BLOCKTAGS_NBR\":196,\"configuration:CHECKUP_DESCRIPTIONS_LT\":197,\"configuration:CHECKUP_DESCRIPTIONS_GT\":198,\"configuration:CHECKUP_IMAGES_LT\":199,\"configuration:CHECKUP_IMAGES_GT\":200,\"configuration:CHECKUP_SALES_LT\":201,\"configuration:CHECKUP_SALES_GT\":202,\"configuration:CHECKUP_STOCK_LT\":203,\"configuration:CHECKUP_STOCK_GT\":204,\"configuration:FOOTER_CMS\":205,\"configuration:FOOTER_BLOCK_ACTIVATION\":206,\"configuration:FOOTER_POWEREDBY\":207,\"configuration:BLOCKADVERT_LINK\":208,\"configuration:BLOCKSTORE_IMG\":209,\"configuration:BLOCKADVERT_IMG_EXT\":210,\"configuration:MOD_BLOCKTOPMENU_ITEMS\":211,\"configuration:MOD_BLOCKTOPMENU_SEARCH\":212,\"configuration:blocksocial_facebook\":213,\"configuration:blocksocial_twitter\":214,\"configuration:blocksocial_rss\":215,\"configuration:blockcontactinfos_company\":216,\"configuration:blockcontactinfos_address\":217,\"configuration:blockcontactinfos_phone\":218,\"configuration:blockcontactinfos_email\":219,\"configuration:blockcontact_telnumber\":220,\"configuration:blockcontact_email\":221,\"configuration:SUPPLIER_DISPLAY_TEXT\":222,\"configuration:SUPPLIER_DISPLAY_TEXT_NB\":223,\"configuration:SUPPLIER_DISPLAY_FORM\":224,\"configuration:BLOCK_CATEG_NBR_COLUMN_FOOTER\":225,\"configuration:UPGRADER_BACKUPDB_FILENAME\":226,\"configuration:UPGRADER_BACKUPFILES_FILENAME\":227,\"configuration:BLOCKREINSURANCE_NBBLOCKS\":228,\"configuration:HOMESLIDER_WIDTH\":229,\"configuration:HOMESLIDER_SPEED\":230,\"configuration:HOMESLIDER_PAUSE\":231,\"configuration:HOMESLIDER_LOOP\":232,\"configuration:PS_BASE_DISTANCE_UNIT\":233,\"configuration:PS_SHOP_DOMAIN\":234,\"configuration:PS_SHOP_DOMAIN_SSL\":235,\"configuration:PS_SHOP_NAME\":236,\"configuration:PS_SHOP_EMAIL\":237,\"configuration:PS_MAIL_METHOD\":238,\"configuration:PS_SHOP_ACTIVITY\":239,\"configuration:PS_LOGO\":240,\"configuration:PS_FAVICON\":241,\"configuration:PS_STORES_ICON\":242,\"configuration:PS_ROOT_CATEGORY\":243,\"configuration:PS_HOME_CATEGORY\":244,\"configuration:PS_CONFIGURATION_AGREMENT\":245,\"configuration:PS_MAIL_SERVER\":246,\"configuration:PS_MAIL_USER\":247,\"configuration:PS_MAIL_PASSWD\":248,\"configuration:PS_MAIL_SMTP_ENCRYPTION\":249,\"configuration:PS_MAIL_SMTP_PORT\":250,\"configuration:PS_MAIL_COLOR\":251,\"configuration:PS_MAIL_DKIM_ENABLE\":252,\"configuration:PS_MAIL_DKIM_DOMAIN\":253,\"configuration:PS_MAIL_DKIM_SELECTOR\":254,\"configuration:PS_MAIL_DKIM_KEY\":255,\"configuration:NW_SALT\":256,\"configuration:PS_PAYMENT_LOGO_CMS_ID\":257,\"configuration:HOME_FEATURED_NBR\":258,\"configuration:SEK_MIN_OCCURENCES\":259,\"configuration:SEK_FILTER_KW\":260,\"configuration:PS_ALLOW_MOBILE_DEVICE\":261,\"configuration:PS_CUSTOMER_CREATION_EMAIL\":262,\"configuration:PS_SMARTY_CONSOLE_KEY\":263,\"configuration:PS_ATTRIBUTE_ANCHOR_SEPARATOR\":264,\"configuration:CONF_AVERAGE_PRODUCT_MARGIN\":265,\"configuration:PS_DASHBOARD_SIMULATION\":266,\"configuration:PS_USE_HTMLPURIFIER\":267,\"configuration:PS_SMARTY_LOCAL\":268,\"configuration:PS_SMARTY_CLEAR_CACHE\":269,\"configuration:PS_DETECT_LANG\":270,\"configuration:PS_DETECT_COUNTRY\":271,\"configuration:PS_ROUND_TYPE\":272,\"configuration:PS_LOG_EMAILS\":273,\"configuration:PS_CUSTOMER_OPTIN\":274,\"configuration:PS_CUSTOMER_BIRTHDATE\":275,\"configuration:PS_PACK_STOCK_TYPE\":276,\"configuration:PS_LOG_MODULE_PERFS_MODULO\":277,\"configuration:PS_DISALLOW_HISTORY_REORDERING\":278,\"configuration:PS_DISPLAY_PRODUCT_WEIGHT\":279,\"configuration:PS_PRODUCT_WEIGHT_PRECISION\":280,\"configuration:PS_ORDER_RECALCULATE_SHIPPING\":281,\"configuration:PS_MAINTENANCE_TEXT\":282,\"configuration:PS_PRODUCT_SHORT_DESC_LIMIT\":283,\"configuration:PS_LABEL_IN_STOCK_PRODUCTS\":284,\"configuration:PS_LABEL_OOS_PRODUCTS_BOA\":285,\"configuration:PS_LABEL_OOS_PRODUCTS_BOD\":286,\"configuration:PS_CATALOG_MODE_WITH_PRICES\":287,\"configuration:PS_MAIL_THEME\":288,\"configuration:PS_ORDER_PRODUCTS_NB_PER_PAGE\":289,\"configuration:PS_LOGS_EMAIL_RECEIVERS\":290,\"configuration:PS_SHOW_LABEL_OOS_LISTING_PAGES\":291,\"configuration:ADDONS_API_MODULE_CHANNEL\":292,\"configuration:PS_SECURITY_TOKEN\":293,\"configuration:PS_SECURITY_PASSWORD_POLICY_MAXIMUM_LENGTH\":294,\"configuration:PS_SECURITY_PASSWORD_POLICY_MINIMUM_LENGTH\":295,\"configuration:PS_SECURITY_PASSWORD_POLICY_MINIMUM_SCORE\":296,\"contact:Webmaster\":\"1\",\"contact:Customer_service\":\"2\",\"feature_flag:product_page_v2\":\"1\",\"feature_flag:product_page_v2_multi_shop\":\"2\",\"gender:Mr\":\"1\",\"gender:Mrs\":\"2\",\"hook:actionValidateOrder\":1,\"hook:actionValidateOrderAfter\":2,\"hook:displayMaintenance\":3,\"hook:displayCartModalContent\":4,\"hook:displayCartModalFooter\":5,\"hook:displayProductPageDrawer\":6,\"hook:actionPaymentConfirmation\":7,\"hook:displayPaymentReturn\":8,\"hook:actionUpdateQuantity\":9,\"hook:displayRightColumn\":10,\"hook:displayWrapperTop\":11,\"hook:displayWrapperBottom\":12,\"hook:displayContentWrapperTop\":13,\"hook:displayContentWrapperBottom\":14,\"hook:displayLeftColumn\":15,\"hook:displayHome\":16,\"hook:displayHeader\":17,\"hook:actionCartSave\":18,\"hook:actionAuthentication\":19,\"hook:actionProductAdd\":20,\"hook:actionProductUpdate\":21,\"hook:displayAfterTitleTag\":22,\"hook:displayAfterBodyOpeningTag\":23,\"hook:displayBanner\":24,\"hook:displayBeforeBodyClosingTag\":25,\"hook:displayTop\":26,\"hook:displayNavFullWidth\":27,\"hook:displayRightColumnProduct\":28,\"hook:actionProductDelete\":29,\"hook:actionObjectProductInCartDeleteBefore\":30,\"hook:actionObjectProductInCartDeleteAfter\":31,\"hook:displayFooterProduct\":32,\"hook:displayInvoice\":33,\"hook:actionOrderStatusUpdate\":34,\"hook:displayAdminGridTableBefore\":573,\"hook:displayAdminGridTableAfter\":574,\"hook:displayAdminOrder\":37,\"hook:displayAdminOrderTabOrder\":38,\"hook:displayAdminOrderTabShip\":39,\"hook:displayAdminOrderContentOrder\":40,\"hook:displayAdminOrderContentShip\":41,\"hook:displayFooter\":42,\"hook:displayPDFInvoice\":43,\"hook:displayInvoiceLegalFreeText\":44,\"hook:displayAdminCustomers\":45,\"hook:displayAdminCustomersAddressesItemAction\":46,\"hook:displayOrderConfirmation\":47,\"hook:actionCustomerAccountAdd\":48,\"hook:actionCustomerAccountUpdate\":49,\"hook:displayCustomerAccount\":50,\"hook:actionOrderSlipAdd\":51,\"hook:displayShoppingCartFooter\":52,\"hook:displayCreateAccountEmailFormBottom\":53,\"hook:displayAuthenticateFormBottom\":54,\"hook:displayCustomerAccountForm\":55,\"hook:displayModuleConfigureExtraButtons\":56,\"hook:displayAdminStatsModules\":57,\"hook:displayAdminStatsGraphEngine\":58,\"hook:actionOrderReturn\":59,\"hook:displayProductAdditionalInfo\":60,\"hook:displayBackOfficeHome\":61,\"hook:displayAdminStatsGridEngine\":62,\"hook:actionWatermark\":63,\"hook:actionProductCancel\":64,\"hook:displayLeftColumnProduct\":65,\"hook:actionProductOutOfStock\":66,\"hook:actionProductAttributeUpdate\":67,\"hook:displayCarrierList\":68,\"hook:displayShoppingCart\":69,\"hook:actionCarrierUpdate\":70,\"hook:actionOrderStatusPostUpdate\":71,\"hook:displayCustomerAccountFormTop\":72,\"hook:displayBackOfficeHeader\":73,\"hook:displayBackOfficeTop\":74,\"hook:displayAdminEndContent\":75,\"hook:displayBackOfficeFooter\":76,\"hook:actionProductAttributeDelete\":77,\"hook:actionCarrierProcess\":78,\"hook:displayBeforeCarrier\":79,\"hook:displayAfterCarrier\":80,\"hook:displayOrderDetail\":81,\"hook:actionPaymentCCAdd\":82,\"hook:actionCategoryAdd\":83,\"hook:actionCategoryUpdate\":84,\"hook:actionCategoryDelete\":85,\"hook:displayPaymentTop\":86,\"hook:actionHtaccessCreate\":87,\"hook:actionAdminMetaSave\":88,\"hook:displayAttributeGroupForm\":89,\"hook:actionAttributeGroupSave\":90,\"hook:actionAttributeGroupDelete\":91,\"hook:displayFeatureForm\":92,\"hook:actionFeatureSave\":93,\"hook:actionFeatureDelete\":94,\"hook:actionProductSave\":95,\"hook:displayAttributeGroupPostProcess\":96,\"hook:displayFeaturePostProcess\":97,\"hook:displayFeatureValueForm\":98,\"hook:displayFeatureValuePostProcess\":99,\"hook:actionFeatureValueDelete\":100,\"hook:actionFeatureValueSave\":101,\"hook:displayAttributeForm\":102,\"hook:actionAttributePostProcess\":103,\"hook:actionAttributeDelete\":104,\"hook:actionAttributeSave\":105,\"hook:actionTaxManager\":106,\"hook:displayMyAccountBlock\":107,\"hook:actionModuleInstallBefore\":108,\"hook:actionModuleInstallAfter\":109,\"hook:actionModuleUninstallBefore\":110,\"hook:actionModuleUninstallAfter\":111,\"hook:displayTopColumn\":112,\"hook:displayBackOfficeCategory\":113,\"hook:displayProductListFunctionalButtons\":114,\"hook:displayNav\":115,\"hook:displayOverrideTemplate\":116,\"hook:actionAdminLoginControllerSetMedia\":117,\"hook:actionOrderEdited\":118,\"hook:actionEmailAddBeforeContent\":119,\"hook:actionEmailAddAfterContent\":120,\"hook:sendMailAlterTemplateVars\":121,\"hook:displayCartExtraProductActions\":122,\"hook:displayPaymentByBinaries\":123,\"hook:additionalCustomerFormFields\":124,\"hook:additionalCustomerAddressFields\":125,\"hook:addWebserviceResources\":126,\"hook:displayCustome', '2023-05-02 12:16:57', '2023-05-02 12:16:57'), -(298, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', '2023-05-02 12:16:57', '2023-08-28 11:40:31'), -(299, NULL, NULL, 'PSR_HOOK_HEADER', '0', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(300, NULL, NULL, 'PSR_HOOK_FOOTER', '0', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(301, NULL, NULL, 'PSR_HOOK_PRODUCT', '1', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(302, NULL, NULL, 'PSR_HOOK_CHECKOUT', '1', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(303, NULL, NULL, 'PSR_ICON_COLOR', '#F19D76', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(304, NULL, NULL, 'PSR_TEXT_COLOR', '#000000', '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(305, NULL, NULL, 'blockwishlist_WishlistPageName', NULL, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(306, NULL, NULL, 'blockwishlist_WishlistDefaultTitle', NULL, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(307, NULL, NULL, 'blockwishlist_CreateButtonLabel', NULL, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(308, NULL, NULL, 'PSGDPR_CREATION_FORM_SWITCH', '1', '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(309, NULL, NULL, 'PSGDPR_CREATION_FORM', NULL, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(310, NULL, NULL, 'PSGDPR_CUSTOMER_FORM_SWITCH', '1', '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(311, NULL, NULL, 'PSGDPR_CUSTOMER_FORM', NULL, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(312, NULL, NULL, 'PSGDPR_ANONYMOUS_CUSTOMER', '1', '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(313, NULL, NULL, 'PSGDPR_ANONYMOUS_ADDRESS', '1', '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(314, NULL, NULL, 'PS_CONTACT_INFO_DISPLAY_EMAIL', '1', '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(315, NULL, NULL, 'HOMESLIDER_PAUSE_ON_HOVER', '1', '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(316, NULL, NULL, 'HOMESLIDER_WRAP', '1', '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(317, NULL, NULL, 'HOME_FEATURED_CAT', '2', '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(318, NULL, NULL, 'HOME_FEATURED_RANDOMIZE', NULL, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(319, NULL, NULL, 'BANNER_IMG', NULL, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(320, NULL, NULL, 'BANNER_LINK', NULL, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(321, NULL, NULL, 'BANNER_DESC', NULL, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(322, NULL, NULL, 'BLOCKSPECIALS_SPECIALS_NBR', '8', '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(323, NULL, NULL, 'PS_BLOCK_BESTSELLERS_TO_DISPLAY', '8', '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(324, NULL, NULL, 'PS_NEWSLETTER_RAND', '897105668133923056', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(325, NULL, NULL, 'NW_CONDITIONS', NULL, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(326, NULL, NULL, 'BLOCKSOCIAL_YOUTUBE', NULL, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(327, NULL, NULL, 'BLOCKSOCIAL_PINTEREST', NULL, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(328, NULL, NULL, 'BLOCKSOCIAL_VIMEO', NULL, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(329, NULL, NULL, 'BLOCKSOCIAL_INSTAGRAM', NULL, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(330, NULL, NULL, 'BLOCKSOCIAL_LINKEDIN', NULL, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(331, NULL, NULL, 'PRODUCT_COMMENTS_MINIMAL_TIME', '30', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(332, NULL, NULL, 'PRODUCT_COMMENTS_ALLOW_GUESTS', '0', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(333, NULL, NULL, 'PRODUCT_COMMENTS_USEFULNESS', '1', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(334, NULL, NULL, 'PRODUCT_COMMENTS_COMMENTS_PER_PAGE', '5', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(335, NULL, NULL, 'PRODUCT_COMMENTS_ANONYMISATION', '0', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(336, NULL, NULL, 'PRODUCT_COMMENTS_MODERATE', '1', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(337, NULL, NULL, 'BLOCK_CATEG_ROOT_CATEGORY', '1', '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(347, NULL, NULL, 'PS_SC_TWITTER', '1', '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(348, NULL, NULL, 'PS_SC_FACEBOOK', '1', '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(349, NULL, NULL, 'PS_SC_PINTEREST', '1', '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(350, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_LAST_ORDER', '10', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(351, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_BEST_SELLER', '10', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(352, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_MOST_VIEWED', '10', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(353, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_TOP_SEARCH', '10', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(354, NULL, NULL, 'CONF_PS_CASHONDELIVERY_FIXED', '0.2', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(355, NULL, NULL, 'CONF_PS_CASHONDELIVERY_VAR', '2', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(356, NULL, NULL, 'CONF_PS_CASHONDELIVERY_FIXED_FOREIGN', '0.2', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(357, NULL, NULL, 'CONF_PS_CASHONDELIVERY_VAR_FOREIGN', '2', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(358, NULL, NULL, 'GA_CANCELLED_STATES', '[\"6\"]', '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(359, NULL, NULL, 'PS_DASHGOALS_CURRENT_YEAR', '2023', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(360, NULL, NULL, 'CUSTPRIV_MSG_AUTH', NULL, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(361, NULL, NULL, 'MA_MERCHANT_ORDER', '1', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(362, NULL, NULL, 'MA_MERCHANT_OOS', '1', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(363, NULL, NULL, 'MA_CUSTOMER_QTY', '1', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(364, NULL, NULL, 'MA_ORDER_EDIT', '1', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(365, NULL, NULL, 'MA_RETURN_SLIP', '1', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(366, NULL, NULL, 'MA_MERCHANT_MAILS', 'demo@prestashop.com', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(367, NULL, NULL, 'MA_LAST_QTIES', '3', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(368, NULL, NULL, 'MA_MERCHANT_COVERAGE', '0', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(369, NULL, NULL, 'MA_PRODUCT_COVERAGE', '0', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(370, NULL, NULL, 'GSITEMAP_PRIORITY_HOME', '1', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(371, NULL, NULL, 'GSITEMAP_PRIORITY_PRODUCT', '0.9', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(372, NULL, NULL, 'GSITEMAP_PRIORITY_CATEGORY', '0.8', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(373, NULL, NULL, 'GSITEMAP_PRIORITY_CMS', '0.7', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(374, NULL, NULL, 'GSITEMAP_FREQUENCY', 'weekly', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(375, NULL, NULL, 'GSITEMAP_CHECK_IMAGE_FILE', NULL, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(376, NULL, NULL, 'GSITEMAP_LAST_EXPORT', NULL, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(377, NULL, NULL, 'CATEGORYPRODUCTS_DISPLAY_PRICE', '1', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(378, NULL, NULL, 'CATEGORYPRODUCTS_DISPLAY_PRODUCTS', '16', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(379, NULL, NULL, 'BANK_WIRE_PAYMENT_INVITE', '1', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(380, NULL, NULL, 'CONF_PS_WIREPAYMENT_FIXED', '0.2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(381, NULL, NULL, 'CONF_PS_WIREPAYMENT_VAR', '2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(382, NULL, NULL, 'CONF_PS_WIREPAYMENT_FIXED_FOREIGN', '0.2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(383, NULL, NULL, 'CONF_PS_WIREPAYMENT_VAR_FOREIGN', '2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(384, NULL, NULL, 'SUPPLIER_DISPLAY_TYPE', 'supplier_text', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(385, NULL, NULL, 'CONF_PS_CHECKPAYMENT_FIXED', '0.2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(386, NULL, NULL, 'CONF_PS_CHECKPAYMENT_VAR', '2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(387, NULL, NULL, 'CONF_PS_CHECKPAYMENT_FIXED_FOREIGN', '0.2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(388, NULL, NULL, 'CONF_PS_CHECKPAYMENT_VAR_FOREIGN', '2', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(389, NULL, NULL, 'CROSSSELLING_DISPLAY_PRICE', '1', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(390, NULL, NULL, 'CROSSSELLING_NBR', '8', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(391, NULL, NULL, 'BRAND_DISPLAY_TYPE', 'brand_text', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(392, NULL, NULL, 'BRAND_DISPLAY_TEXT_NB', '5', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(393, NULL, NULL, 'DASHACTIVITY_CART_ACTIVE', '30', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(394, NULL, NULL, 'DASHACTIVITY_CART_ABANDONED_MIN', '24', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(395, NULL, NULL, 'DASHACTIVITY_CART_ABANDONED_MAX', '48', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(396, NULL, NULL, 'DASHACTIVITY_VISITOR_ONLINE', '30', '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(397, NULL, NULL, 'PS_LAYERED_CACHE_ENABLED', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(398, NULL, NULL, 'PS_LAYERED_SHOW_QTIES', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(399, NULL, NULL, 'PS_LAYERED_FULL_TREE', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(400, NULL, NULL, 'PS_LAYERED_FILTER_PRICE_USETAX', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(401, NULL, NULL, 'PS_LAYERED_FILTER_CATEGORY_DEPTH', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(402, NULL, NULL, 'PS_LAYERED_FILTER_PRICE_ROUNDING', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(403, NULL, NULL, 'PS_LAYERED_FILTER_SHOW_OUT_OF_STOCK_LAST', '0', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(404, NULL, NULL, 'PS_LAYERED_FILTER_BY_DEFAULT_CATEGORY', '0', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(405, NULL, NULL, 'PS_LAYERED_INDEXED', '1', '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(406, NULL, NULL, 'CONF_MOLLIE_FIXED', '0.2', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(407, NULL, NULL, 'CONF_MOLLIE_VAR', '2', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(408, NULL, NULL, 'CONF_MOLLIE_FIXED_FOREIGN', '0.2', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(409, NULL, NULL, 'CONF_MOLLIE_VAR_FOREIGN', '2', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(410, NULL, NULL, 'MOLLIE_STATUS_PARTIAL_REFUND', '14', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(411, NULL, NULL, 'MOLLIE_STATUS_AWAITING', '15', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(412, NULL, NULL, 'MOLLIE_PARTIALLY_SHIPPED', '16', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(413, NULL, NULL, 'MOLLIE_STATUS_ORDER_COMPLETED', '17', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(414, NULL, NULL, 'MOLLIE_STATUS_KLARNA_AUTHORIZED', '18', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(415, NULL, NULL, 'MOLLIE_KLARNA_INVOICE_ON', 'MOLLIE_STATUS_KLARNA_AUTHORIZED', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(416, NULL, NULL, 'MOLLIE_STATUS_KLARNA_SHIPPED', '19', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(417, NULL, NULL, 'MOLLIE_STATUS_CHARGEBACK', '20', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(420, NULL, NULL, 'MOLLIE_ENVIRONMENT', '0', '2023-05-08 16:29:53', '2023-05-08 16:29:53'), -(432, NULL, NULL, 'MOLLIE_STATUS_OPEN', '15', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(433, NULL, NULL, 'MOLLIE_STATUS_PAID', '2', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(434, NULL, NULL, 'MOLLIE_STATUS_COMPLETED', '17', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(435, NULL, NULL, 'MOLLIE_STATUS_CANCELED', '6', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(436, NULL, NULL, 'MOLLIE_STATUS_EXPIRED', '6', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(437, NULL, NULL, 'MOLLIE_STATUS_REFUNDED', '7', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(438, NULL, NULL, 'MOLLIE_STATUS_SHIPPING', '16', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(448, NULL, NULL, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(449, NULL, NULL, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(451, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_meal', '11', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(452, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_gift', '12', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(453, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_eco', '13', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(454, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_ID', '3', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(455, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_GROUP', '5', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(456, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_NONE', '26', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(457, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_DAILY', '27', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(458, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_WEEKLY', '28', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(459, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_MONTHLY', '29', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(460, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '30', '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(484, NULL, NULL, 'PS_ALLOW_HTML_IFRAME', NULL, '2023-05-08 16:59:10', '2023-08-28 11:40:31'), -(485, NULL, NULL, 'PS_MULTISHOP_FEATURE_ACTIVE', NULL, '2023-05-08 16:59:10', '2023-08-28 11:40:31'), -(486, NULL, NULL, 'PS_CCCJS_VERSION', '2', '2023-05-08 17:09:12', '2023-08-28 11:52:30'), -(487, NULL, NULL, 'PS_CCCCSS_VERSION', '2', '2023-05-08 17:09:12', '2023-08-28 11:52:30'), -(492, 1, 1, 'MOLLIE_ENVIRONMENT', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(493, 1, 2, 'MOLLIE_ENVIRONMENT', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(516, 1, 1, 'MOLLIE_STATUS_OPEN', '15', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(517, 1, 2, 'MOLLIE_STATUS_OPEN', '15', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(518, 1, 1, 'MOLLIE_STATUS_PAID', '2', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(519, 1, 2, 'MOLLIE_STATUS_PAID', '2', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(520, 1, 1, 'MOLLIE_STATUS_COMPLETED', '17', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(521, 1, 2, 'MOLLIE_STATUS_COMPLETED', '17', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(522, 1, 1, 'MOLLIE_STATUS_CANCELED', '6', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(523, 1, 2, 'MOLLIE_STATUS_CANCELED', '6', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(524, 1, 1, 'MOLLIE_STATUS_EXPIRED', '6', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(525, 1, 2, 'MOLLIE_STATUS_EXPIRED', '6', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(526, 1, 1, 'MOLLIE_STATUS_REFUNDED', '7', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(527, 1, 2, 'MOLLIE_STATUS_REFUNDED', '7', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(528, 1, 1, 'MOLLIE_STATUS_SHIPPING', '16', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(529, 1, 2, 'MOLLIE_STATUS_SHIPPING', '16', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(548, 1, 1, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(549, 1, 2, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(550, 1, 1, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(551, 1, 2, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2023-05-15 09:46:59', '2023-05-15 09:46:59'), -(600, 1, 2, 'MOLLIE_SHOW_CUSTOM_LOGO', '0', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), -(601, 1, 2, 'MOLLIE_KLARNA_INVOICE_ON', 'MOLLIE_STATUS_KLARNA_AUTHORIZED', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), -(602, 1, 2, 'MOLLIE_APPLE_PAY_DIRECT', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(603, 1, 2, 'MOLLIE_SINGLE_CLICK_PAYMENT', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(604, 1, 2, 'MOLLIE_SHOW_RESEND_PAYMENT_LINK', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(605, 1, 2, 'MOLLIE_VOUCHER_CATEGORY', 'null', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), -(606, 1, 2, 'MOLLIE_AS_MAIN', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(607, 1, 2, 'MOLLIE_STATUS_AWAITING', '15', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), -(608, 1, 2, 'MOLLIE_MAIL_WHEN_AWAITING', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(610, 1, 2, 'MOLLIE_STATUS_PARTIAL_REFUND', '14', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), -(611, 1, 2, 'MOLLIE_MAIL_WHEN_PARTIAL_REFUND', NULL, '2023-05-15 09:54:40', '2023-05-15 10:29:46'), -(612, 1, 2, 'MOLLIE_STATUS_CHARGEBACK', '20', '2023-05-15 09:54:40', '2023-05-15 09:54:40'), -(659, NULL, NULL, 'PS_ALLOW_ACCENTED_CHARS_URL', NULL, '2023-08-28 11:52:30', '2023-08-28 11:52:30'), -(660, NULL, NULL, 'PS_HTACCESS_DISABLE_MULTIVIEWS', NULL, '2023-08-28 11:52:30', '2023-08-28 11:52:30'), -(661, NULL, NULL, 'PS_HTACCESS_DISABLE_MODSEC', NULL, '2023-08-28 11:52:30', '2023-08-28 11:52:30'); +(297, NULL, NULL, 'PS_INSTALL_XML_LOADERS_ID', '{\"authorization_role:TAB_ADMINACCESS_CREATE\":1,\"authorization_role:TAB_ADMINACCESS_READ\":2,\"authorization_role:TAB_ADMINACCESS_UPDATE\":3,\"authorization_role:TAB_ADMINACCESS_DELETE\":4,\"authorization_role:TAB_ADMINADDRESSES_CREATE\":5,\"authorization_role:TAB_ADMINADDRESSES_READ\":6,\"authorization_role:TAB_ADMINADDRESSES_UPDATE\":7,\"authorization_role:TAB_ADMINADDRESSES_DELETE\":8,\"authorization_role:TAB_ADMINADMINPREFERENCES_CREATE\":9,\"authorization_role:TAB_ADMINADMINPREFERENCES_READ\":10,\"authorization_role:TAB_ADMINADMINPREFERENCES_UPDATE\":11,\"authorization_role:TAB_ADMINADMINPREFERENCES_DELETE\":12,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_CREATE\":13,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_READ\":14,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_UPDATE\":15,\"authorization_role:TAB_ADMINADVANCEDPARAMETERS_DELETE\":16,\"authorization_role:TAB_ADMINATTACHMENTS_CREATE\":17,\"authorization_role:TAB_ADMINATTACHMENTS_READ\":18,\"authorization_role:TAB_ADMINATTACHMENTS_UPDATE\":19,\"authorization_role:TAB_ADMINATTACHMENTS_DELETE\":20,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_CREATE\":21,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_READ\":22,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_UPDATE\":23,\"authorization_role:TAB_ADMINATTRIBUTESGROUPS_DELETE\":24,\"authorization_role:TAB_ADMINBACKUP_CREATE\":25,\"authorization_role:TAB_ADMINBACKUP_READ\":26,\"authorization_role:TAB_ADMINBACKUP_UPDATE\":27,\"authorization_role:TAB_ADMINBACKUP_DELETE\":28,\"authorization_role:TAB_ADMINCARRIERS_CREATE\":29,\"authorization_role:TAB_ADMINCARRIERS_READ\":30,\"authorization_role:TAB_ADMINCARRIERS_UPDATE\":31,\"authorization_role:TAB_ADMINCARRIERS_DELETE\":32,\"authorization_role:TAB_ADMINCARTRULES_CREATE\":33,\"authorization_role:TAB_ADMINCARTRULES_READ\":34,\"authorization_role:TAB_ADMINCARTRULES_UPDATE\":35,\"authorization_role:TAB_ADMINCARTRULES_DELETE\":36,\"authorization_role:TAB_ADMINCARTS_CREATE\":37,\"authorization_role:TAB_ADMINCARTS_READ\":38,\"authorization_role:TAB_ADMINCARTS_UPDATE\":39,\"authorization_role:TAB_ADMINCARTS_DELETE\":40,\"authorization_role:TAB_ADMINCATALOG_CREATE\":41,\"authorization_role:TAB_ADMINCATALOG_READ\":42,\"authorization_role:TAB_ADMINCATALOG_UPDATE\":43,\"authorization_role:TAB_ADMINCATALOG_DELETE\":44,\"authorization_role:TAB_ADMINCATEGORIES_CREATE\":45,\"authorization_role:TAB_ADMINCATEGORIES_READ\":46,\"authorization_role:TAB_ADMINCATEGORIES_UPDATE\":47,\"authorization_role:TAB_ADMINCATEGORIES_DELETE\":48,\"authorization_role:TAB_ADMINCMSCONTENT_CREATE\":49,\"authorization_role:TAB_ADMINCMSCONTENT_READ\":50,\"authorization_role:TAB_ADMINCMSCONTENT_UPDATE\":51,\"authorization_role:TAB_ADMINCMSCONTENT_DELETE\":52,\"authorization_role:TAB_ADMINCONTACTS_CREATE\":53,\"authorization_role:TAB_ADMINCONTACTS_READ\":54,\"authorization_role:TAB_ADMINCONTACTS_UPDATE\":55,\"authorization_role:TAB_ADMINCONTACTS_DELETE\":56,\"authorization_role:TAB_ADMINCOUNTRIES_CREATE\":57,\"authorization_role:TAB_ADMINCOUNTRIES_READ\":58,\"authorization_role:TAB_ADMINCOUNTRIES_UPDATE\":59,\"authorization_role:TAB_ADMINCOUNTRIES_DELETE\":60,\"authorization_role:TAB_ADMINCURRENCIES_CREATE\":61,\"authorization_role:TAB_ADMINCURRENCIES_READ\":62,\"authorization_role:TAB_ADMINCURRENCIES_UPDATE\":63,\"authorization_role:TAB_ADMINCURRENCIES_DELETE\":64,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_CREATE\":65,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_READ\":66,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_UPDATE\":67,\"authorization_role:TAB_ADMINCUSTOMERPREFERENCES_DELETE\":68,\"authorization_role:TAB_ADMINCUSTOMERS_CREATE\":69,\"authorization_role:TAB_ADMINCUSTOMERS_READ\":70,\"authorization_role:TAB_ADMINCUSTOMERS_UPDATE\":71,\"authorization_role:TAB_ADMINCUSTOMERS_DELETE\":72,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_CREATE\":73,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_READ\":74,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_UPDATE\":75,\"authorization_role:TAB_ADMINCUSTOMERTHREADS_DELETE\":76,\"authorization_role:TAB_ADMINDASHBOARD_CREATE\":77,\"authorization_role:TAB_ADMINDASHBOARD_READ\":78,\"authorization_role:TAB_ADMINDASHBOARD_UPDATE\":79,\"authorization_role:TAB_ADMINDASHBOARD_DELETE\":80,\"authorization_role:TAB_ADMINDELIVERYSLIP_CREATE\":81,\"authorization_role:TAB_ADMINDELIVERYSLIP_READ\":82,\"authorization_role:TAB_ADMINDELIVERYSLIP_UPDATE\":83,\"authorization_role:TAB_ADMINDELIVERYSLIP_DELETE\":84,\"authorization_role:TAB_ADMINEMAILS_CREATE\":85,\"authorization_role:TAB_ADMINEMAILS_READ\":86,\"authorization_role:TAB_ADMINEMAILS_UPDATE\":87,\"authorization_role:TAB_ADMINEMAILS_DELETE\":88,\"authorization_role:TAB_ADMINEMPLOYEES_CREATE\":89,\"authorization_role:TAB_ADMINEMPLOYEES_READ\":90,\"authorization_role:TAB_ADMINEMPLOYEES_UPDATE\":91,\"authorization_role:TAB_ADMINEMPLOYEES_DELETE\":92,\"authorization_role:TAB_ADMINFEATURES_CREATE\":93,\"authorization_role:TAB_ADMINFEATURES_READ\":94,\"authorization_role:TAB_ADMINFEATURES_UPDATE\":95,\"authorization_role:TAB_ADMINFEATURES_DELETE\":96,\"authorization_role:TAB_ADMINGENDERS_CREATE\":97,\"authorization_role:TAB_ADMINGENDERS_READ\":98,\"authorization_role:TAB_ADMINGENDERS_UPDATE\":99,\"authorization_role:TAB_ADMINGENDERS_DELETE\":100,\"authorization_role:TAB_ADMINGEOLOCATION_CREATE\":101,\"authorization_role:TAB_ADMINGEOLOCATION_READ\":102,\"authorization_role:TAB_ADMINGEOLOCATION_UPDATE\":103,\"authorization_role:TAB_ADMINGEOLOCATION_DELETE\":104,\"authorization_role:TAB_ADMINGROUPS_CREATE\":105,\"authorization_role:TAB_ADMINGROUPS_READ\":106,\"authorization_role:TAB_ADMINGROUPS_UPDATE\":107,\"authorization_role:TAB_ADMINGROUPS_DELETE\":108,\"authorization_role:TAB_ADMINIMAGES_CREATE\":109,\"authorization_role:TAB_ADMINIMAGES_READ\":110,\"authorization_role:TAB_ADMINIMAGES_UPDATE\":111,\"authorization_role:TAB_ADMINIMAGES_DELETE\":112,\"authorization_role:TAB_ADMINIMPORT_CREATE\":113,\"authorization_role:TAB_ADMINIMPORT_READ\":114,\"authorization_role:TAB_ADMINIMPORT_UPDATE\":115,\"authorization_role:TAB_ADMINIMPORT_DELETE\":116,\"authorization_role:TAB_ADMININFORMATION_CREATE\":117,\"authorization_role:TAB_ADMININFORMATION_READ\":118,\"authorization_role:TAB_ADMININFORMATION_UPDATE\":119,\"authorization_role:TAB_ADMININFORMATION_DELETE\":120,\"authorization_role:TAB_ADMININTERNATIONAL_CREATE\":121,\"authorization_role:TAB_ADMININTERNATIONAL_READ\":122,\"authorization_role:TAB_ADMININTERNATIONAL_UPDATE\":123,\"authorization_role:TAB_ADMININTERNATIONAL_DELETE\":124,\"authorization_role:TAB_ADMININVOICES_CREATE\":125,\"authorization_role:TAB_ADMININVOICES_READ\":126,\"authorization_role:TAB_ADMININVOICES_UPDATE\":127,\"authorization_role:TAB_ADMININVOICES_DELETE\":128,\"authorization_role:TAB_ADMINLANGUAGES_CREATE\":129,\"authorization_role:TAB_ADMINLANGUAGES_READ\":130,\"authorization_role:TAB_ADMINLANGUAGES_UPDATE\":131,\"authorization_role:TAB_ADMINLANGUAGES_DELETE\":132,\"authorization_role:TAB_ADMINLINKWIDGET_CREATE\":133,\"authorization_role:TAB_ADMINLINKWIDGET_READ\":134,\"authorization_role:TAB_ADMINLINKWIDGET_UPDATE\":135,\"authorization_role:TAB_ADMINLINKWIDGET_DELETE\":136,\"authorization_role:TAB_ADMINLOCALIZATION_CREATE\":137,\"authorization_role:TAB_ADMINLOCALIZATION_READ\":138,\"authorization_role:TAB_ADMINLOCALIZATION_UPDATE\":139,\"authorization_role:TAB_ADMINLOCALIZATION_DELETE\":140,\"authorization_role:TAB_ADMINLOGS_CREATE\":141,\"authorization_role:TAB_ADMINLOGS_READ\":142,\"authorization_role:TAB_ADMINLOGS_UPDATE\":143,\"authorization_role:TAB_ADMINLOGS_DELETE\":144,\"authorization_role:TAB_ADMINMAINTENANCE_CREATE\":145,\"authorization_role:TAB_ADMINMAINTENANCE_READ\":146,\"authorization_role:TAB_ADMINMAINTENANCE_UPDATE\":147,\"authorization_role:TAB_ADMINMAINTENANCE_DELETE\":148,\"authorization_role:TAB_ADMINMANUFACTURERS_CREATE\":149,\"authorization_role:TAB_ADMINMANUFACTURERS_READ\":150,\"authorization_role:TAB_ADMINMANUFACTURERS_UPDATE\":151,\"authorization_role:TAB_ADMINMANUFACTURERS_DELETE\":152,\"authorization_role:TAB_ADMINMETA_CREATE\":153,\"authorization_role:TAB_ADMINMETA_READ\":154,\"authorization_role:TAB_ADMINMETA_UPDATE\":155,\"authorization_role:TAB_ADMINMETA_DELETE\":156,\"authorization_role:TAB_ADMINMODULES_CREATE\":157,\"authorization_role:TAB_ADMINMODULES_READ\":158,\"authorization_role:TAB_ADMINMODULES_UPDATE\":159,\"authorization_role:TAB_ADMINMODULES_DELETE\":160,\"authorization_role:TAB_ADMINMODULESPOSITIONS_CREATE\":161,\"authorization_role:TAB_ADMINMODULESPOSITIONS_READ\":162,\"authorization_role:TAB_ADMINMODULESPOSITIONS_UPDATE\":163,\"authorization_role:TAB_ADMINMODULESPOSITIONS_DELETE\":164,\"authorization_role:TAB_ADMINMODULESUPDATES_CREATE\":165,\"authorization_role:TAB_ADMINMODULESUPDATES_READ\":166,\"authorization_role:TAB_ADMINMODULESUPDATES_UPDATE\":167,\"authorization_role:TAB_ADMINMODULESUPDATES_DELETE\":168,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_CREATE\":169,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_READ\":170,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_UPDATE\":171,\"authorization_role:TAB_ADMINMODULESNOTIFICATIONS_DELETE\":172,\"authorization_role:TAB_ADMINMODULESSF_CREATE\":173,\"authorization_role:TAB_ADMINMODULESSF_READ\":174,\"authorization_role:TAB_ADMINMODULESSF_UPDATE\":175,\"authorization_role:TAB_ADMINMODULESSF_DELETE\":176,\"authorization_role:TAB_ADMINORDERMESSAGE_CREATE\":177,\"authorization_role:TAB_ADMINORDERMESSAGE_READ\":178,\"authorization_role:TAB_ADMINORDERMESSAGE_UPDATE\":179,\"authorization_role:TAB_ADMINORDERMESSAGE_DELETE\":180,\"authorization_role:TAB_ADMINORDERPREFERENCES_CREATE\":181,\"authorization_role:TAB_ADMINORDERPREFERENCES_READ\":182,\"authorization_role:TAB_ADMINORDERPREFERENCES_UPDATE\":183,\"authorization_role:TAB_ADMINORDERPREFERENCES_DELETE\":184,\"authorization_role:TAB_ADMINORDERS_CREATE\":185,\"authorization_role:TAB_ADMINORDERS_READ\":186,\"authorization_role:TAB_ADMINORDERS_UPDATE\":187,\"authorization_role:TAB_ADMINORDERS_DELETE\":188,\"authorization_role:TAB_ADMINOUTSTANDING_CREATE\":189,\"authorization_role:TAB_ADMINOUTSTANDING_READ\":190,\"authorization_role:TAB_ADMINOUTSTANDING_UPDATE\":191,\"authorization_role:TAB_ADMINOUTSTANDING_DELETE\":192,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_CREATE\":193,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_READ\":194,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_UPDATE\":195,\"authorization_role:TAB_ADMINPARENTATTRIBUTESGROUPS_DELETE\":196,\"authorization_role:TAB_ADMINPARENTCARTRULES_CREATE\":197,\"authorization_role:TAB_ADMINPARENTCARTRULES_READ\":198,\"authorization_role:TAB_ADMINPARENTCARTRULES_UPDATE\":199,\"authorization_role:TAB_ADMINPARENTCARTRULES_DELETE\":200,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_CREATE\":201,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_READ\":202,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_UPDATE\":203,\"authorization_role:TAB_ADMINPARENTCOUNTRIES_DELETE\":204,\"authorization_role:TAB_ADMINPARENTCUSTOMER_CREATE\":205,\"authorization_role:TAB_ADMINPARENTCUSTOMER_READ\":206,\"authorization_role:TAB_ADMINPARENTCUSTOMER_UPDATE\":207,\"authorization_role:TAB_ADMINPARENTCUSTOMER_DELETE\":208,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_CREATE\":209,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_READ\":210,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_UPDATE\":211,\"authorization_role:TAB_ADMINPARENTCUSTOMERPREFERENCES_DELETE\":212,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_CREATE\":213,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_READ\":214,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_UPDATE\":215,\"authorization_role:TAB_ADMINPARENTCUSTOMERTHREADS_DELETE\":216,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_CREATE\":217,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_READ\":218,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_UPDATE\":219,\"authorization_role:TAB_ADMINPARENTEMPLOYEES_DELETE\":220,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_CREATE\":221,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_READ\":222,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_UPDATE\":223,\"authorization_role:TAB_ADMINPARENTLOCALIZATION_DELETE\":224,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_CREATE\":225,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_READ\":226,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_UPDATE\":227,\"authorization_role:TAB_ADMINPARENTMANUFACTURERS_DELETE\":228,\"authorization_role:TAB_ADMINPARENTMODULESSF_CREATE\":229,\"authorization_role:TAB_ADMINPARENTMODULESSF_READ\":230,\"authorization_role:TAB_ADMINPARENTMODULESSF_UPDATE\":231,\"authorization_role:TAB_ADMINPARENTMODULESSF_DELETE\":232,\"authorization_role:TAB_ADMINPARENTMETA_CREATE\":233,\"authorization_role:TAB_ADMINPARENTMETA_READ\":234,\"authorization_role:TAB_ADMINPARENTMETA_UPDATE\":235,\"authorization_role:TAB_ADMINPARENTMETA_DELETE\":236,\"authorization_role:TAB_ADMINPARENTMODULES_CREATE\":237,\"authorization_role:TAB_ADMINPARENTMODULES_READ\":238,\"authorization_role:TAB_ADMINPARENTMODULES_UPDATE\":239,\"authorization_role:TAB_ADMINPARENTMODULES_DELETE\":240,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_CREATE\":241,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_READ\":242,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_UPDATE\":243,\"authorization_role:TAB_ADMINPARENTORDERPREFERENCES_DELETE\":244,\"authorization_role:TAB_ADMINPARENTORDERS_CREATE\":245,\"authorization_role:TAB_ADMINPARENTORDERS_READ\":246,\"authorization_role:TAB_ADMINPARENTORDERS_UPDATE\":247,\"authorization_role:TAB_ADMINPARENTORDERS_DELETE\":248,\"authorization_role:TAB_ADMINPARENTPAYMENT_CREATE\":249,\"authorization_role:TAB_ADMINPARENTPAYMENT_READ\":250,\"authorization_role:TAB_ADMINPARENTPAYMENT_UPDATE\":251,\"authorization_role:TAB_ADMINPARENTPAYMENT_DELETE\":252,\"authorization_role:TAB_ADMINPARENTPREFERENCES_CREATE\":253,\"authorization_role:TAB_ADMINPARENTPREFERENCES_READ\":254,\"authorization_role:TAB_ADMINPARENTPREFERENCES_UPDATE\":255,\"authorization_role:TAB_ADMINPARENTPREFERENCES_DELETE\":256,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_CREATE\":257,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_READ\":258,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_UPDATE\":259,\"authorization_role:TAB_ADMINPARENTREQUESTSQL_DELETE\":260,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_CREATE\":261,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_READ\":262,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_UPDATE\":263,\"authorization_role:TAB_ADMINPARENTSEARCHCONF_DELETE\":264,\"authorization_role:TAB_ADMINPARENTSHIPPING_CREATE\":265,\"authorization_role:TAB_ADMINPARENTSHIPPING_READ\":266,\"authorization_role:TAB_ADMINPARENTSHIPPING_UPDATE\":267,\"authorization_role:TAB_ADMINPARENTSHIPPING_DELETE\":268,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_CREATE\":269,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_READ\":270,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_UPDATE\":271,\"authorization_role:TAB_ADMINPARENTSTOCKMANAGEMENT_DELETE\":272,\"authorization_role:TAB_ADMINPARENTSTORES_CREATE\":273,\"authorization_role:TAB_ADMINPARENTSTORES_READ\":274,\"authorization_role:TAB_ADMINPARENTSTORES_UPDATE\":275,\"authorization_role:TAB_ADMINPARENTSTORES_DELETE\":276,\"authorization_role:TAB_ADMINPARENTTAXES_CREATE\":277,\"authorization_role:TAB_ADMINPARENTTAXES_READ\":278,\"authorization_role:TAB_ADMINPARENTTAXES_UPDATE\":279,\"authorization_role:TAB_ADMINPARENTTAXES_DELETE\":280,\"authorization_role:TAB_ADMINPARENTTHEMES_CREATE\":281,\"authorization_role:TAB_ADMINPARENTTHEMES_READ\":282,\"authorization_role:TAB_ADMINPARENTTHEMES_UPDATE\":283,\"authorization_role:TAB_ADMINPARENTTHEMES_DELETE\":284,\"authorization_role:TAB_ADMINPAYMENT_CREATE\":285,\"authorization_role:TAB_ADMINPAYMENT_READ\":286,\"authorization_role:TAB_ADMINPAYMENT_UPDATE\":287,\"authorization_role:TAB_ADMINPAYMENT_DELETE\":288,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_CREATE\":289,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_READ\":290,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_UPDATE\":291,\"authorization_role:TAB_ADMINPAYMENTPREFERENCES_DELETE\":292,\"authorization_role:TAB_ADMINPERFORMANCE_CREATE\":293,\"authorization_role:TAB_ADMINPERFORMANCE_READ\":294,\"authorization_role:TAB_ADMINPERFORMANCE_UPDATE\":295,\"authorization_role:TAB_ADMINPERFORMANCE_DELETE\":296,\"authorization_role:TAB_ADMINPPREFERENCES_CREATE\":297,\"authorization_role:TAB_ADMINPPREFERENCES_READ\":298,\"authorization_role:TAB_ADMINPPREFERENCES_UPDATE\":299,\"authorization_role:TAB_ADMINPPREFERENCES_DELETE\":300,\"authorization_role:TAB_ADMINPREFERENCES_CREATE\":301,\"authorization_role:TAB_ADMINPREFERENCES_READ\":302,\"authorization_role:TAB_ADMINPREFERENCES_UPDATE\":303,\"authorization_role:TAB_ADMINPREFERENCES_DELETE\":304,\"authorization_role:TAB_ADMINPRODUCTS_CREATE\":305,\"authorization_role:TAB_ADMINPRODUCTS_READ\":306,\"authorization_role:TAB_ADMINPRODUCTS_UPDATE\":307,\"authorization_role:TAB_ADMINPRODUCTS_DELETE\":308,\"authorization_role:TAB_ADMINPROFILES_CREATE\":309,\"authorization_role:TAB_ADMINPROFILES_READ\":310,\"authorization_role:TAB_ADMINPROFILES_UPDATE\":311,\"authorization_role:TAB_ADMINPROFILES_DELETE\":312,\"authorization_role:TAB_ADMINREQUESTSQL_CREATE\":313,\"authorization_role:TAB_ADMINREQUESTSQL_READ\":314,\"authorization_role:TAB_ADMINREQUESTSQL_UPDATE\":315,\"authorization_role:TAB_ADMINREQUESTSQL_DELETE\":316,\"authorization_role:TAB_ADMINRETURN_CREATE\":317,\"authorization_role:TAB_ADMINRETURN_READ\":318,\"authorization_role:TAB_ADMINRETURN_UPDATE\":319,\"authorization_role:TAB_ADMINRETURN_DELETE\":320,\"authorization_role:TAB_ADMINSEARCHCONF_CREATE\":321,\"authorization_role:TAB_ADMINSEARCHCONF_READ\":322,\"authorization_role:TAB_ADMINSEARCHCONF_UPDATE\":323,\"authorization_role:TAB_ADMINSEARCHCONF_DELETE\":324,\"authorization_role:TAB_ADMINSEARCHENGINES_CREATE\":325,\"authorization_role:TAB_ADMINSEARCHENGINES_READ\":326,\"authorization_role:TAB_ADMINSEARCHENGINES_UPDATE\":327,\"authorization_role:TAB_ADMINSEARCHENGINES_DELETE\":328,\"authorization_role:TAB_ADMINSHIPPING_CREATE\":329,\"authorization_role:TAB_ADMINSHIPPING_READ\":330,\"authorization_role:TAB_ADMINSHIPPING_UPDATE\":331,\"authorization_role:TAB_ADMINSHIPPING_DELETE\":332,\"authorization_role:TAB_ADMINSHOPGROUP_CREATE\":333,\"authorization_role:TAB_ADMINSHOPGROUP_READ\":334,\"authorization_role:TAB_ADMINSHOPGROUP_UPDATE\":335,\"authorization_role:TAB_ADMINSHOPGROUP_DELETE\":336,\"authorization_role:TAB_ADMINSHOPURL_CREATE\":337,\"authorization_role:TAB_ADMINSHOPURL_READ\":338,\"authorization_role:TAB_ADMINSHOPURL_UPDATE\":339,\"authorization_role:TAB_ADMINSHOPURL_DELETE\":340,\"authorization_role:TAB_ADMINSLIP_CREATE\":341,\"authorization_role:TAB_ADMINSLIP_READ\":342,\"authorization_role:TAB_ADMINSLIP_UPDATE\":343,\"authorization_role:TAB_ADMINSLIP_DELETE\":344,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_CREATE\":345,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_READ\":346,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_UPDATE\":347,\"authorization_role:TAB_ADMINSPECIFICPRICERULE_DELETE\":348,\"authorization_role:TAB_ADMINSTATES_CREATE\":349,\"authorization_role:TAB_ADMINSTATES_READ\":350,\"authorization_role:TAB_ADMINSTATES_UPDATE\":351,\"authorization_role:TAB_ADMINSTATES_DELETE\":352,\"authorization_role:TAB_ADMINSTATS_CREATE\":353,\"authorization_role:TAB_ADMINSTATS_READ\":354,\"authorization_role:TAB_ADMINSTATS_UPDATE\":355,\"authorization_role:TAB_ADMINSTATS_DELETE\":356,\"authorization_role:TAB_ADMINSTATUSES_CREATE\":357,\"authorization_role:TAB_ADMINSTATUSES_READ\":358,\"authorization_role:TAB_ADMINSTATUSES_UPDATE\":359,\"authorization_role:TAB_ADMINSTATUSES_DELETE\":360,\"authorization_role:TAB_ADMINSTOCK_CREATE\":361,\"authorization_role:TAB_ADMINSTOCK_READ\":362,\"authorization_role:TAB_ADMINSTOCK_UPDATE\":363,\"authorization_role:TAB_ADMINSTOCK_DELETE\":364,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_CREATE\":365,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_READ\":366,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_UPDATE\":367,\"authorization_role:TAB_ADMINSTOCKMANAGEMENT_DELETE\":368,\"authorization_role:TAB_ADMINSTORES_CREATE\":369,\"authorization_role:TAB_ADMINSTORES_READ\":370,\"authorization_role:TAB_ADMINSTORES_UPDATE\":371,\"authorization_role:TAB_ADMINSTORES_DELETE\":372,\"authorization_role:TAB_ADMINSUPPLIERS_CREATE\":373,\"authorization_role:TAB_ADMINSUPPLIERS_READ\":374,\"authorization_role:TAB_ADMINSUPPLIERS_UPDATE\":375,\"authorization_role:TAB_ADMINSUPPLIERS_DELETE\":376,\"authorization_role:TAB_ADMINTAGS_CREATE\":377,\"authorization_role:TAB_ADMINTAGS_READ\":378,\"authorization_role:TAB_ADMINTAGS_UPDATE\":379,\"authorization_role:TAB_ADMINTAGS_DELETE\":380,\"authorization_role:TAB_ADMINTAXES_CREATE\":381,\"authorization_role:TAB_ADMINTAXES_READ\":382,\"authorization_role:TAB_ADMINTAXES_UPDATE\":383,\"authorization_role:TAB_ADMINTAXES_DELETE\":384,\"authorization_role:TAB_ADMINTAXRULESGROUP_CREATE\":385,\"authorization_role:TAB_ADMINTAXRULESGROUP_READ\":386,\"authorization_role:TAB_ADMINTAXRULESGROUP_UPDATE\":387,\"authorization_role:TAB_ADMINTAXRULESGROUP_DELETE\":388,\"authorization_role:TAB_ADMINTHEMES_CREATE\":389,\"authorization_role:TAB_ADMINTHEMES_READ\":390,\"authorization_role:TAB_ADMINTHEMES_UPDATE\":391,\"authorization_role:TAB_ADMINTHEMES_DELETE\":392,\"authorization_role:TAB_ADMINTRACKING_CREATE\":393,\"authorization_role:TAB_ADMINTRACKING_READ\":394,\"authorization_role:TAB_ADMINTRACKING_UPDATE\":395,\"authorization_role:TAB_ADMINTRACKING_DELETE\":396,\"authorization_role:TAB_ADMINTRANSLATIONS_CREATE\":397,\"authorization_role:TAB_ADMINTRANSLATIONS_READ\":398,\"authorization_role:TAB_ADMINTRANSLATIONS_UPDATE\":399,\"authorization_role:TAB_ADMINTRANSLATIONS_DELETE\":400,\"authorization_role:TAB_ADMINWAREHOUSES_CREATE\":401,\"authorization_role:TAB_ADMINWAREHOUSES_READ\":402,\"authorization_role:TAB_ADMINWAREHOUSES_UPDATE\":403,\"authorization_role:TAB_ADMINWAREHOUSES_DELETE\":404,\"authorization_role:TAB_ADMINWEBSERVICE_CREATE\":405,\"authorization_role:TAB_ADMINWEBSERVICE_READ\":406,\"authorization_role:TAB_ADMINWEBSERVICE_UPDATE\":407,\"authorization_role:TAB_ADMINWEBSERVICE_DELETE\":408,\"authorization_role:TAB_ADMINZONES_CREATE\":409,\"authorization_role:TAB_ADMINZONES_READ\":410,\"authorization_role:TAB_ADMINZONES_UPDATE\":411,\"authorization_role:TAB_ADMINZONES_DELETE\":412,\"authorization_role:TAB_CONFIGURE_CREATE\":413,\"authorization_role:TAB_CONFIGURE_READ\":414,\"authorization_role:TAB_CONFIGURE_UPDATE\":415,\"authorization_role:TAB_CONFIGURE_DELETE\":416,\"authorization_role:TAB_IMPROVE_CREATE\":417,\"authorization_role:TAB_IMPROVE_READ\":418,\"authorization_role:TAB_IMPROVE_UPDATE\":419,\"authorization_role:TAB_IMPROVE_DELETE\":420,\"authorization_role:TAB_SELL_CREATE\":421,\"authorization_role:TAB_SELL_READ\":422,\"authorization_role:TAB_SELL_UPDATE\":423,\"authorization_role:TAB_SELL_DELETE\":424,\"authorization_role:TAB_SHOPPARAMETERS_CREATE\":425,\"authorization_role:TAB_SHOPPARAMETERS_READ\":426,\"authorization_role:TAB_SHOPPARAMETERS_UPDATE\":427,\"authorization_role:TAB_SHOPPARAMETERS_DELETE\":428,\"authorization_role:TAB_ADMINPARENTMAILTHEME_CREATE\":429,\"authorization_role:TAB_ADMINPARENTMAILTHEME_READ\":430,\"authorization_role:TAB_ADMINPARENTMAILTHEME_UPDATE\":431,\"authorization_role:TAB_ADMINPARENTMAILTHEME_DELETE\":432,\"authorization_role:TAB_ADMINMAILTHEME_CREATE\":433,\"authorization_role:TAB_ADMINMAILTHEME_READ\":434,\"authorization_role:TAB_ADMINMAILTHEME_UPDATE\":435,\"authorization_role:TAB_ADMINMAILTHEME_DELETE\":436,\"authorization_role:TAB_ADMINMODULESMANAGE_CREATE\":437,\"authorization_role:TAB_ADMINMODULESMANAGE_READ\":438,\"authorization_role:TAB_ADMINMODULESMANAGE_UPDATE\":439,\"authorization_role:TAB_ADMINMODULESMANAGE_DELETE\":440,\"authorization_role:TAB_ADMINFEATUREFLAG_CREATE\":441,\"authorization_role:TAB_ADMINFEATUREFLAG_READ\":442,\"authorization_role:TAB_ADMINFEATUREFLAG_UPDATE\":443,\"authorization_role:TAB_ADMINFEATUREFLAG_DELETE\":444,\"authorization_role:TAB_ADMINPARENTSECURITY_CREATE\":445,\"authorization_role:TAB_ADMINPARENTSECURITY_READ\":446,\"authorization_role:TAB_ADMINPARENTSECURITY_UPDATE\":447,\"authorization_role:TAB_ADMINPARENTSECURITY_DELETE\":448,\"authorization_role:TAB_ADMINSECURITY_CREATE\":449,\"authorization_role:TAB_ADMINSECURITY_READ\":450,\"authorization_role:TAB_ADMINSECURITY_UPDATE\":451,\"authorization_role:TAB_ADMINSECURITY_DELETE\":452,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_CREATE\":453,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_READ\":454,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_UPDATE\":455,\"authorization_role:TAB_ADMINSECURITYSESSIONEMPLOYEE_DELETE\":456,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_CREATE\":457,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_READ\":458,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_UPDATE\":459,\"authorization_role:TAB_ADMINSECURITYSESSIONCUSTOMER_DELETE\":460,\"profile:SuperAdmin\":\"1\",\"access:access_1_0\":0,\"access:access_1_1\":0,\"access:access_1_2\":0,\"access:access_1_3\":0,\"access:access_1_9\":0,\"access:access_1_10\":0,\"access:access_1_11\":0,\"access:access_1_13\":0,\"access:access_1_14\":0,\"access:access_1_15\":0,\"access:access_1_16\":0,\"access:access_1_19\":0,\"access:access_1_20\":0,\"access:access_1_21\":0,\"access:access_1_22\":0,\"access:access_1_23\":0,\"access:access_1_24\":0,\"access:access_1_25\":0,\"access:access_1_26\":0,\"access:access_1_27\":0,\"access:access_1_29\":0,\"access:access_1_30\":0,\"access:access_1_32\":0,\"access:access_1_33\":0,\"access:access_1_34\":0,\"access:access_1_35\":0,\"access:access_1_36\":0,\"access:access_1_37\":0,\"access:access_1_39\":0,\"access:access_1_40\":0,\"access:access_1_41\":0,\"access:access_1_42\":0,\"access:access_1_43\":0,\"access:access_1_44\":0,\"access:access_1_45\":0,\"access:access_1_46\":0,\"access:access_1_47\":0,\"access:access_1_49\":0,\"access:access_1_50\":0,\"access:access_1_51\":0,\"access:access_1_53\":0,\"access:access_1_54\":0,\"access:access_1_55\":0,\"access:access_1_56\":0,\"access:access_1_57\":0,\"access:access_1_58\":0,\"access:access_1_59\":0,\"access:access_1_60\":0,\"access:access_1_62\":0,\"access:access_1_63\":0,\"access:access_1_64\":0,\"access:access_1_67\":0,\"access:access_1_68\":0,\"access:access_1_69\":0,\"access:access_1_70\":0,\"access:access_1_71\":0,\"access:access_1_72\":0,\"access:access_1_73\":0,\"access:access_1_74\":0,\"access:access_1_75\":0,\"access:access_1_76\":0,\"access:access_1_77\":0,\"access:access_1_78\":0,\"access:access_1_79\":0,\"access:access_1_81\":0,\"access:access_1_82\":0,\"access:access_1_83\":0,\"access:access_1_84\":0,\"access:access_1_85\":0,\"access:access_1_87\":0,\"access:access_1_88\":0,\"access:access_1_89\":0,\"access:access_1_90\":0,\"access:access_1_91\":0,\"access:access_1_93\":0,\"access:access_1_98\":0,\"access:access_1_99\":0,\"access:access_1_100\":0,\"access:access_1_101\":0,\"access:access_1_102\":0,\"access:access_1_103\":0,\"access:access_1_104\":0,\"access:access_1_105\":0,\"access:access_1_106\":0,\"access:access_1_107\":0,\"access:access_1_108\":0,\"access:access_1_109\":0,\"access:access_1_110\":0,\"access:access_1_111\":0,\"access:access_1_112\":0,\"access:access_1_113\":0,\"access:access_1_114\":0,\"access:access_1_115\":0,\"access:access_1_116\":0,\"access:access_1_117\":0,\"access:access_1_118\":0,\"access:access_1_119\":0,\"access:access_1_120\":0,\"access:access_1_121\":0,\"access:access_1_122\":0,\"access:access_1_123\":0,\"access:access_1_124\":0,\"access:access_1_125\":0,\"access:access_1_126\":0,\"access:access_1_127\":0,\"access:access_1_128\":0,\"access:access_1_129\":0,\"access:access_1_130\":0,\"access:access_1_131\":0,\"access:access_1_132\":0,\"access:access_1_133\":0,\"access:access_1_134\":0,\"access:access_1_135\":0,\"access:access_1_136\":0,\"access:access_1_137\":0,\"access:access_1_138\":0,\"access:access_1_139\":0,\"access:access_1_140\":0,\"access:access_1_141\":0,\"access:access_1_142\":0,\"access:access_1_143\":0,\"access:access_1_144\":0,\"access:access_1_145\":0,\"access:access_1_146\":0,\"access:access_1_147\":0,\"access:access_1_148\":0,\"access:access_1_149\":0,\"access:access_1_150\":0,\"access:access_1_151\":0,\"access:access_1_152\":0,\"access:access_1_153\":0,\"access:access_1_154\":0,\"access:access_1_155\":0,\"access:access_1_156\":0,\"access:access_1_157\":0,\"access:access_1_158\":0,\"access:access_1_159\":0,\"access:access_1_160\":0,\"access:access_1_161\":0,\"access:access_1_162\":0,\"access:access_1_163\":0,\"access:access_1_164\":0,\"access:access_1_165\":0,\"access:access_1_166\":0,\"access:access_1_167\":0,\"access:access_1_168\":0,\"access:access_1_169\":0,\"access:access_1_170\":0,\"access:access_1_171\":0,\"access:access_1_172\":0,\"access:access_1_173\":0,\"access:access_1_174\":0,\"access:access_1_175\":0,\"access:access_1_176\":0,\"access:access_1_177\":0,\"access:access_1_178\":0,\"access:access_1_179\":0,\"access:access_1_180\":0,\"access:access_1_181\":0,\"access:access_1_182\":0,\"access:access_1_183\":0,\"access:access_1_184\":0,\"access:access_1_185\":0,\"access:access_1_186\":0,\"access:access_1_187\":0,\"access:access_1_188\":0,\"access:access_1_189\":0,\"access:access_1_190\":0,\"access:access_1_191\":0,\"access:access_1_192\":0,\"access:access_1_193\":0,\"access:access_1_194\":0,\"access:access_1_195\":0,\"access:access_1_196\":0,\"access:access_1_197\":0,\"access:access_1_198\":0,\"access:access_1_199\":0,\"access:access_1_200\":0,\"access:access_1_201\":0,\"access:access_1_202\":0,\"access:access_1_203\":0,\"access:access_1_204\":0,\"access:access_1_205\":0,\"access:access_1_206\":0,\"access:access_1_207\":0,\"access:access_1_208\":0,\"access:access_1_209\":0,\"access:access_1_210\":0,\"access:access_1_211\":0,\"access:access_1_212\":0,\"access:access_1_213\":0,\"access:access_1_214\":0,\"access:access_1_215\":0,\"access:access_1_216\":0,\"access:access_1_217\":0,\"access:access_1_218\":0,\"access:access_1_219\":0,\"access:access_1_220\":0,\"access:access_1_221\":0,\"access:access_1_222\":0,\"access:access_1_223\":0,\"access:access_1_224\":0,\"access:access_1_225\":0,\"access:access_1_226\":0,\"access:access_1_227\":0,\"access:access_1_228\":0,\"access:access_1_229\":0,\"access:access_1_230\":0,\"access:access_1_231\":0,\"access:access_1_232\":0,\"access:access_1_233\":0,\"access:access_1_234\":0,\"access:access_1_235\":0,\"access:access_1_236\":0,\"access:access_1_237\":0,\"access:access_1_238\":0,\"access:access_1_239\":0,\"access:access_1_240\":0,\"access:access_1_241\":0,\"access:access_1_242\":0,\"access:access_1_243\":0,\"access:access_1_244\":0,\"access:access_1_245\":0,\"access:access_1_246\":0,\"access:access_1_247\":0,\"access:access_1_248\":0,\"access:access_1_249\":0,\"access:access_1_250\":0,\"access:access_1_251\":0,\"access:access_1_252\":0,\"access:access_1_253\":0,\"access:access_1_254\":0,\"access:access_1_255\":0,\"access:access_1_256\":0,\"access:access_1_257\":0,\"access:access_1_258\":0,\"access:access_1_259\":0,\"access:access_1_260\":0,\"access:access_1_261\":0,\"access:access_1_262\":0,\"access:access_1_263\":0,\"access:access_1_264\":0,\"access:access_1_265\":0,\"access:access_1_266\":0,\"access:access_1_267\":0,\"access:access_1_268\":0,\"access:access_1_269\":0,\"access:access_1_270\":0,\"access:access_1_271\":0,\"access:access_1_272\":0,\"access:access_1_273\":0,\"access:access_1_274\":0,\"access:access_1_275\":0,\"access:access_1_276\":0,\"access:access_1_277\":0,\"access:access_1_278\":0,\"access:access_1_279\":0,\"access:access_1_280\":0,\"access:access_1_281\":0,\"access:access_1_282\":0,\"access:access_1_283\":0,\"access:access_1_284\":0,\"access:access_1_285\":0,\"access:access_1_286\":0,\"access:access_1_287\":0,\"access:access_1_288\":0,\"access:access_1_289\":0,\"access:access_1_290\":0,\"access:access_1_291\":0,\"access:access_1_292\":0,\"access:access_1_293\":0,\"access:access_1_294\":0,\"access:access_1_295\":0,\"access:access_1_296\":0,\"access:access_1_297\":0,\"access:access_1_298\":0,\"access:access_1_299\":0,\"access:access_1_300\":0,\"access:access_1_301\":0,\"access:access_1_302\":0,\"access:access_1_303\":0,\"access:access_1_304\":0,\"access:access_1_305\":0,\"access:access_1_306\":0,\"access:access_1_307\":0,\"access:access_1_308\":0,\"access:access_1_309\":0,\"access:access_1_314\":0,\"access:access_1_315\":0,\"access:access_1_316\":0,\"access:access_1_317\":0,\"access:access_1_318\":0,\"access:access_1_319\":0,\"access:access_1_320\":0,\"access:access_1_321\":0,\"access:access_1_322\":0,\"access:access_1_323\":0,\"access:access_1_324\":0,\"access:access_1_325\":0,\"access:access_1_326\":0,\"access:access_1_327\":0,\"access:access_1_328\":0,\"access:access_1_329\":0,\"access:access_1_330\":0,\"access:access_1_331\":0,\"access:access_1_332\":0,\"access:access_1_333\":0,\"access:access_1_334\":0,\"access:access_1_335\":0,\"access:access_1_336\":0,\"access:access_1_337\":0,\"access:access_1_338\":0,\"access:access_1_339\":0,\"access:access_1_340\":0,\"access:access_1_341\":0,\"access:access_1_342\":0,\"access:access_1_343\":0,\"access:access_1_344\":0,\"access:access_1_345\":0,\"access:access_1_346\":0,\"access:access_1_347\":0,\"access:access_1_348\":0,\"access:access_1_349\":0,\"access:access_1_350\":0,\"access:access_1_351\":0,\"access:access_1_352\":0,\"access:access_1_353\":0,\"access:access_1_354\":0,\"access:access_1_355\":0,\"access:access_1_356\":0,\"access:access_1_357\":0,\"access:access_1_358\":0,\"access:access_1_359\":0,\"access:access_1_360\":0,\"access:access_1_361\":0,\"access:access_1_373\":0,\"access:access_1_374\":0,\"access:access_1_375\":0,\"access:access_1_376\":0,\"access:access_1_381\":0,\"access:access_1_382\":0,\"access:access_1_383\":0,\"access:access_1_384\":0,\"access:access_1_385\":0,\"access:access_1_386\":0,\"access:access_1_387\":0,\"access:access_1_388\":0,\"access:access_1_393\":0,\"access:access_1_394\":0,\"access:access_1_395\":0,\"access:access_1_396\":0,\"access:access_1_397\":0,\"access:access_1_398\":0,\"access:access_1_399\":0,\"access:access_1_400\":0,\"access:access_1_401\":0,\"access:access_1_402\":0,\"access:access_1_403\":0,\"access:access_1_404\":0,\"access:access_1_405\":0,\"access:access_1_406\":0,\"access:access_1_407\":0,\"access:access_1_408\":0,\"access:access_1_413\":0,\"access:access_1_414\":0,\"access:access_1_415\":0,\"access:access_1_416\":0,\"access:access_1_417\":0,\"access:access_1_418\":0,\"access:access_1_419\":0,\"access:access_1_420\":0,\"access:access_1_421\":0,\"access:access_1_422\":0,\"access:access_1_423\":0,\"access:access_1_424\":0,\"access:access_1_425\":0,\"access:access_1_426\":0,\"access:access_1_427\":0,\"access:access_1_428\":0,\"access:access_1_429\":0,\"access:access_1_430\":0,\"access:access_1_431\":0,\"access:access_1_432\":0,\"access:access_1_433\":0,\"access:access_1_434\":0,\"access:access_1_435\":0,\"access:access_1_436\":0,\"access:access_1_437\":0,\"access:access_1_438\":0,\"access:access_1_439\":0,\"access:access_1_440\":0,\"access:access_1_441\":0,\"access:access_1_442\":0,\"access:access_1_443\":0,\"access:access_1_444\":0,\"access:access_1_445\":0,\"access:access_1_446\":0,\"access:access_1_447\":0,\"access:access_1_448\":0,\"access:access_1_449\":0,\"access:access_1_450\":0,\"access:access_1_451\":0,\"access:access_1_452\":0,\"access:access_1_453\":0,\"access:access_1_454\":0,\"access:access_1_455\":0,\"access:access_1_456\":0,\"access:access_1_457\":0,\"access:access_1_458\":0,\"access:access_1_459\":0,\"access:access_1_460\":0,\"access:access_1_461\":0,\"access:access_1_462\":0,\"access:access_1_463\":0,\"access:access_1_464\":0,\"access:access_1_465\":0,\"access:access_1_466\":0,\"access:access_1_467\":0,\"access:access_1_468\":0,\"access:access_1_469\":0,\"access:access_1_470\":0,\"access:access_1_471\":0,\"access:access_1_472\":0,\"access:access_1_473\":0,\"access:access_1_474\":0,\"access:access_1_475\":0,\"access:access_1_476\":0,\"access:access_1_477\":0,\"access:access_1_478\":0,\"access:access_1_479\":0,\"access:access_1_480\":0,\"access:access_1_481\":0,\"access:access_1_482\":0,\"access:access_1_483\":0,\"access:access_1_484\":0,\"access:access_1_485\":0,\"access:access_1_486\":0,\"access:access_1_487\":0,\"access:access_1_488\":0,\"access:access_1_489\":0,\"access:access_1_490\":0,\"access:access_1_491\":0,\"access:access_1_492\":0,\"access:access_1_493\":0,\"access:access_1_494\":0,\"access:access_1_495\":0,\"access:access_1_496\":0,\"access:access_1_497\":0,\"access:access_1_498\":0,\"access:access_1_499\":0,\"access:access_1_500\":0,\"access:access_1_501\":0,\"access:access_1_502\":0,\"access:access_1_503\":0,\"zone:Europe\":\"1\",\"zone:North_America\":\"2\",\"zone:Asia\":\"3\",\"zone:Africa\":\"4\",\"zone:Oceania\":\"5\",\"zone:South_America\":\"6\",\"zone:Europe_out_E_U\":\"7\",\"zone:Central_America_Antilla\":\"8\",\"country:DE\":1,\"country:AT\":2,\"country:BE\":3,\"country:CA\":4,\"country:CN\":5,\"country:ES\":6,\"country:FI\":7,\"country:FR\":8,\"country:GR\":9,\"country:IT\":10,\"country:JP\":11,\"country:LU\":12,\"country:NL\":13,\"country:PL\":14,\"country:PT\":15,\"country:CZ\":16,\"country:GB\":17,\"country:SE\":18,\"country:CH\":19,\"country:DK\":20,\"country:US\":21,\"country:HK\":22,\"country:NO\":23,\"country:AU\":24,\"country:SG\":25,\"country:IE\":26,\"country:NZ\":27,\"country:KR\":28,\"country:IL\":29,\"country:ZA\":30,\"country:NG\":31,\"country:CI\":32,\"country:TG\":33,\"country:BO\":34,\"country:MU\":35,\"country:RO\":36,\"country:SK\":37,\"country:DZ\":38,\"country:AS\":39,\"country:AD\":40,\"country:AO\":41,\"country:AI\":42,\"country:AG\":43,\"country:AR\":44,\"country:AM\":45,\"country:AW\":46,\"country:AZ\":47,\"country:BS\":48,\"country:BH\":49,\"country:BD\":50,\"country:BB\":51,\"country:BY\":52,\"country:BZ\":53,\"country:BJ\":54,\"country:BM\":55,\"country:BT\":56,\"country:BW\":57,\"country:BR\":58,\"country:BN\":59,\"country:BF\":60,\"country:MM\":61,\"country:BI\":62,\"country:KH\":63,\"country:CM\":64,\"country:CV\":65,\"country:CF\":66,\"country:TD\":67,\"country:CL\":68,\"country:CO\":69,\"country:KM\":70,\"country:CD\":71,\"country:CG\":72,\"country:CR\":73,\"country:HR\":74,\"country:CU\":75,\"country:CY\":76,\"country:DJ\":77,\"country:DM\":78,\"country:DO\":79,\"country:TL\":80,\"country:EC\":81,\"country:EG\":82,\"country:SV\":83,\"country:GQ\":84,\"country:ER\":85,\"country:EE\":86,\"country:ET\":87,\"country:FK\":88,\"country:FO\":89,\"country:FJ\":90,\"country:GA\":91,\"country:GM\":92,\"country:GE\":93,\"country:GH\":94,\"country:GD\":95,\"country:GL\":96,\"country:GI\":97,\"country:GP\":98,\"country:GU\":99,\"country:GT\":100,\"country:GG\":101,\"country:GN\":102,\"country:GW\":103,\"country:GY\":104,\"country:HT\":105,\"country:VA\":106,\"country:HN\":107,\"country:IS\":108,\"country:IN\":109,\"country:ID\":110,\"country:IR\":111,\"country:IQ\":112,\"country:IM\":113,\"country:JM\":114,\"country:JE\":115,\"country:JO\":116,\"country:KZ\":117,\"country:KE\":118,\"country:KI\":119,\"country:KP\":120,\"country:KW\":121,\"country:KG\":122,\"country:LA\":123,\"country:LV\":124,\"country:LB\":125,\"country:LS\":126,\"country:LR\":127,\"country:LY\":128,\"country:LI\":129,\"country:LT\":130,\"country:MO\":131,\"country:MK\":132,\"country:MG\":133,\"country:MW\":134,\"country:MY\":135,\"country:MV\":136,\"country:ML\":137,\"country:MT\":138,\"country:MH\":139,\"country:MQ\":140,\"country:MR\":141,\"country:HU\":142,\"country:YT\":143,\"country:MX\":144,\"country:FM\":145,\"country:MD\":146,\"country:MC\":147,\"country:MN\":148,\"country:ME\":149,\"country:MS\":150,\"country:MA\":151,\"country:MZ\":152,\"country:NA\":153,\"country:NR\":154,\"country:NP\":155,\"country:NC\":156,\"country:NI\":157,\"country:NE\":158,\"country:NU\":159,\"country:NF\":160,\"country:MP\":161,\"country:OM\":162,\"country:PK\":163,\"country:PW\":164,\"country:PS\":165,\"country:PA\":166,\"country:PG\":167,\"country:PY\":168,\"country:PE\":169,\"country:PH\":170,\"country:PN\":171,\"country:PR\":172,\"country:QA\":173,\"country:RE\":174,\"country:RU\":175,\"country:RW\":176,\"country:BL\":177,\"country:KN\":178,\"country:LC\":179,\"country:MF\":180,\"country:PM\":181,\"country:VC\":182,\"country:WS\":183,\"country:SM\":184,\"country:ST\":185,\"country:SA\":186,\"country:SN\":187,\"country:RS\":188,\"country:SC\":189,\"country:SL\":190,\"country:SI\":191,\"country:SB\":192,\"country:SO\":193,\"country:GS\":194,\"country:LK\":195,\"country:SD\":196,\"country:SR\":197,\"country:SJ\":198,\"country:SZ\":199,\"country:SY\":200,\"country:TW\":201,\"country:TJ\":202,\"country:TZ\":203,\"country:TH\":204,\"country:TK\":205,\"country:TO\":206,\"country:TT\":207,\"country:TN\":208,\"country:TR\":209,\"country:TM\":210,\"country:TC\":211,\"country:TV\":212,\"country:UG\":213,\"country:UA\":214,\"country:AE\":215,\"country:UY\":216,\"country:UZ\":217,\"country:VU\":218,\"country:VE\":219,\"country:VN\":220,\"country:VG\":221,\"country:VI\":222,\"country:WF\":223,\"country:EH\":224,\"country:YE\":225,\"country:ZM\":226,\"country:ZW\":227,\"country:AL\":228,\"country:AF\":229,\"country:AQ\":230,\"country:BA\":231,\"country:IO\":232,\"country:BG\":233,\"country:KY\":234,\"country:CX\":235,\"country:CC\":236,\"country:CK\":237,\"country:GF\":238,\"country:PF\":239,\"country:TF\":240,\"country:AX\":241,\"address_format:address_format_1\":\"0\",\"address_format:address_format_2\":\"0\",\"address_format:address_format_3\":\"0\",\"address_format:address_format_4\":\"0\",\"address_format:address_format_5\":\"0\",\"address_format:address_format_6\":\"0\",\"address_format:address_format_7\":\"0\",\"address_format:address_format_8\":\"0\",\"address_format:address_format_9\":\"0\",\"address_format:address_format_10\":\"0\",\"address_format:address_format_11\":\"0\",\"address_format:address_format_12\":\"0\",\"address_format:address_format_13\":\"0\",\"address_format:address_format_14\":\"0\",\"address_format:address_format_15\":\"0\",\"address_format:address_format_16\":\"0\",\"address_format:address_format_17\":\"0\",\"address_format:address_format_18\":\"0\",\"address_format:address_format_19\":\"0\",\"address_format:address_format_20\":\"0\",\"address_format:address_format_21\":\"0\",\"address_format:address_format_22\":\"0\",\"address_format:address_format_23\":\"0\",\"address_format:address_format_24\":\"0\",\"address_format:address_format_25\":\"0\",\"address_format:address_format_26\":\"0\",\"address_format:address_format_27\":\"0\",\"address_format:address_format_28\":\"0\",\"address_format:address_format_29\":\"0\",\"address_format:address_format_30\":\"0\",\"address_format:address_format_31\":\"0\",\"address_format:address_format_32\":\"0\",\"address_format:address_format_33\":\"0\",\"address_format:address_format_34\":\"0\",\"address_format:address_format_35\":\"0\",\"address_format:address_format_36\":\"0\",\"address_format:address_format_37\":\"0\",\"address_format:address_format_38\":\"0\",\"address_format:address_format_39\":\"0\",\"address_format:address_format_40\":\"0\",\"address_format:address_format_41\":\"0\",\"address_format:address_format_42\":\"0\",\"address_format:address_format_43\":\"0\",\"address_format:address_format_44\":\"0\",\"address_format:address_format_45\":\"0\",\"address_format:address_format_46\":\"0\",\"address_format:address_format_47\":\"0\",\"address_format:address_format_48\":\"0\",\"address_format:address_format_49\":\"0\",\"address_format:address_format_50\":\"0\",\"address_format:address_format_51\":\"0\",\"address_format:address_format_52\":\"0\",\"address_format:address_format_53\":\"0\",\"address_format:address_format_54\":\"0\",\"address_format:address_format_55\":\"0\",\"address_format:address_format_56\":\"0\",\"address_format:address_format_57\":\"0\",\"address_format:address_format_58\":\"0\",\"address_format:address_format_59\":\"0\",\"address_format:address_format_60\":\"0\",\"address_format:address_format_61\":\"0\",\"address_format:address_format_62\":\"0\",\"address_format:address_format_63\":\"0\",\"address_format:address_format_64\":\"0\",\"address_format:address_format_65\":\"0\",\"address_format:address_format_66\":\"0\",\"address_format:address_format_67\":\"0\",\"address_format:address_format_68\":\"0\",\"address_format:address_format_69\":\"0\",\"address_format:address_format_70\":\"0\",\"address_format:address_format_71\":\"0\",\"address_format:address_format_72\":\"0\",\"address_format:address_format_73\":\"0\",\"address_format:address_format_74\":\"0\",\"address_format:address_format_75\":\"0\",\"address_format:address_format_76\":\"0\",\"address_format:address_format_77\":\"0\",\"address_format:address_format_78\":\"0\",\"address_format:address_format_79\":\"0\",\"address_format:address_format_80\":\"0\",\"address_format:address_format_81\":\"0\",\"address_format:address_format_82\":\"0\",\"address_format:address_format_83\":\"0\",\"address_format:address_format_84\":\"0\",\"address_format:address_format_85\":\"0\",\"address_format:address_format_86\":\"0\",\"address_format:address_format_87\":\"0\",\"address_format:address_format_88\":\"0\",\"address_format:address_format_89\":\"0\",\"address_format:address_format_90\":\"0\",\"address_format:address_format_91\":\"0\",\"address_format:address_format_92\":\"0\",\"address_format:address_format_93\":\"0\",\"address_format:address_format_94\":\"0\",\"address_format:address_format_95\":\"0\",\"address_format:address_format_96\":\"0\",\"address_format:address_format_97\":\"0\",\"address_format:address_format_98\":\"0\",\"address_format:address_format_99\":\"0\",\"address_format:address_format_100\":\"0\",\"address_format:address_format_101\":\"0\",\"address_format:address_format_102\":\"0\",\"address_format:address_format_103\":\"0\",\"address_format:address_format_104\":\"0\",\"address_format:address_format_105\":\"0\",\"address_format:address_format_107\":\"0\",\"address_format:address_format_108\":\"0\",\"address_format:address_format_109\":\"0\",\"address_format:address_format_110\":\"0\",\"address_format:address_format_111\":\"0\",\"address_format:address_format_112\":\"0\",\"address_format:address_format_113\":\"0\",\"address_format:address_format_114\":\"0\",\"address_format:address_format_115\":\"0\",\"address_format:address_format_116\":\"0\",\"address_format:address_format_117\":\"0\",\"address_format:address_format_118\":\"0\",\"address_format:address_format_119\":\"0\",\"address_format:address_format_120\":\"0\",\"address_format:address_format_121\":\"0\",\"address_format:address_format_122\":\"0\",\"address_format:address_format_123\":\"0\",\"address_format:address_format_124\":\"0\",\"address_format:address_format_125\":\"0\",\"address_format:address_format_126\":\"0\",\"address_format:address_format_127\":\"0\",\"address_format:address_format_128\":\"0\",\"address_format:address_format_129\":\"0\",\"address_format:address_format_130\":\"0\",\"address_format:address_format_131\":\"0\",\"address_format:address_format_132\":\"0\",\"address_format:address_format_133\":\"0\",\"address_format:address_format_134\":\"0\",\"address_format:address_format_135\":\"0\",\"address_format:address_format_136\":\"0\",\"address_format:address_format_137\":\"0\",\"address_format:address_format_138\":\"0\",\"address_format:address_format_139\":\"0\",\"address_format:address_format_140\":\"0\",\"address_format:address_format_141\":\"0\",\"address_format:address_format_142\":\"0\",\"address_format:address_format_143\":\"0\",\"address_format:address_format_144\":\"0\",\"address_format:address_format_145\":\"0\",\"address_format:address_format_146\":\"0\",\"address_format:address_format_147\":\"0\",\"address_format:address_format_148\":\"0\",\"address_format:address_format_149\":\"0\",\"address_format:address_format_150\":\"0\",\"address_format:address_format_151\":\"0\",\"address_format:address_format_152\":\"0\",\"address_format:address_format_153\":\"0\",\"address_format:address_format_154\":\"0\",\"address_format:address_format_155\":\"0\",\"address_format:address_format_156\":\"0\",\"address_format:address_format_158\":\"0\",\"address_format:address_format_159\":\"0\",\"address_format:address_format_160\":\"0\",\"address_format:address_format_161\":\"0\",\"address_format:address_format_162\":\"0\",\"address_format:address_format_163\":\"0\",\"address_format:address_format_164\":\"0\",\"address_format:address_format_165\":\"0\",\"address_format:address_format_166\":\"0\",\"address_format:address_format_167\":\"0\",\"address_format:address_format_168\":\"0\",\"address_format:address_format_169\":\"0\",\"address_format:address_format_170\":\"0\",\"address_format:address_format_171\":\"0\",\"address_format:address_format_172\":\"0\",\"address_format:address_format_173\":\"0\",\"address_format:address_format_174\":\"0\",\"address_format:address_format_175\":\"0\",\"address_format:address_format_176\":\"0\",\"address_format:address_format_177\":\"0\",\"address_format:address_format_178\":\"0\",\"address_format:address_format_179\":\"0\",\"address_format:address_format_180\":\"0\",\"address_format:address_format_181\":\"0\",\"address_format:address_format_182\":\"0\",\"address_format:address_format_183\":\"0\",\"address_format:address_format_184\":\"0\",\"address_format:address_format_185\":\"0\",\"address_format:address_format_186\":\"0\",\"address_format:address_format_187\":\"0\",\"address_format:address_format_188\":\"0\",\"address_format:address_format_189\":\"0\",\"address_format:address_format_190\":\"0\",\"address_format:address_format_191\":\"0\",\"address_format:address_format_192\":\"0\",\"address_format:address_format_193\":\"0\",\"address_format:address_format_194\":\"0\",\"address_format:address_format_195\":\"0\",\"address_format:address_format_196\":\"0\",\"address_format:address_format_197\":\"0\",\"address_format:address_format_198\":\"0\",\"address_format:address_format_199\":\"0\",\"address_format:address_format_200\":\"0\",\"address_format:address_format_201\":\"0\",\"address_format:address_format_202\":\"0\",\"address_format:address_format_203\":\"0\",\"address_format:address_format_204\":\"0\",\"address_format:address_format_205\":\"0\",\"address_format:address_format_206\":\"0\",\"address_format:address_format_207\":\"0\",\"address_format:address_format_208\":\"0\",\"address_format:address_format_209\":\"0\",\"address_format:address_format_210\":\"0\",\"address_format:address_format_211\":\"0\",\"address_format:address_format_212\":\"0\",\"address_format:address_format_213\":\"0\",\"address_format:address_format_214\":\"0\",\"address_format:address_format_215\":\"0\",\"address_format:address_format_216\":\"0\",\"address_format:address_format_217\":\"0\",\"address_format:address_format_218\":\"0\",\"address_format:address_format_219\":\"0\",\"address_format:address_format_220\":\"0\",\"address_format:address_format_221\":\"0\",\"address_format:address_format_222\":\"0\",\"address_format:address_format_223\":\"0\",\"address_format:address_format_224\":\"0\",\"address_format:address_format_225\":\"0\",\"address_format:address_format_226\":\"0\",\"address_format:address_format_227\":\"0\",\"address_format:address_format_228\":\"0\",\"address_format:address_format_229\":\"0\",\"address_format:address_format_230\":\"0\",\"address_format:address_format_231\":\"0\",\"address_format:address_format_232\":\"0\",\"address_format:address_format_233\":\"0\",\"address_format:address_format_235\":\"0\",\"address_format:address_format_236\":\"0\",\"address_format:address_format_237\":\"0\",\"address_format:address_format_238\":\"0\",\"address_format:address_format_239\":\"0\",\"address_format:address_format_240\":\"0\",\"address_format:address_format_241\":\"0\",\"address_format:address_format_242\":\"0\",\"address_format:address_format_243\":\"0\",\"address_format:address_format_244\":\"0\",\"carrier:carrier_1\":\"1\",\"group:Visitor\":\"1\",\"group:Guest\":\"2\",\"group:Customer\":\"3\",\"carrier_group:carrier_group_1_1\":0,\"carrier_group:carrier_group_1_2\":0,\"carrier_group:carrier_group_1_3\":0,\"carrier_tax_rules_group_shop:carrier_tax_rules_group_shop_1_1_1\":0,\"carrier_zone:carrier_zone_1_1\":0,\"category:Root\":\"1\",\"category:Home\":\"2\",\"category_group:category_group_1_1\":0,\"category_group:category_group_1_2\":0,\"category_group:category_group_1_3\":0,\"cms_category:Home\":\"1\",\"cms:Delivery\":\"1\",\"cms:Legal_Notice\":\"2\",\"cms:Terms_and_conditions_of_use\":\"3\",\"cms:About_us\":\"4\",\"cms:Secure_payment\":\"5\",\"cms_role:\":\"2\",\"configuration:PS_CURRENCY_DEFAULT\":6,\"configuration:PS_COUNTRY_DEFAULT\":7,\"configuration:PS_REWRITING_SETTINGS\":8,\"configuration:PS_ORDER_OUT_OF_STOCK\":9,\"configuration:PS_LAST_QTIES\":10,\"configuration:PS_CONDITIONS\":11,\"configuration:PS_RECYCLABLE_PACK\":12,\"configuration:PS_GIFT_WRAPPING\":13,\"configuration:PS_GIFT_WRAPPING_PRICE\":14,\"configuration:PS_STOCK_MANAGEMENT\":15,\"configuration:PS_NAVIGATION_PIPE\":16,\"configuration:PS_PRODUCTS_PER_PAGE\":17,\"configuration:PS_PURCHASE_MINIMUM\":18,\"configuration:PS_PRODUCTS_ORDER_WAY\":19,\"configuration:PS_PRODUCTS_ORDER_BY\":20,\"configuration:PS_DISPLAY_QTIES\":21,\"configuration:PS_SHIPPING_HANDLING\":22,\"configuration:PS_SHIPPING_FREE_PRICE\":23,\"configuration:PS_SHIPPING_FREE_WEIGHT\":24,\"configuration:PS_SHIPPING_METHOD\":25,\"configuration:PS_TAX\":26,\"configuration:PS_SHOP_ENABLE\":27,\"configuration:PS_NB_DAYS_NEW_PRODUCT\":28,\"configuration:PS_SSL_ENABLED\":29,\"configuration:PS_WEIGHT_UNIT\":30,\"configuration:PS_BLOCK_CART_AJAX\":31,\"configuration:PS_ORDER_RETURN\":32,\"configuration:PS_ORDER_RETURN_NB_DAYS\":33,\"configuration:PS_MAIL_TYPE\":34,\"configuration:PS_PRODUCT_PICTURE_MAX_SIZE\":35,\"configuration:PS_PRODUCT_PICTURE_WIDTH\":36,\"configuration:PS_PRODUCT_PICTURE_HEIGHT\":37,\"configuration:PS_INVOICE_PREFIX\":38,\"configuration:PS_INVCE_INVOICE_ADDR_RULES\":39,\"configuration:PS_INVCE_DELIVERY_ADDR_RULES\":40,\"configuration:PS_DELIVERY_PREFIX\":41,\"configuration:PS_DELIVERY_NUMBER\":42,\"configuration:PS_RETURN_PREFIX\":43,\"configuration:PS_INVOICE\":44,\"configuration:PS_PASSWD_TIME_BACK\":45,\"configuration:PS_PASSWD_TIME_FRONT\":46,\"configuration:PS_PASSWD_RESET_VALIDITY\":47,\"configuration:PS_DISP_UNAVAILABLE_ATTR\":48,\"configuration:PS_SEARCH_INDEXATION\":49,\"configuration:PS_SEARCH_FUZZY\":50,\"configuration:PS_SEARCH_FUZZY_MAX_LOOP\":51,\"configuration:PS_SEARCH_MAX_WORD_LENGTH\":52,\"configuration:PS_SEARCH_MINWORDLEN\":53,\"configuration:PS_SEARCH_BLACKLIST\":54,\"configuration:PS_SEARCH_WEIGHT_PNAME\":55,\"configuration:PS_SEARCH_WEIGHT_REF\":56,\"configuration:PS_SEARCH_WEIGHT_SHORTDESC\":57,\"configuration:PS_SEARCH_WEIGHT_DESC\":58,\"configuration:PS_SEARCH_WEIGHT_CNAME\":59,\"configuration:PS_SEARCH_WEIGHT_MNAME\":60,\"configuration:PS_SEARCH_WEIGHT_TAG\":61,\"configuration:PS_SEARCH_WEIGHT_ATTRIBUTE\":62,\"configuration:PS_SEARCH_WEIGHT_FEATURE\":63,\"configuration:PS_SEARCH_AJAX\":64,\"configuration:PS_TIMEZONE\":65,\"configuration:PS_THEME_V11\":66,\"configuration:PRESTASTORE_LIVE\":67,\"configuration:PS_TIN_ACTIVE\":68,\"configuration:PS_SHOW_ALL_MODULES\":69,\"configuration:PS_BACKUP_ALL\":70,\"configuration:PS_1_3_UPDATE_DATE\":71,\"configuration:PS_PRICE_ROUND_MODE\":72,\"configuration:PS_1_3_2_UPDATE_DATE\":73,\"configuration:PS_CONDITIONS_CMS_ID\":74,\"configuration:PS_VOLUME_UNIT\":75,\"configuration:PS_CIPHER_ALGORITHM\":76,\"configuration:PS_ATTRIBUTE_CATEGORY_DISPLAY\":77,\"configuration:PS_CUSTOMER_SERVICE_FILE_UPLOAD\":78,\"configuration:PS_CUSTOMER_SERVICE_SIGNATURE\":79,\"configuration:PS_BLOCK_BESTSELLERS_DISPLAY\":80,\"configuration:PS_BLOCK_NEWPRODUCTS_DISPLAY\":81,\"configuration:PS_BLOCK_SPECIALS_DISPLAY\":82,\"configuration:PS_STOCK_MVT_REASON_DEFAULT\":83,\"configuration:PS_SPECIFIC_PRICE_PRIORITIES\":84,\"configuration:PS_TAX_DISPLAY\":85,\"configuration:PS_SMARTY_FORCE_COMPILE\":86,\"configuration:PS_DISTANCE_UNIT\":87,\"configuration:PS_STORES_DISPLAY_CMS\":88,\"configuration:SHOP_LOGO_WIDTH\":89,\"configuration:SHOP_LOGO_HEIGHT\":90,\"configuration:EDITORIAL_IMAGE_WIDTH\":91,\"configuration:EDITORIAL_IMAGE_HEIGHT\":92,\"configuration:PS_STATSDATA_CUSTOMER_PAGESVIEWS\":93,\"configuration:PS_STATSDATA_PAGESVIEWS\":94,\"configuration:PS_STATSDATA_PLUGINS\":95,\"configuration:PS_GEOLOCATION_ENABLED\":96,\"configuration:PS_ALLOWED_COUNTRIES\":97,\"configuration:PS_GEOLOCATION_BEHAVIOR\":98,\"configuration:PS_LOCALE_LANGUAGE\":99,\"configuration:PS_LOCALE_COUNTRY\":100,\"configuration:PS_ATTACHMENT_MAXIMUM_SIZE\":101,\"configuration:PS_SMARTY_CACHE\":102,\"configuration:PS_DIMENSION_UNIT\":103,\"configuration:PS_GUEST_CHECKOUT_ENABLED\":104,\"configuration:PS_DISPLAY_SUPPLIERS\":105,\"configuration:PS_DISPLAY_MANUFACTURERS\":106,\"configuration:PS_DISPLAY_BEST_SELLERS\":107,\"configuration:PS_CATALOG_MODE\":108,\"configuration:PS_GEOLOCATION_WHITELIST\":109,\"configuration:PS_LOGS_BY_EMAIL\":110,\"configuration:PS_COOKIE_CHECKIP\":111,\"configuration:PS_COOKIE_SAMESITE\":112,\"configuration:PS_USE_ECOTAX\":113,\"configuration:PS_CANONICAL_REDIRECT\":114,\"configuration:PS_IMG_UPDATE_TIME\":115,\"configuration:PS_BACKUP_DROP_TABLE\":116,\"configuration:PS_OS_CHEQUE\":117,\"configuration:PS_OS_PAYMENT\":118,\"configuration:PS_OS_PREPARATION\":119,\"configuration:PS_OS_SHIPPING\":120,\"configuration:PS_OS_DELIVERED\":121,\"configuration:PS_OS_CANCELED\":122,\"configuration:PS_OS_REFUND\":123,\"configuration:PS_OS_ERROR\":124,\"configuration:PS_OS_OUTOFSTOCK\":125,\"configuration:PS_OS_BANKWIRE\":126,\"configuration:PS_OS_WS_PAYMENT\":127,\"configuration:PS_OS_OUTOFSTOCK_PAID\":128,\"configuration:PS_OS_OUTOFSTOCK_UNPAID\":129,\"configuration:PS_OS_COD_VALIDATION\":130,\"configuration:PS_LEGACY_IMAGES\":131,\"configuration:PS_IMAGE_QUALITY\":132,\"configuration:PS_PNG_QUALITY\":133,\"configuration:PS_JPEG_QUALITY\":134,\"configuration:PS_WEBP_QUALITY\":135,\"configuration:PS_COOKIE_LIFETIME_FO\":136,\"configuration:PS_COOKIE_LIFETIME_BO\":137,\"configuration:PS_RESTRICT_DELIVERED_COUNTRIES\":138,\"configuration:PS_SHOW_NEW_ORDERS\":139,\"configuration:PS_SHOW_NEW_CUSTOMERS\":140,\"configuration:PS_SHOW_NEW_MESSAGES\":141,\"configuration:PS_FEATURE_FEATURE_ACTIVE\":142,\"configuration:PS_COMBINATION_FEATURE_ACTIVE\":143,\"configuration:PS_SPECIFIC_PRICE_FEATURE_ACTIVE\":144,\"configuration:PS_VIRTUAL_PROD_FEATURE_ACTIVE\":145,\"configuration:PS_CUSTOMIZATION_FEATURE_ACTIVE\":146,\"configuration:PS_CART_RULE_FEATURE_ACTIVE\":147,\"configuration:PS_PACK_FEATURE_ACTIVE\":148,\"configuration:PS_ALIAS_FEATURE_ACTIVE\":149,\"configuration:PS_TAX_ADDRESS_TYPE\":150,\"configuration:PS_SHOP_DEFAULT\":151,\"configuration:PS_CARRIER_DEFAULT_SORT\":152,\"configuration:PS_STOCK_MVT_INC_REASON_DEFAULT\":153,\"configuration:PS_STOCK_MVT_DEC_REASON_DEFAULT\":154,\"configuration:PS_ADVANCED_STOCK_MANAGEMENT\":155,\"configuration:PS_STOCK_MVT_TRANSFER_TO\":156,\"configuration:PS_STOCK_MVT_TRANSFER_FROM\":157,\"configuration:PS_CARRIER_DEFAULT_ORDER\":158,\"configuration:PS_STOCK_MVT_SUPPLY_ORDER\":159,\"configuration:PS_STOCK_CUSTOMER_ORDER_CANCEL_REASON\":160,\"configuration:PS_STOCK_CUSTOMER_RETURN_REASON\":161,\"configuration:PS_STOCK_MVT_INC_EMPLOYEE_EDITION\":162,\"configuration:PS_STOCK_MVT_DEC_EMPLOYEE_EDITION\":163,\"configuration:PS_STOCK_CUSTOMER_ORDER_REASON\":164,\"configuration:PS_UNIDENTIFIED_GROUP\":165,\"configuration:PS_GUEST_GROUP\":166,\"configuration:PS_CUSTOMER_GROUP\":167,\"configuration:PS_SMARTY_CONSOLE\":168,\"configuration:PS_INVOICE_MODEL\":169,\"configuration:PS_LIMIT_UPLOAD_IMAGE_VALUE\":170,\"configuration:PS_LIMIT_UPLOAD_FILE_VALUE\":171,\"configuration:MB_PAY_TO_EMAIL\":172,\"configuration:MB_SECRET_WORD\":173,\"configuration:MB_HIDE_LOGIN\":174,\"configuration:MB_ID_LOGO\":175,\"configuration:MB_ID_LOGO_WALLET\":176,\"configuration:MB_PARAMETERS\":177,\"configuration:MB_PARAMETERS_2\":178,\"configuration:MB_DISPLAY_MODE\":179,\"configuration:MB_CANCEL_URL\":180,\"configuration:MB_LOCAL_METHODS\":181,\"configuration:MB_INTER_METHODS\":182,\"configuration:BANK_WIRE_CURRENCIES\":183,\"configuration:CHEQUE_CURRENCIES\":184,\"configuration:PRODUCTS_VIEWED_NBR\":185,\"configuration:BLOCK_CATEG_DHTML\":186,\"configuration:BLOCK_CATEG_MAX_DEPTH\":187,\"configuration:MANUFACTURER_DISPLAY_FORM\":188,\"configuration:MANUFACTURER_DISPLAY_TEXT\":189,\"configuration:MANUFACTURER_DISPLAY_TEXT_NB\":190,\"configuration:NEW_PRODUCTS_NBR\":191,\"configuration:PS_TOKEN_ENABLE\":192,\"configuration:PS_STATS_RENDER\":193,\"configuration:PS_STATS_OLD_CONNECT_AUTO_CLEAN\":194,\"configuration:PS_STATS_GRID_RENDER\":195,\"configuration:BLOCKTAGS_NBR\":196,\"configuration:CHECKUP_DESCRIPTIONS_LT\":197,\"configuration:CHECKUP_DESCRIPTIONS_GT\":198,\"configuration:CHECKUP_IMAGES_LT\":199,\"configuration:CHECKUP_IMAGES_GT\":200,\"configuration:CHECKUP_SALES_LT\":201,\"configuration:CHECKUP_SALES_GT\":202,\"configuration:CHECKUP_STOCK_LT\":203,\"configuration:CHECKUP_STOCK_GT\":204,\"configuration:FOOTER_CMS\":205,\"configuration:FOOTER_BLOCK_ACTIVATION\":206,\"configuration:FOOTER_POWEREDBY\":207,\"configuration:BLOCKADVERT_LINK\":208,\"configuration:BLOCKSTORE_IMG\":209,\"configuration:BLOCKADVERT_IMG_EXT\":210,\"configuration:MOD_BLOCKTOPMENU_ITEMS\":211,\"configuration:MOD_BLOCKTOPMENU_SEARCH\":212,\"configuration:blocksocial_facebook\":213,\"configuration:blocksocial_twitter\":214,\"configuration:blocksocial_rss\":215,\"configuration:blockcontactinfos_company\":216,\"configuration:blockcontactinfos_address\":217,\"configuration:blockcontactinfos_phone\":218,\"configuration:blockcontactinfos_email\":219,\"configuration:blockcontact_telnumber\":220,\"configuration:blockcontact_email\":221,\"configuration:SUPPLIER_DISPLAY_TEXT\":222,\"configuration:SUPPLIER_DISPLAY_TEXT_NB\":223,\"configuration:SUPPLIER_DISPLAY_FORM\":224,\"configuration:BLOCK_CATEG_NBR_COLUMN_FOOTER\":225,\"configuration:UPGRADER_BACKUPDB_FILENAME\":226,\"configuration:UPGRADER_BACKUPFILES_FILENAME\":227,\"configuration:BLOCKREINSURANCE_NBBLOCKS\":228,\"configuration:HOMESLIDER_WIDTH\":229,\"configuration:HOMESLIDER_SPEED\":230,\"configuration:HOMESLIDER_PAUSE\":231,\"configuration:HOMESLIDER_LOOP\":232,\"configuration:PS_BASE_DISTANCE_UNIT\":233,\"configuration:PS_SHOP_DOMAIN\":234,\"configuration:PS_SHOP_DOMAIN_SSL\":235,\"configuration:PS_SHOP_NAME\":236,\"configuration:PS_SHOP_EMAIL\":237,\"configuration:PS_MAIL_METHOD\":238,\"configuration:PS_SHOP_ACTIVITY\":239,\"configuration:PS_LOGO\":240,\"configuration:PS_FAVICON\":241,\"configuration:PS_STORES_ICON\":242,\"configuration:PS_ROOT_CATEGORY\":243,\"configuration:PS_HOME_CATEGORY\":244,\"configuration:PS_CONFIGURATION_AGREMENT\":245,\"configuration:PS_MAIL_SERVER\":246,\"configuration:PS_MAIL_USER\":247,\"configuration:PS_MAIL_PASSWD\":248,\"configuration:PS_MAIL_SMTP_ENCRYPTION\":249,\"configuration:PS_MAIL_SMTP_PORT\":250,\"configuration:PS_MAIL_COLOR\":251,\"configuration:PS_MAIL_DKIM_ENABLE\":252,\"configuration:PS_MAIL_DKIM_DOMAIN\":253,\"configuration:PS_MAIL_DKIM_SELECTOR\":254,\"configuration:PS_MAIL_DKIM_KEY\":255,\"configuration:NW_SALT\":256,\"configuration:PS_PAYMENT_LOGO_CMS_ID\":257,\"configuration:HOME_FEATURED_NBR\":258,\"configuration:SEK_MIN_OCCURENCES\":259,\"configuration:SEK_FILTER_KW\":260,\"configuration:PS_ALLOW_MOBILE_DEVICE\":261,\"configuration:PS_CUSTOMER_CREATION_EMAIL\":262,\"configuration:PS_SMARTY_CONSOLE_KEY\":263,\"configuration:PS_ATTRIBUTE_ANCHOR_SEPARATOR\":264,\"configuration:CONF_AVERAGE_PRODUCT_MARGIN\":265,\"configuration:PS_DASHBOARD_SIMULATION\":266,\"configuration:PS_USE_HTMLPURIFIER\":267,\"configuration:PS_SMARTY_LOCAL\":268,\"configuration:PS_SMARTY_CLEAR_CACHE\":269,\"configuration:PS_DETECT_LANG\":270,\"configuration:PS_DETECT_COUNTRY\":271,\"configuration:PS_ROUND_TYPE\":272,\"configuration:PS_LOG_EMAILS\":273,\"configuration:PS_CUSTOMER_OPTIN\":274,\"configuration:PS_CUSTOMER_BIRTHDATE\":275,\"configuration:PS_PACK_STOCK_TYPE\":276,\"configuration:PS_LOG_MODULE_PERFS_MODULO\":277,\"configuration:PS_DISALLOW_HISTORY_REORDERING\":278,\"configuration:PS_DISPLAY_PRODUCT_WEIGHT\":279,\"configuration:PS_PRODUCT_WEIGHT_PRECISION\":280,\"configuration:PS_ORDER_RECALCULATE_SHIPPING\":281,\"configuration:PS_MAINTENANCE_TEXT\":282,\"configuration:PS_PRODUCT_SHORT_DESC_LIMIT\":283,\"configuration:PS_LABEL_IN_STOCK_PRODUCTS\":284,\"configuration:PS_LABEL_OOS_PRODUCTS_BOA\":285,\"configuration:PS_LABEL_OOS_PRODUCTS_BOD\":286,\"configuration:PS_CATALOG_MODE_WITH_PRICES\":287,\"configuration:PS_MAIL_THEME\":288,\"configuration:PS_ORDER_PRODUCTS_NB_PER_PAGE\":289,\"configuration:PS_LOGS_EMAIL_RECEIVERS\":290,\"configuration:PS_SHOW_LABEL_OOS_LISTING_PAGES\":291,\"configuration:ADDONS_API_MODULE_CHANNEL\":292,\"configuration:PS_SECURITY_TOKEN\":293,\"configuration:PS_SECURITY_PASSWORD_POLICY_MAXIMUM_LENGTH\":294,\"configuration:PS_SECURITY_PASSWORD_POLICY_MINIMUM_LENGTH\":295,\"configuration:PS_SECURITY_PASSWORD_POLICY_MINIMUM_SCORE\":296,\"contact:Webmaster\":\"1\",\"contact:Customer_service\":\"2\",\"feature_flag:product_page_v2\":\"1\",\"feature_flag:product_page_v2_multi_shop\":\"2\",\"gender:Mr\":\"1\",\"gender:Mrs\":\"2\",\"hook:actionValidateOrder\":1,\"hook:actionValidateOrderAfter\":2,\"hook:displayMaintenance\":3,\"hook:displayCartModalContent\":4,\"hook:displayCartModalFooter\":5,\"hook:displayProductPageDrawer\":6,\"hook:actionPaymentConfirmation\":7,\"hook:displayPaymentReturn\":8,\"hook:actionUpdateQuantity\":9,\"hook:displayRightColumn\":10,\"hook:displayWrapperTop\":11,\"hook:displayWrapperBottom\":12,\"hook:displayContentWrapperTop\":13,\"hook:displayContentWrapperBottom\":14,\"hook:displayLeftColumn\":15,\"hook:displayHome\":16,\"hook:displayHeader\":17,\"hook:actionCartSave\":18,\"hook:actionAuthentication\":19,\"hook:actionProductAdd\":20,\"hook:actionProductUpdate\":21,\"hook:displayAfterTitleTag\":22,\"hook:displayAfterBodyOpeningTag\":23,\"hook:displayBanner\":24,\"hook:displayBeforeBodyClosingTag\":25,\"hook:displayTop\":26,\"hook:displayNavFullWidth\":27,\"hook:displayRightColumnProduct\":28,\"hook:actionProductDelete\":29,\"hook:actionObjectProductInCartDeleteBefore\":30,\"hook:actionObjectProductInCartDeleteAfter\":31,\"hook:displayFooterProduct\":32,\"hook:displayInvoice\":33,\"hook:actionOrderStatusUpdate\":34,\"hook:displayAdminGridTableBefore\":573,\"hook:displayAdminGridTableAfter\":574,\"hook:displayAdminOrder\":37,\"hook:displayAdminOrderTabOrder\":38,\"hook:displayAdminOrderTabShip\":39,\"hook:displayAdminOrderContentOrder\":40,\"hook:displayAdminOrderContentShip\":41,\"hook:displayFooter\":42,\"hook:displayPDFInvoice\":43,\"hook:displayInvoiceLegalFreeText\":44,\"hook:displayAdminCustomers\":45,\"hook:displayAdminCustomersAddressesItemAction\":46,\"hook:displayOrderConfirmation\":47,\"hook:actionCustomerAccountAdd\":48,\"hook:actionCustomerAccountUpdate\":49,\"hook:displayCustomerAccount\":50,\"hook:actionOrderSlipAdd\":51,\"hook:displayShoppingCartFooter\":52,\"hook:displayCreateAccountEmailFormBottom\":53,\"hook:displayAuthenticateFormBottom\":54,\"hook:displayCustomerAccountForm\":55,\"hook:displayModuleConfigureExtraButtons\":56,\"hook:displayAdminStatsModules\":57,\"hook:displayAdminStatsGraphEngine\":58,\"hook:actionOrderReturn\":59,\"hook:displayProductAdditionalInfo\":60,\"hook:displayBackOfficeHome\":61,\"hook:displayAdminStatsGridEngine\":62,\"hook:actionWatermark\":63,\"hook:actionProductCancel\":64,\"hook:displayLeftColumnProduct\":65,\"hook:actionProductOutOfStock\":66,\"hook:actionProductAttributeUpdate\":67,\"hook:displayCarrierList\":68,\"hook:displayShoppingCart\":69,\"hook:actionCarrierUpdate\":70,\"hook:actionOrderStatusPostUpdate\":71,\"hook:displayCustomerAccountFormTop\":72,\"hook:displayBackOfficeHeader\":73,\"hook:displayBackOfficeTop\":74,\"hook:displayAdminEndContent\":75,\"hook:displayBackOfficeFooter\":76,\"hook:actionProductAttributeDelete\":77,\"hook:actionCarrierProcess\":78,\"hook:displayBeforeCarrier\":79,\"hook:displayAfterCarrier\":80,\"hook:displayOrderDetail\":81,\"hook:actionPaymentCCAdd\":82,\"hook:actionCategoryAdd\":83,\"hook:actionCategoryUpdate\":84,\"hook:actionCategoryDelete\":85,\"hook:displayPaymentTop\":86,\"hook:actionHtaccessCreate\":87,\"hook:actionAdminMetaSave\":88,\"hook:displayAttributeGroupForm\":89,\"hook:actionAttributeGroupSave\":90,\"hook:actionAttributeGroupDelete\":91,\"hook:displayFeatureForm\":92,\"hook:actionFeatureSave\":93,\"hook:actionFeatureDelete\":94,\"hook:actionProductSave\":95,\"hook:displayAttributeGroupPostProcess\":96,\"hook:displayFeaturePostProcess\":97,\"hook:displayFeatureValueForm\":98,\"hook:displayFeatureValuePostProcess\":99,\"hook:actionFeatureValueDelete\":100,\"hook:actionFeatureValueSave\":101,\"hook:displayAttributeForm\":102,\"hook:actionAttributePostProcess\":103,\"hook:actionAttributeDelete\":104,\"hook:actionAttributeSave\":105,\"hook:actionTaxManager\":106,\"hook:displayMyAccountBlock\":107,\"hook:actionModuleInstallBefore\":108,\"hook:actionModuleInstallAfter\":109,\"hook:actionModuleUninstallBefore\":110,\"hook:actionModuleUninstallAfter\":111,\"hook:displayTopColumn\":112,\"hook:displayBackOfficeCategory\":113,\"hook:displayProductListFunctionalButtons\":114,\"hook:displayNav\":115,\"hook:displayOverrideTemplate\":116,\"hook:actionAdminLoginControllerSetMedia\":117,\"hook:actionOrderEdited\":118,\"hook:actionEmailAddBeforeContent\":119,\"hook:actionEmailAddAfterContent\":120,\"hook:sendMailAlterTemplateVars\":121,\"hook:displayCartExtraProductActions\":122,\"hook:displayPaymentByBinaries\":123,\"hook:additionalCustomerFormFields\":124,\"hook:additionalCustomerAddressFields\":125,\"hook:addWebserviceResources\":126,\"hook:displayCustome', '2023-08-28 13:26:18', '2023-08-28 13:26:18'), +(298, NULL, NULL, 'PS_SSL_ENABLED_EVERYWHERE', '1', '2023-08-28 13:26:18', '2023-08-28 13:26:18'), +(299, NULL, NULL, 'PSR_HOOK_HEADER', '0', '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(300, NULL, NULL, 'PSR_HOOK_FOOTER', '0', '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(301, NULL, NULL, 'PSR_HOOK_PRODUCT', '1', '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(302, NULL, NULL, 'PSR_HOOK_CHECKOUT', '1', '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(303, NULL, NULL, 'PSR_ICON_COLOR', '#F19D76', '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(304, NULL, NULL, 'PSR_TEXT_COLOR', '#000000', '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(305, NULL, NULL, 'blockwishlist_WishlistPageName', NULL, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(306, NULL, NULL, 'blockwishlist_WishlistDefaultTitle', NULL, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(307, NULL, NULL, 'blockwishlist_CreateButtonLabel', NULL, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(308, NULL, NULL, 'PSGDPR_CREATION_FORM_SWITCH', '1', '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(309, NULL, NULL, 'PSGDPR_CREATION_FORM', NULL, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(310, NULL, NULL, 'PSGDPR_CUSTOMER_FORM_SWITCH', '1', '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(311, NULL, NULL, 'PSGDPR_CUSTOMER_FORM', NULL, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(312, NULL, NULL, 'PSGDPR_ANONYMOUS_CUSTOMER', '1', '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(313, NULL, NULL, 'PSGDPR_ANONYMOUS_ADDRESS', '1', '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(314, NULL, NULL, 'PS_CONTACT_INFO_DISPLAY_EMAIL', '1', '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(315, NULL, NULL, 'HOMESLIDER_PAUSE_ON_HOVER', '1', '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(316, NULL, NULL, 'HOMESLIDER_WRAP', '1', '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(317, NULL, NULL, 'HOME_FEATURED_CAT', '2', '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(318, NULL, NULL, 'HOME_FEATURED_RANDOMIZE', NULL, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(319, NULL, NULL, 'BANNER_IMG', NULL, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(320, NULL, NULL, 'BANNER_LINK', NULL, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(321, NULL, NULL, 'BANNER_DESC', NULL, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(322, NULL, NULL, 'BLOCKSPECIALS_SPECIALS_NBR', '8', '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(323, NULL, NULL, 'PS_BLOCK_BESTSELLERS_TO_DISPLAY', '8', '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(324, NULL, NULL, 'PS_NEWSLETTER_RAND', '321647187454088020', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(325, NULL, NULL, 'NW_CONDITIONS', NULL, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(326, NULL, NULL, 'BLOCKSOCIAL_YOUTUBE', NULL, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(327, NULL, NULL, 'BLOCKSOCIAL_PINTEREST', NULL, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(328, NULL, NULL, 'BLOCKSOCIAL_VIMEO', NULL, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(329, NULL, NULL, 'BLOCKSOCIAL_INSTAGRAM', NULL, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(330, NULL, NULL, 'BLOCKSOCIAL_LINKEDIN', NULL, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(331, NULL, NULL, 'PRODUCT_COMMENTS_MINIMAL_TIME', '30', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(332, NULL, NULL, 'PRODUCT_COMMENTS_ALLOW_GUESTS', '0', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(333, NULL, NULL, 'PRODUCT_COMMENTS_USEFULNESS', '1', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(334, NULL, NULL, 'PRODUCT_COMMENTS_COMMENTS_PER_PAGE', '5', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(335, NULL, NULL, 'PRODUCT_COMMENTS_ANONYMISATION', '0', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(336, NULL, NULL, 'PRODUCT_COMMENTS_MODERATE', '1', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(337, NULL, NULL, 'BLOCK_CATEG_ROOT_CATEGORY', '1', '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(347, NULL, NULL, 'PS_SC_TWITTER', '1', '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(348, NULL, NULL, 'PS_SC_FACEBOOK', '1', '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(349, NULL, NULL, 'PS_SC_PINTEREST', '1', '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(350, NULL, NULL, 'BRAND_DISPLAY_TYPE', 'brand_text', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(351, NULL, NULL, 'BRAND_DISPLAY_TEXT_NB', '5', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(352, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_LAST_ORDER', '10', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(353, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_BEST_SELLER', '10', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(354, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_MOST_VIEWED', '10', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(355, NULL, NULL, 'DASHPRODUCT_NBR_SHOW_TOP_SEARCH', '10', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(356, NULL, NULL, 'CONF_PS_CHECKPAYMENT_FIXED', '0.2', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(357, NULL, NULL, 'CONF_PS_CHECKPAYMENT_VAR', '2', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(358, NULL, NULL, 'CONF_PS_CHECKPAYMENT_FIXED_FOREIGN', '0.2', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(359, NULL, NULL, 'CONF_PS_CHECKPAYMENT_VAR_FOREIGN', '2', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(360, NULL, NULL, 'CATEGORYPRODUCTS_DISPLAY_PRICE', '1', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(361, NULL, NULL, 'CATEGORYPRODUCTS_DISPLAY_PRODUCTS', '16', '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(362, NULL, NULL, 'SUPPLIER_DISPLAY_TYPE', 'supplier_text', '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(363, NULL, NULL, 'GA_CANCELLED_STATES', '[\"6\"]', '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(364, NULL, NULL, 'DASHACTIVITY_CART_ACTIVE', '30', '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(365, NULL, NULL, 'DASHACTIVITY_CART_ABANDONED_MIN', '24', '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(366, NULL, NULL, 'DASHACTIVITY_CART_ABANDONED_MAX', '48', '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(367, NULL, NULL, 'DASHACTIVITY_VISITOR_ONLINE', '30', '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(368, NULL, NULL, 'GSITEMAP_PRIORITY_HOME', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(369, NULL, NULL, 'GSITEMAP_PRIORITY_PRODUCT', '0.9', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(370, NULL, NULL, 'GSITEMAP_PRIORITY_CATEGORY', '0.8', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(371, NULL, NULL, 'GSITEMAP_PRIORITY_CMS', '0.7', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(372, NULL, NULL, 'GSITEMAP_FREQUENCY', 'weekly', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(373, NULL, NULL, 'GSITEMAP_CHECK_IMAGE_FILE', NULL, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(374, NULL, NULL, 'GSITEMAP_LAST_EXPORT', NULL, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(375, NULL, NULL, 'CUSTPRIV_MSG_AUTH', NULL, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(376, NULL, NULL, 'MA_MERCHANT_ORDER', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(377, NULL, NULL, 'MA_MERCHANT_OOS', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(378, NULL, NULL, 'MA_CUSTOMER_QTY', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(379, NULL, NULL, 'MA_ORDER_EDIT', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(380, NULL, NULL, 'MA_RETURN_SLIP', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(381, NULL, NULL, 'MA_MERCHANT_MAILS', 'demo@prestashop.com', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(382, NULL, NULL, 'MA_LAST_QTIES', '3', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(383, NULL, NULL, 'MA_MERCHANT_COVERAGE', '0', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(384, NULL, NULL, 'MA_PRODUCT_COVERAGE', '0', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(385, NULL, NULL, 'BANK_WIRE_PAYMENT_INVITE', '1', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(386, NULL, NULL, 'CONF_PS_WIREPAYMENT_FIXED', '0.2', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(387, NULL, NULL, 'CONF_PS_WIREPAYMENT_VAR', '2', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(388, NULL, NULL, 'CONF_PS_WIREPAYMENT_FIXED_FOREIGN', '0.2', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(389, NULL, NULL, 'CONF_PS_WIREPAYMENT_VAR_FOREIGN', '2', '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(390, NULL, NULL, 'CROSSSELLING_DISPLAY_PRICE', '1', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(391, NULL, NULL, 'CROSSSELLING_NBR', '8', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(392, NULL, NULL, 'PS_DASHGOALS_CURRENT_YEAR', '2023', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(393, NULL, NULL, 'CONF_PS_CASHONDELIVERY_FIXED', '0.2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(394, NULL, NULL, 'CONF_PS_CASHONDELIVERY_VAR', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(395, NULL, NULL, 'CONF_PS_CASHONDELIVERY_FIXED_FOREIGN', '0.2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(396, NULL, NULL, 'CONF_PS_CASHONDELIVERY_VAR_FOREIGN', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(397, NULL, NULL, 'CONF_MOLLIE_FIXED', '0.2', '2023-08-28 13:28:00', '2023-08-28 13:28:00'), +(398, NULL, NULL, 'CONF_MOLLIE_VAR', '2', '2023-08-28 13:28:00', '2023-08-28 13:28:00'), +(399, NULL, NULL, 'CONF_MOLLIE_FIXED_FOREIGN', '0.2', '2023-08-28 13:28:00', '2023-08-28 13:28:00'), +(400, NULL, NULL, 'CONF_MOLLIE_VAR_FOREIGN', '2', '2023-08-28 13:28:00', '2023-08-28 13:28:00'), +(401, NULL, NULL, 'MOLLIE_STATUS_PARTIAL_REFUND', '14', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(402, NULL, NULL, 'MOLLIE_STATUS_AWAITING', '15', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(403, NULL, NULL, 'MOLLIE_PARTIALLY_SHIPPED', '16', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(404, NULL, NULL, 'MOLLIE_STATUS_ORDER_COMPLETED', '17', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(405, NULL, NULL, 'MOLLIE_STATUS_KLARNA_AUTHORIZED', '18', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(406, NULL, NULL, 'MOLLIE_STATUS_KLARNA_SHIPPED', '19', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(407, NULL, NULL, 'MOLLIE_STATUS_CHARGEBACK', '20', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(410, NULL, NULL, 'MOLLIE_ENVIRONMENT', '0', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(422, NULL, NULL, 'MOLLIE_STATUS_OPEN', '15', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(423, NULL, NULL, 'MOLLIE_STATUS_PAID', '2', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(424, NULL, NULL, 'MOLLIE_STATUS_COMPLETED', '17', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(425, NULL, NULL, 'MOLLIE_STATUS_CANCELED', '6', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(426, NULL, NULL, 'MOLLIE_STATUS_EXPIRED', '6', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(427, NULL, NULL, 'MOLLIE_STATUS_REFUNDED', '7', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(428, NULL, NULL, 'MOLLIE_STATUS_SHIPPING', '16', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(438, NULL, NULL, 'MOLLIE_APPLE_PAY_DIRECT_STYLE', '0', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(439, NULL, NULL, 'MOLLIE_BANCONTACT_QR_CODE_ENABLED', '0', '2023-08-28 13:28:01', '2023-08-28 13:28:01'), +(441, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_meal', '1', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(442, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_gift', '2', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(443, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_eco', '3', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(444, NULL, NULL, 'MOLLIE_VOUCHER_FEATURE_ID', '1', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(445, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_GROUP', '1', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(446, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_NONE', '1', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(447, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_DAILY', '2', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(448, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_WEEKLY', '3', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(449, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_MONTHLY', '4', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(450, NULL, NULL, 'SUBSCRIPTION_ATTRIBUTE_YEARLY', '5', '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(451, NULL, NULL, 'PS_LAYERED_CACHE_ENABLED', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(452, NULL, NULL, 'PS_LAYERED_SHOW_QTIES', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(453, NULL, NULL, 'PS_LAYERED_FULL_TREE', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(454, NULL, NULL, 'PS_LAYERED_FILTER_PRICE_USETAX', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(455, NULL, NULL, 'PS_LAYERED_FILTER_CATEGORY_DEPTH', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(456, NULL, NULL, 'PS_LAYERED_FILTER_PRICE_ROUNDING', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(457, NULL, NULL, 'PS_LAYERED_FILTER_SHOW_OUT_OF_STOCK_LAST', '0', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(458, NULL, NULL, 'PS_LAYERED_FILTER_BY_DEFAULT_CATEGORY', '0', '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(459, NULL, NULL, 'PS_LAYERED_INDEXED', '1', '2023-08-28 13:28:06', '2023-08-28 13:28:06'); DROP TABLE IF EXISTS `ps_configuration_kpi`; CREATE TABLE `ps_configuration_kpi` ( `id_configuration_kpi` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop_group` int(10) unsigned DEFAULT NULL, - `id_shop` int(10) unsigned DEFAULT NULL, + `id_shop_group` int(11) unsigned DEFAULT NULL, + `id_shop` int(11) unsigned DEFAULT NULL, `name` varchar(64) NOT NULL, `value` text, `date_add` datetime NOT NULL, @@ -3528,61 +3261,45 @@ CREATE TABLE `ps_configuration_kpi` ( KEY `name` (`name`), KEY `id_shop` (`id_shop`), KEY `id_shop_group` (`id_shop_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_configuration_kpi` (`id_configuration_kpi`, `id_shop_group`, `id_shop`, `name`, `value`, `date_add`, `date_upd`) VALUES -(1, NULL, NULL, 'DASHGOALS_TRAFFIC_01_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(2, NULL, NULL, 'DASHGOALS_CONVERSION_01_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(3, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_01_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(4, NULL, NULL, 'DASHGOALS_TRAFFIC_02_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(5, NULL, NULL, 'DASHGOALS_CONVERSION_02_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(6, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_02_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(7, NULL, NULL, 'DASHGOALS_TRAFFIC_03_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(8, NULL, NULL, 'DASHGOALS_CONVERSION_03_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(9, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_03_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(10, NULL, NULL, 'DASHGOALS_TRAFFIC_04_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(11, NULL, NULL, 'DASHGOALS_CONVERSION_04_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(12, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_04_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(13, NULL, NULL, 'DASHGOALS_TRAFFIC_05_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(14, NULL, NULL, 'DASHGOALS_CONVERSION_05_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(15, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_05_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(16, NULL, NULL, 'DASHGOALS_TRAFFIC_06_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(17, NULL, NULL, 'DASHGOALS_CONVERSION_06_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(18, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_06_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(19, NULL, NULL, 'DASHGOALS_TRAFFIC_07_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(20, NULL, NULL, 'DASHGOALS_CONVERSION_07_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(21, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_07_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(22, NULL, NULL, 'DASHGOALS_TRAFFIC_08_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(23, NULL, NULL, 'DASHGOALS_CONVERSION_08_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(24, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_08_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(25, NULL, NULL, 'DASHGOALS_TRAFFIC_09_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(26, NULL, NULL, 'DASHGOALS_CONVERSION_09_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(27, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_09_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(28, NULL, NULL, 'DASHGOALS_TRAFFIC_10_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(29, NULL, NULL, 'DASHGOALS_CONVERSION_10_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(30, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_10_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(31, NULL, NULL, 'DASHGOALS_TRAFFIC_11_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(32, NULL, NULL, 'DASHGOALS_CONVERSION_11_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(33, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_11_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(34, NULL, NULL, 'DASHGOALS_TRAFFIC_12_2023', '600', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(35, NULL, NULL, 'DASHGOALS_CONVERSION_12_2023', '2', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(36, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_12_2023', '80', '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(37, NULL, NULL, 'NEWSLETTER_REGISTRATIONS', '1', '2023-05-08 16:48:20', '2023-05-08 16:48:20'), -(38, NULL, NULL, 'NEWSLETTER_REGISTRATIONS_EXPIRE', '1683578901', '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(39, NULL, NULL, 'AVG_CUSTOMER_AGE', NULL, '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(40, NULL, NULL, 'AVG_CUSTOMER_AGE_EXPIRE', NULL, '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(41, NULL, NULL, 'CUSTOMER_MAIN_GENDER', NULL, '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(42, NULL, NULL, 'CUSTOMER_MAIN_GENDER_EXPIRE', NULL, '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(43, NULL, NULL, 'ORDERS_PER_CUSTOMER', '0', '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(44, NULL, NULL, 'ORDERS_PER_CUSTOMER_EXPIRE', '1683643701', '2023-05-08 16:48:21', '2023-05-08 16:48:21'), -(45, 1, 2, 'AVG_ORDER_VALUE', '€0.00', '2023-05-15 10:01:22', '2023-05-15 10:01:22'), -(46, 1, 2, 'AVG_ORDER_VALUE_EXPIRE', '1684188000', '2023-05-15 10:01:22', '2023-05-15 10:01:22'), -(47, 1, 2, 'ABANDONED_CARTS', '0', '2023-05-15 10:01:23', '2023-05-15 10:01:23'), -(48, 1, 2, 'ABANDONED_CARTS_EXPIRE', '1684141283', '2023-05-15 10:01:23', '2023-05-15 10:01:23'), -(49, 1, 2, 'NETPROFIT_VISIT', '€0.00', '2023-05-15 10:01:23', '2023-05-15 10:01:23'), -(50, 1, 2, 'NETPROFIT_VISIT_EXPIRE', '1684188000', '2023-05-15 10:01:23', '2023-05-15 10:01:23'), -(51, 1, 2, 'CONVERSION_RATE', '0%', '2023-05-15 10:01:24', '2023-05-15 10:01:24'), -(52, 1, 2, 'CONVERSION_RATE_EXPIRE', '1684188000', '2023-05-15 10:01:24', '2023-05-15 10:01:24'); +(1, NULL, NULL, 'DASHGOALS_TRAFFIC_01_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(2, NULL, NULL, 'DASHGOALS_CONVERSION_01_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(3, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_01_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(4, NULL, NULL, 'DASHGOALS_TRAFFIC_02_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(5, NULL, NULL, 'DASHGOALS_CONVERSION_02_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(6, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_02_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(7, NULL, NULL, 'DASHGOALS_TRAFFIC_03_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(8, NULL, NULL, 'DASHGOALS_CONVERSION_03_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(9, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_03_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(10, NULL, NULL, 'DASHGOALS_TRAFFIC_04_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(11, NULL, NULL, 'DASHGOALS_CONVERSION_04_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(12, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_04_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(13, NULL, NULL, 'DASHGOALS_TRAFFIC_05_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(14, NULL, NULL, 'DASHGOALS_CONVERSION_05_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(15, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_05_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(16, NULL, NULL, 'DASHGOALS_TRAFFIC_06_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(17, NULL, NULL, 'DASHGOALS_CONVERSION_06_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(18, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_06_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(19, NULL, NULL, 'DASHGOALS_TRAFFIC_07_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(20, NULL, NULL, 'DASHGOALS_CONVERSION_07_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(21, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_07_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(22, NULL, NULL, 'DASHGOALS_TRAFFIC_08_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(23, NULL, NULL, 'DASHGOALS_CONVERSION_08_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(24, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_08_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(25, NULL, NULL, 'DASHGOALS_TRAFFIC_09_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(26, NULL, NULL, 'DASHGOALS_CONVERSION_09_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(27, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_09_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(28, NULL, NULL, 'DASHGOALS_TRAFFIC_10_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(29, NULL, NULL, 'DASHGOALS_CONVERSION_10_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(30, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_10_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(31, NULL, NULL, 'DASHGOALS_TRAFFIC_11_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(32, NULL, NULL, 'DASHGOALS_CONVERSION_11_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(33, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_11_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(34, NULL, NULL, 'DASHGOALS_TRAFFIC_12_2023', '600', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(35, NULL, NULL, 'DASHGOALS_CONVERSION_12_2023', '2', '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(36, NULL, NULL, 'DASHGOALS_AVG_CART_VALUE_12_2023', '80', '2023-08-28 13:27:59', '2023-08-28 13:27:59'); DROP TABLE IF EXISTS `ps_configuration_kpi_lang`; CREATE TABLE `ps_configuration_kpi_lang` ( @@ -3591,21 +3308,8 @@ CREATE TABLE `ps_configuration_kpi_lang` ( `value` text, `date_upd` datetime DEFAULT NULL, PRIMARY KEY (`id_configuration_kpi`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `ps_configuration_kpi_lang` (`id_configuration_kpi`, `id_lang`, `value`, `date_upd`) VALUES -(39, 1, '53 years', '2023-05-08 16:48:21'), -(39, 2, '53 years', '2023-05-08 16:48:21'), -(39, 3, '53 years', '2023-05-08 16:48:21'), -(40, 1, '1683643701', '2023-05-08 16:48:21'), -(40, 2, '1683643701', '2023-05-08 16:48:21'), -(40, 3, '1683643701', '2023-05-08 16:48:21'), -(41, 1, '100% Male Customers', '2023-05-08 16:48:21'), -(41, 2, '100% Male Customers', '2023-05-08 16:48:21'), -(41, 3, '100% Male Customers', '2023-05-08 16:48:21'), -(42, 1, '1683643701', '2023-05-08 16:48:21'), -(42, 2, '1683643701', '2023-05-08 16:48:21'), -(42, 3, '1683643701', '2023-05-08 16:48:21'); DROP TABLE IF EXISTS `ps_configuration_lang`; CREATE TABLE `ps_configuration_lang` ( @@ -3614,21 +3318,21 @@ CREATE TABLE `ps_configuration_lang` ( `value` text, `date_upd` datetime DEFAULT NULL, PRIMARY KEY (`id_configuration`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_configuration_lang` (`id_configuration`, `id_lang`, `value`, `date_upd`) VALUES (38, 1, '#IN', NULL), -(38, 2, 'RE', NULL), -(38, 3, '#IN', NULL), +(38, 2, '#IN', NULL), +(38, 3, 'RE', NULL), (41, 1, '#DE', NULL), -(41, 2, 'LI', NULL), -(41, 3, '#DE', NULL), +(41, 2, '#DE', NULL), +(41, 3, 'LI', NULL), (43, 1, '#RE', NULL), -(43, 2, 'RET', NULL), -(43, 3, '#RE', NULL), +(43, 2, '#RE', NULL), +(43, 3, 'RET', NULL), (54, 1, 'a|about|above|after|again|against|all|am|an|and|any|are|aren|as|at|be|because|been|before|being|below|between|both|but|by|can|cannot|could|couldn|did|didn|do|does|doesn|doing|don|down|during|each|few|for|from|further|had|hadn|has|hasn|have|haven|having|he|ll|her|here|hers|herself|him|himself|his|how|ve|if|in|into|is|isn|it|its|itself|let|me|more|most|mustn|my|myself|no|nor|not|of|off|on|once|only|or|other|ought|our|ours|ourselves|out|over|own|same|shan|she|should|shouldn|so|some|such|than|that|the|their|theirs|them|themselves|then|there|these|they|re|this|those|through|to|too|under|until|up|very|was|wasn|we|were|weren|what|when|where|which|while|who|whom|why|with|won|would|wouldn|you|your|yours|yourself|yourselves', NULL), -(54, 2, 'aber|als|auch|auf|aus|bei|bin|bis|bist|dadurch|daher|darum|das|daß|dass|dein|deine|dem|den|der|des|dessen|deshalb|die|dies|dieser|dieses|doch|dort|durch|ein|eine|einem|einen|einer|eines|euer|eure|für|hatte|hatten|hattest|hattet|hier|hinter|ich|ihr|ihre|im|in|ist|ja|jede|jedem|jeden|jeder|jedes|jener|jenes|jetzt|kann|kannst|können|könnt|machen|mein|meine|muß|mußt|musst|müssen|müßt|nach|nachdem|nein|nicht|oder|seid|sein|seine|sich|sind|soll|sollen|sollst|sollt|sonst|soweit|sowie|und|unser|unsere|unter|vom|von|vor|wann|warum|was|weiter|weitere|wenn|wer|werde|werden|werdet|weshalb|wie|wieder|wieso|wir|wird|wirst|woher|wohin|zum|zur|über', NULL), -(54, 3, 'een|over|boven|na|weer|tegen|alles|ben|een|en|elke|zijn|zijn niet|als|op|zijn|omdat|geweest|voor|zijn|onder|tussen|beide|maar|door|kan|kan niet|kon|kon niet|deed|deed niet|doet|doet|doet niet|doen|doet niet|neer|tijdens|elk|weinig|voor|van|verder|had|had niet|heeft|heeft niet|hebben|hebben niet|hebben|hij|ll|haar|hier|haar|haarzelf|hem|hemzelf|zijn|hoe|ve|als|in|in|is|is niet|het|het|het zelf|laat|mij|meer|meest|moet niet|mijn|mijzelf|nee|noch|niet|van|uit|aan|eens|alleen|of|ander|zou moeten|ons|onze|ons zelf|out|over|eigen|zelfde|zal niet|zij|zou moeten|zou niet moeten|zo|iets|dergelijke|dan|dat|de|hun|hun|zij|zij zelf|dan|daar|deze|zij|onderwerp|dit|die|door|om|ook|onder|tot|omhoog|zeer|was|was niet|wij|waren|waren niet|wat|wanneer|waar|welke|terwijl|wie|van wie|waarom|met|gewonnen|zou|zou niet|jij|jouw|jouw|jij zelf|jullie zelf', NULL), +(54, 2, 'een|over|boven|na|weer|tegen|alles|ben|een|en|elke|zijn|zijn niet|als|op|zijn|omdat|geweest|voor|zijn|onder|tussen|beide|maar|door|kan|kan niet|kon|kon niet|deed|deed niet|doet|doet|doet niet|doen|doet niet|neer|tijdens|elk|weinig|voor|van|verder|had|had niet|heeft|heeft niet|hebben|hebben niet|hebben|hij|ll|haar|hier|haar|haarzelf|hem|hemzelf|zijn|hoe|ve|als|in|in|is|is niet|het|het|het zelf|laat|mij|meer|meest|moet niet|mijn|mijzelf|nee|noch|niet|van|uit|aan|eens|alleen|of|ander|zou moeten|ons|onze|ons zelf|out|over|eigen|zelfde|zal niet|zij|zou moeten|zou niet moeten|zo|iets|dergelijke|dan|dat|de|hun|hun|zij|zij zelf|dan|daar|deze|zij|onderwerp|dit|die|door|om|ook|onder|tot|omhoog|zeer|was|was niet|wij|waren|waren niet|wat|wanneer|waar|welke|terwijl|wie|van wie|waarom|met|gewonnen|zou|zou niet|jij|jouw|jouw|jij zelf|jullie zelf', NULL), +(54, 3, 'aber|als|auch|auf|aus|bei|bin|bis|bist|dadurch|daher|darum|das|daß|dass|dein|deine|dem|den|der|des|dessen|deshalb|die|dies|dieser|dieses|doch|dort|durch|ein|eine|einem|einen|einer|eines|euer|eure|für|hatte|hatten|hattest|hattet|hier|hinter|ich|ihr|ihre|im|in|ist|ja|jede|jedem|jeden|jeder|jedes|jener|jenes|jetzt|kann|kannst|können|könnt|machen|mein|meine|muß|mußt|musst|müssen|müßt|nach|nachdem|nein|nicht|oder|seid|sein|seine|sich|sind|soll|sollen|sollst|sollt|sonst|soweit|sowie|und|unser|unsere|unter|vom|von|vor|wann|warum|was|weiter|weitere|wenn|wer|werde|werden|werdet|weshalb|wie|wieder|wieso|wir|wird|wirst|woher|wohin|zum|zur|über', NULL), (79, 1, 'Dear Customer,\r\n\r\nRegards,\r\nCustomer service', NULL), (79, 2, 'Dear Customer,\r\n\r\nRegards,\r\nCustomer service', NULL), (79, 3, 'Dear Customer,\r\n\r\nRegards,\r\nCustomer service', NULL), @@ -3642,44 +3346,44 @@ INSERT INTO `ps_configuration_lang` (`id_configuration`, `id_lang`, `value`, `da (285, 2, '', NULL), (285, 3, '', NULL), (286, 1, 'Out-of-Stock', NULL), -(286, 2, 'Nicht auf Lager', NULL), -(286, 3, 'Niet op voorraad', NULL), -(305, 1, 'My wishlists', '2023-05-02 12:17:00'), -(305, 2, 'My wishlists', '2023-05-02 12:17:00'), -(305, 3, 'My wishlists', '2023-05-02 12:17:00'), -(306, 1, 'My wishlist', '2023-05-02 12:17:00'), -(306, 2, 'My wishlist', '2023-05-02 12:17:00'), -(306, 3, 'My wishlist', '2023-05-02 12:17:00'), -(307, 1, 'Create new list', '2023-05-02 12:17:00'), -(307, 2, 'Create new list', '2023-05-02 12:17:00'), -(307, 3, 'Create new list', '2023-05-02 12:17:00'), -(309, 1, 'I agree to the terms and conditions and the privacy policy', '2023-05-02 12:17:00'), -(309, 2, 'I agree to the terms and conditions and the privacy policy', '2023-05-02 12:17:00'), -(309, 3, 'I agree to the terms and conditions and the privacy policy', '2023-05-02 12:17:00'), -(311, 1, 'I agree to the terms and conditions and the privacy policy', '2023-05-02 12:17:00'), -(311, 2, 'I agree to the terms and conditions and the privacy policy', '2023-05-02 12:17:00'), -(311, 3, 'I agree to the terms and conditions and the privacy policy', '2023-05-02 12:17:00'), -(319, 1, 'sale70.png', '2023-05-02 12:17:01'), -(319, 2, 'sale70.png', '2023-05-08 16:58:29'), -(319, 3, 'sale70.png', '2023-05-15 10:30:56'), -(320, 1, '', '2023-05-02 12:17:01'), -(320, 2, '', '2023-05-08 16:58:29'), -(320, 3, '', '2023-05-15 10:30:56'), -(321, 1, '', '2023-05-02 12:17:01'), -(321, 2, '', '2023-05-08 16:58:29'), -(321, 3, '', '2023-05-15 10:30:56'), -(325, 1, 'You may unsubscribe at any moment. For that purpose, please find our contact info in the legal notice.', '2023-05-02 12:17:02'), -(325, 2, 'Sie können Ihr Einverständnis jederzeit widerrufen. Unsere Kontaktinformationen finden Sie u. a. in der Datenschutzerklärung.', '2023-05-02 12:17:02'), -(325, 3, 'U kunt op elk gewenst moment weer uitschrijven. Hiervoor kunt u de contactgegevens gebruiken uit de algemene voorwaarden.', '2023-05-02 12:17:02'), -(360, 1, 'The personal data you provide is used to answer queries, process orders or allow access to specific information. You have the right to modify and delete all the personal information found in the \"My Account\" page.', '2023-05-02 12:18:36'), -(360, 2, 'The personal data you provide is used to answer queries, process orders or allow access to specific information. You have the right to modify and delete all the personal information found in the \"My Account\" page.', '2023-05-02 12:18:36'), -(360, 3, 'The personal data you provide is used to answer queries, process orders or allow access to specific information. You have the right to modify and delete all the personal information found in the \"My Account\" page.', '2023-05-02 12:18:36'); +(286, 2, 'Niet op voorraad', NULL), +(286, 3, 'Nicht auf Lager', NULL), +(305, 1, 'My wishlists', '2023-08-28 13:26:21'), +(305, 2, 'My wishlists', '2023-08-28 13:26:21'), +(305, 3, 'My wishlists', '2023-08-28 13:26:21'), +(306, 1, 'My wishlist', '2023-08-28 13:26:21'), +(306, 2, 'My wishlist', '2023-08-28 13:26:21'), +(306, 3, 'My wishlist', '2023-08-28 13:26:21'), +(307, 1, 'Create new list', '2023-08-28 13:26:21'), +(307, 2, 'Create new list', '2023-08-28 13:26:21'), +(307, 3, 'Create new list', '2023-08-28 13:26:21'), +(309, 1, 'I agree to the terms and conditions and the privacy policy', '2023-08-28 13:26:22'), +(309, 2, 'I agree to the terms and conditions and the privacy policy', '2023-08-28 13:26:22'), +(309, 3, 'I agree to the terms and conditions and the privacy policy', '2023-08-28 13:26:22'), +(311, 1, 'I agree to the terms and conditions and the privacy policy', '2023-08-28 13:26:22'), +(311, 2, 'I agree to the terms and conditions and the privacy policy', '2023-08-28 13:26:22'), +(311, 3, 'I agree to the terms and conditions and the privacy policy', '2023-08-28 13:26:22'), +(319, 1, 'sale70.png', '2023-08-28 13:26:23'), +(319, 2, 'sale70.png', '2023-08-28 13:46:56'), +(319, 3, 'sale70.png', '2023-08-28 13:47:44'), +(320, 1, '', '2023-08-28 13:26:23'), +(320, 2, '', '2023-08-28 13:46:56'), +(320, 3, '', '2023-08-28 13:47:44'), +(321, 1, '', '2023-08-28 13:26:23'), +(321, 2, '', '2023-08-28 13:46:56'), +(321, 3, '', '2023-08-28 13:47:44'), +(325, 1, 'You may unsubscribe at any moment. For that purpose, please find our contact info in the legal notice.', '2023-08-28 13:26:24'), +(325, 2, 'U kunt op elk gewenst moment weer uitschrijven. Hiervoor kunt u de contactgegevens gebruiken uit de algemene voorwaarden.', '2023-08-28 13:26:24'), +(325, 3, 'Sie können Ihr Einverständnis jederzeit widerrufen. Unsere Kontaktinformationen finden Sie u. a. in der Datenschutzerklärung.', '2023-08-28 13:26:24'), +(375, 1, 'The personal data you provide is used to answer queries, process orders or allow access to specific information. You have the right to modify and delete all the personal information found in the \"My Account\" page.', '2023-08-28 13:27:58'), +(375, 2, 'The personal data you provide is used to answer queries, process orders or allow access to specific information. You have the right to modify and delete all the personal information found in the \"My Account\" page.', '2023-08-28 13:27:58'), +(375, 3, 'The personal data you provide is used to answer queries, process orders or allow access to specific information. You have the right to modify and delete all the personal information found in the \"My Account\" page.', '2023-08-28 13:27:58'); DROP TABLE IF EXISTS `ps_connections`; CREATE TABLE `ps_connections` ( `id_connections` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop_group` int(10) unsigned NOT NULL DEFAULT '1', - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop_group` int(11) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_guest` int(10) unsigned NOT NULL, `id_page` int(10) unsigned NOT NULL, `ip_address` bigint(20) DEFAULT NULL, @@ -3689,58 +3393,11 @@ CREATE TABLE `ps_connections` ( KEY `id_guest` (`id_guest`), KEY `date_add` (`date_add`), KEY `id_page` (`id_page`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections` (`id_connections`, `id_shop_group`, `id_shop`, `id_guest`, `id_page`, `ip_address`, `date_add`, `http_referer`) VALUES -(1, 1, 1, 1, 1, 2130706433, '2023-05-02 12:18:39', 'https://www.prestashop.com'), -(2, 1, 1, 3, 1, 3232235521, '2023-05-02 12:19:12', ''), -(3, 1, 1, 4, 1, 1404794126, '2023-05-08 16:44:27', ''), -(4, 1, 2, 124, 1, 1404794126, '2023-05-08 17:09:17', ''), -(5, 1, 2, 124, 1, 1490595887, '2023-05-09 08:24:34', ''), -(6, 1, 2, 124, 2, 1490595887, '2023-05-15 09:53:49', ''), -(7, 1, 1, 642, 3, 1490595887, '2023-05-15 09:54:23', ''), -(8, 1, 1, 644, 3, 1490595887, '2023-05-15 09:54:31', ''), -(9, 1, 1, 647, 3, 1490595887, '2023-05-15 09:54:54', ''), -(10, 1, 1, 648, 3, 1490595887, '2023-05-15 09:55:04', ''), -(11, 1, 2, 124, 2, 1490595887, '2023-05-15 09:55:48', ''), -(12, 1, 1, 660, 1, 1490595887, '2023-05-15 09:56:57', ''), -(13, 1, 1, 682, 1, 1490595887, '2023-05-15 10:01:02', ''), -(14, 1, 1, 685, 3, 1490595887, '2023-05-15 10:01:20', ''), -(15, 1, 1, 686, 3, 1490595887, '2023-05-15 10:01:27', ''), -(16, 1, 1, 692, 1, 1490595887, '2023-05-15 10:02:26', ''), -(17, 1, 1, 695, 3, 1490595887, '2023-05-15 10:02:46', ''), -(18, 1, 1, 696, 3, 1490595887, '2023-05-15 10:02:51', ''), -(19, 1, 2, 124, 4, 1490595887, '2023-05-15 10:09:16', ''), -(20, 1, 1, 751, 3, 1490595887, '2023-05-15 10:12:52', ''), -(21, 1, 1, 752, 1, 1490595887, '2023-05-15 10:12:52', ''), -(22, 1, 2, 124, 2, 1490595887, '2023-05-15 10:22:02', ''), -(23, 1, 1, 780, 3, 1490595887, '2023-05-15 10:22:38', ''), -(24, 1, 1, 782, 3, 1490595887, '2023-05-15 10:22:47', ''), -(25, 1, 1, 785, 3, 1490595887, '2023-05-15 10:23:12', ''), -(26, 1, 1, 787, 3, 1490595887, '2023-05-15 10:23:21', ''), -(27, 1, 2, 124, 2, 1490595887, '2023-05-15 10:23:45', ''), -(28, 1, 1, 799, 1, 1490595887, '2023-05-15 10:25:20', ''), -(29, 1, 1, 802, 3, 1490595887, '2023-05-15 10:25:47', ''), -(30, 1, 1, 804, 3, 1490595887, '2023-05-15 10:25:55', ''), -(31, 1, 1, 807, 1, 1490595887, '2023-05-15 10:26:20', ''), -(32, 1, 1, 810, 3, 1490595887, '2023-05-15 10:26:41', ''), -(33, 1, 1, 811, 3, 1490595887, '2023-05-15 10:26:44', ''), -(34, 1, 1, 814, 1, 1490595887, '2023-05-15 10:27:08', ''), -(35, 1, 1, 817, 3, 1490595887, '2023-05-15 10:27:28', ''), -(36, 1, 1, 818, 3, 1490595887, '2023-05-15 10:27:28', ''), -(37, 1, 1, 821, 1, 1490595887, '2023-05-15 10:27:54', ''), -(38, 1, 1, 823, 3, 1490595887, '2023-05-15 10:28:14', ''), -(39, 1, 1, 825, 3, 1490595887, '2023-05-15 10:28:19', ''), -(40, 1, 1, 829, 1, 1490595887, '2023-05-15 10:28:59', ''), -(41, 1, 1, 833, 1, 1490595887, '2023-05-15 10:29:31', ''), -(42, 1, 1, 836, 3, 1490595887, '2023-05-15 10:29:55', ''), -(43, 1, 1, 837, 3, 1490595887, '2023-05-15 10:29:56', ''), -(44, 1, 2, 124, 1, 1490595887, '2023-05-15 10:31:31', ''), -(45, 1, 1, 913, 2, 1404794126, '2023-08-28 10:56:51', ''), -(46, 1, 1, 916, 1, 1404794126, '2023-08-28 10:57:11', ''), -(47, 1, 1, 1165, 2, 1404794126, '2023-08-28 11:49:44', ''), -(48, 1, 1, 1169, 2, 1404794126, '2023-08-28 11:50:24', ''), -(49, 1, 1, 1173, 2, 1404794126, '2023-08-28 11:50:58', ''); +(1, 1, 1, 1, 1, 2130706433, '2023-08-28 13:28:04', 'https://www.prestashop.com'), +(2, 1, 1, 3, 1, 2886860801, '2023-08-28 13:41:41', ''); DROP TABLE IF EXISTS `ps_connections_page`; CREATE TABLE `ps_connections_page` ( @@ -3749,7 +3406,7 @@ CREATE TABLE `ps_connections_page` ( `time_start` datetime NOT NULL, `time_end` datetime DEFAULT NULL, PRIMARY KEY (`id_connections`,`id_page`,`time_start`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_connections_source`; @@ -3765,60 +3422,49 @@ CREATE TABLE `ps_connections_source` ( KEY `orderby` (`date_add`), KEY `http_referer` (`http_referer`), KEY `request_uri` (`request_uri`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-05-02 12:19:12'), -(2, 3, '', 'demoshop8debug.ngrok.io/', '', '2023-05-08 16:44:27'), -(3, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(4, 3, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-08 16:44:33'), -(5, 4, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-08 17:09:17'), -(6, 5, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-09 08:24:34'), -(7, 6, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:53:49'), -(8, 11, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 09:55:48'), -(9, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:56:37'), -(11, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:00'), -(12, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:21'), -(13, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:58:42'), -(14, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 09:59:07'), -(15, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:43'), -(16, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:00:50'), -(18, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:04'), -(19, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:02:16'), -(21, 11, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=15&id_module=68&id_order=9&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:02:43'), -(22, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:08'), -(23, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:29'), -(24, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:03:51'), -(25, 11, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:04:13'), -(26, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:16'), -(27, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:23'), -(28, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:27'), -(29, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:33'), -(30, 19, '', 'demoshop8debug.ngrok.io/shop2/de/warenkorb?action=show', '', '2023-05-15 10:09:34'), -(31, 19, '', 'demoshop8debug.ngrok.io/shop2/de/', '', '2023-05-15 10:10:26'), -(33, 20, '', 'demoshop8debug.ngrok.io/robots.txt', '', '2023-05-15 10:12:52'), -(34, 21, '', 'demoshop8debug.ngrok.io/en/', '', '2023-05-15 10:12:52'), -(35, 22, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:22:02'), -(36, 27, 'https://demoshop8debug.ngrok.io/SHOP2/index.php?controller=my-account', 'demoshop8debug.ngrok.io/shop2/en/login?back=my-account', '', '2023-05-15 10:23:45'), -(37, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:25:02'), -(39, 27, 'https://demoshop8debug.ngrok.io/__/', 'demoshop8debug.ngrok.io/shop2/de/bestellbestatigung?id_cart=21&id_module=68&id_order=11&key=0c46e3398a8f3f024dc6569fc56ed4eb', '', '2023-05-15 10:25:42'), -(40, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:08'), -(42, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:26:56'), -(44, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:27:42'), -(46, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:28:46'), -(48, 27, 'https://demoshop8debug.ngrok.io/SHOP2/en/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/en/order-history', '', '2023-05-15 10:29:20'), -(49, 27, 'https://demoshop8debug.ngrok.io/SHOP2/de/index.php?controller=history', 'demoshop8debug.ngrok.io/shop2/de/bestellungsverlauf', '', '2023-05-15 10:30:10'), -(50, 44, '', 'demoshop8debug.ngrok.io/shop2/en/', '', '2023-05-15 10:31:31'), -(51, 46, '', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 10:57:11'); +(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-08-28 13:41:41'), +(2, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), +(3, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), +(4, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), +(5, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), +(6, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), +(7, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), +(8, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), +(9, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), +(10, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), +(11, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:03'), +(12, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), +(13, 2, 'http://demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8debug.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), +(14, 2, 'http://demoshop8debug.ngrok.io/en/registration', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:30'), +(15, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), +(16, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:48:44'), +(17, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), +(18, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:49:11'), +(19, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), +(20, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:50:35'), +(21, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), +(22, 2, 'http://demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8debug.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), +(23, 2, 'http://demoshop8debug.ngrok.io/en/cart?action=show', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:50'), +(24, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:52'), +(25, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:55'), +(26, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), +(27, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), +(28, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:51:14'), +(29, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), +(30, 2, 'http://demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), +(31, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( `id_contact` int(10) unsigned NOT NULL AUTO_INCREMENT, `email` varchar(255) NOT NULL, `customer_service` tinyint(1) NOT NULL DEFAULT '0', - `position` tinyint(3) unsigned NOT NULL DEFAULT '0', + `position` tinyint(2) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_contact`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_contact` (`id_contact`, `email`, `customer_service`, `position`) VALUES (1, 'demo@prestashop.com', 1, 0), @@ -3831,29 +3477,27 @@ CREATE TABLE `ps_contact_lang` ( `name` varchar(255) NOT NULL, `description` text, PRIMARY KEY (`id_contact`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_contact_lang` (`id_contact`, `id_lang`, `name`, `description`) VALUES (1, 1, 'Webmaster', 'If a technical problem occurs on this website'), -(1, 2, 'Webmaster', 'Falls ein technisches Problem auf der Webseite auftritt'), -(1, 3, 'Webmaster', 'Als er zich een technisch probleem voordoet op deze website'), +(1, 2, 'Webmaster', 'Als er zich een technisch probleem voordoet op deze website'), +(1, 3, 'Webmaster', 'Falls ein technisches Problem auf der Webseite auftritt'), (2, 1, 'Customer service', 'For any question about a product, an order'), -(2, 2, 'Kundenservice', 'Bei Fragen zu einem Artikel oder einer Bestellung'), -(2, 3, 'Klantenservice', 'Voor vragen over een product, een bestelling'); +(2, 2, 'Klantenservice', 'Voor vragen over een product, een bestelling'), +(2, 3, 'Kundenservice', 'Bei Fragen zu einem Artikel oder einer Bestellung'); DROP TABLE IF EXISTS `ps_contact_shop`; CREATE TABLE `ps_contact_shop` ( - `id_contact` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_contact` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_contact`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_contact_shop` (`id_contact`, `id_shop`) VALUES (1, 1), -(2, 1), -(1, 2), -(2, 2); +(2, 1); DROP TABLE IF EXISTS `ps_country`; CREATE TABLE `ps_country` ( @@ -3861,8 +3505,8 @@ CREATE TABLE `ps_country` ( `id_zone` int(10) unsigned NOT NULL, `id_currency` int(10) unsigned NOT NULL DEFAULT '0', `iso_code` varchar(3) NOT NULL, - `call_prefix` int(11) NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `call_prefix` int(10) NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `contains_states` tinyint(1) NOT NULL DEFAULT '0', `need_identification_number` tinyint(1) NOT NULL DEFAULT '0', `need_zip_code` tinyint(1) NOT NULL DEFAULT '1', @@ -3871,7 +3515,7 @@ CREATE TABLE `ps_country` ( PRIMARY KEY (`id_country`), KEY `country_iso_code` (`iso_code`), KEY `country_` (`id_zone`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_country` (`id_country`, `id_zone`, `id_currency`, `iso_code`, `call_prefix`, `active`, `contains_states`, `need_identification_number`, `need_zip_code`, `zip_code_format`, `display_tax_label`) VALUES (1, 1, 0, 'DE', 49, 1, 0, 0, 1, 'NNNNN', 1), @@ -4122,39 +3766,39 @@ CREATE TABLE `ps_country_lang` ( `id_lang` int(10) unsigned NOT NULL, `name` varchar(64) NOT NULL, PRIMARY KEY (`id_country`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (1, 1, 'Germany'), -(1, 2, 'Deutschland'), -(1, 3, 'Duitsland'), +(1, 2, 'Duitsland'), +(1, 3, 'Deutschland'), (2, 1, 'Austria'), -(2, 2, 'Österreich'), -(2, 3, 'Oostenrijk'), +(2, 2, 'Oostenrijk'), +(2, 3, 'Österreich'), (3, 1, 'Belgium'), -(3, 2, 'Belgien'), -(3, 3, 'België'), +(3, 2, 'België'), +(3, 3, 'Belgien'), (4, 1, 'Canada'), -(4, 2, 'Kanada'), -(4, 3, 'Canada'), +(4, 2, 'Canada'), +(4, 3, 'Kanada'), (5, 1, 'China'), (5, 2, 'China'), (5, 3, 'China'), (6, 1, 'Spain'), -(6, 2, 'Spanien'), -(6, 3, 'Spanje'), +(6, 2, 'Spanje'), +(6, 3, 'Spanien'), (7, 1, 'Finland'), -(7, 2, 'Finnland'), -(7, 3, 'Finland'), +(7, 2, 'Finland'), +(7, 3, 'Finnland'), (8, 1, 'France'), -(8, 2, 'Frankreich'), -(8, 3, 'Frankrijk'), +(8, 2, 'Frankrijk'), +(8, 3, 'Frankreich'), (9, 1, 'Greece'), -(9, 2, 'Griechenland'), -(9, 3, 'Griekenland'), +(9, 2, 'Griekenland'), +(9, 3, 'Griechenland'), (10, 1, 'Italy'), -(10, 2, 'Italien'), -(10, 3, 'Italië'), +(10, 2, 'Italië'), +(10, 3, 'Italien'), (11, 1, 'Japan'), (11, 2, 'Japan'), (11, 3, 'Japan'), @@ -4162,8 +3806,8 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (12, 2, 'Luxemburg'), (12, 3, 'Luxemburg'), (13, 1, 'Netherlands'), -(13, 2, 'Niederlande'), -(13, 3, 'Nederland'), +(13, 2, 'Nederland'), +(13, 3, 'Niederlande'), (14, 1, 'Poland'), (14, 2, 'Polen'), (14, 3, 'Polen'), @@ -4171,77 +3815,77 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (15, 2, 'Portugal'), (15, 3, 'Portugal'), (16, 1, 'Czechia'), -(16, 2, 'Tschechien'), -(16, 3, 'Tsjechië'), +(16, 2, 'Tsjechië'), +(16, 3, 'Tschechien'), (17, 1, 'United Kingdom'), -(17, 2, 'Vereinigtes Königreich'), -(17, 3, 'Verenigd Koninkrijk'), +(17, 2, 'Verenigd Koninkrijk'), +(17, 3, 'Vereinigtes Königreich'), (18, 1, 'Sweden'), -(18, 2, 'Schweden'), -(18, 3, 'Zweden'), +(18, 2, 'Zweden'), +(18, 3, 'Schweden'), (19, 1, 'Switzerland'), -(19, 2, 'Schweiz'), -(19, 3, 'Zwitserland'), +(19, 2, 'Zwitserland'), +(19, 3, 'Schweiz'), (20, 1, 'Denmark'), -(20, 2, 'Dänemark'), -(20, 3, 'Denemarken'), +(20, 2, 'Denemarken'), +(20, 3, 'Dänemark'), (21, 1, 'United States'), -(21, 2, 'Vereinigte Staaten'), -(21, 3, 'Verenigde Staten'), +(21, 2, 'Verenigde Staten'), +(21, 3, 'Vereinigte Staaten'), (22, 1, 'Hong Kong SAR China'), -(22, 2, 'Sonderverwaltungsregion Hongkong'), -(22, 3, 'Hongkong SAR van China'), +(22, 2, 'Hongkong SAR van China'), +(22, 3, 'Sonderverwaltungsregion Hongkong'), (23, 1, 'Norway'), -(23, 2, 'Norwegen'), -(23, 3, 'Noorwegen'), +(23, 2, 'Noorwegen'), +(23, 3, 'Norwegen'), (24, 1, 'Australia'), -(24, 2, 'Australien'), -(24, 3, 'Australië'), +(24, 2, 'Australië'), +(24, 3, 'Australien'), (25, 1, 'Singapore'), -(25, 2, 'Singapur'), -(25, 3, 'Singapore'), +(25, 2, 'Singapore'), +(25, 3, 'Singapur'), (26, 1, 'Ireland'), -(26, 2, 'Irland'), -(26, 3, 'Ierland'), +(26, 2, 'Ierland'), +(26, 3, 'Irland'), (27, 1, 'New Zealand'), -(27, 2, 'Neuseeland'), -(27, 3, 'Nieuw-Zeeland'), +(27, 2, 'Nieuw-Zeeland'), +(27, 3, 'Neuseeland'), (28, 1, 'South Korea'), -(28, 2, 'Südkorea'), -(28, 3, 'Zuid-Korea'), +(28, 2, 'Zuid-Korea'), +(28, 3, 'Südkorea'), (29, 1, 'Israel'), -(29, 2, 'Israel'), -(29, 3, 'Israël'), +(29, 2, 'Israël'), +(29, 3, 'Israel'), (30, 1, 'South Africa'), -(30, 2, 'Südafrika'), -(30, 3, 'Zuid-Afrika'), +(30, 2, 'Zuid-Afrika'), +(30, 3, 'Südafrika'), (31, 1, 'Nigeria'), (31, 2, 'Nigeria'), (31, 3, 'Nigeria'), (32, 1, 'Côte d’Ivoire'), -(32, 2, 'Côte d’Ivoire'), -(32, 3, 'Ivoorkust'), +(32, 2, 'Ivoorkust'), +(32, 3, 'Côte d’Ivoire'), (33, 1, 'Togo'), (33, 2, 'Togo'), (33, 3, 'Togo'), (34, 1, 'Bolivia'), -(34, 2, 'Bolivien'), -(34, 3, 'Bolivia'), +(34, 2, 'Bolivia'), +(34, 3, 'Bolivien'), (35, 1, 'Mauritius'), (35, 2, 'Mauritius'), (35, 3, 'Mauritius'), (36, 1, 'Romania'), -(36, 2, 'Rumänien'), -(36, 3, 'Roemenië'), +(36, 2, 'Roemenië'), +(36, 3, 'Rumänien'), (37, 1, 'Slovakia'), -(37, 2, 'Slowakei'), -(37, 3, 'Slowakije'), +(37, 2, 'Slowakije'), +(37, 3, 'Slowakei'), (38, 1, 'Algeria'), -(38, 2, 'Algerien'), -(38, 3, 'Algerije'), +(38, 2, 'Algerije'), +(38, 3, 'Algerien'), (39, 1, 'American Samoa'), -(39, 2, 'Amerikanisch-Samoa'), -(39, 3, 'Amerikaans-Samoa'), +(39, 2, 'Amerikaans-Samoa'), +(39, 3, 'Amerikanisch-Samoa'), (40, 1, 'Andorra'), (40, 2, 'Andorra'), (40, 3, 'Andorra'), @@ -4252,29 +3896,29 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (42, 2, 'Anguilla'), (42, 3, 'Anguilla'), (43, 1, 'Antigua & Barbuda'), -(43, 2, 'Antigua und Barbuda'), -(43, 3, 'Antigua en Barbuda'), +(43, 2, 'Antigua en Barbuda'), +(43, 3, 'Antigua und Barbuda'), (44, 1, 'Argentina'), -(44, 2, 'Argentinien'), -(44, 3, 'Argentinië'), +(44, 2, 'Argentinië'), +(44, 3, 'Argentinien'), (45, 1, 'Armenia'), -(45, 2, 'Armenien'), -(45, 3, 'Armenië'), +(45, 2, 'Armenië'), +(45, 3, 'Armenien'), (46, 1, 'Aruba'), (46, 2, 'Aruba'), (46, 3, 'Aruba'), (47, 1, 'Azerbaijan'), -(47, 2, 'Aserbaidschan'), -(47, 3, 'Azerbeidzjan'), +(47, 2, 'Azerbeidzjan'), +(47, 3, 'Aserbaidschan'), (48, 1, 'Bahamas'), -(48, 2, 'Bahamas'), -(48, 3, 'Bahama’s'), +(48, 2, 'Bahama’s'), +(48, 3, 'Bahamas'), (49, 1, 'Bahrain'), -(49, 2, 'Bahrain'), -(49, 3, 'Bahrein'), +(49, 2, 'Bahrein'), +(49, 3, 'Bahrain'), (50, 1, 'Bangladesh'), -(50, 2, 'Bangladesch'), -(50, 3, 'Bangladesh'), +(50, 2, 'Bangladesh'), +(50, 3, 'Bangladesch'), (51, 1, 'Barbados'), (51, 2, 'Barbados'), (51, 3, 'Barbados'), @@ -4294,89 +3938,89 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (56, 2, 'Bhutan'), (56, 3, 'Bhutan'), (57, 1, 'Botswana'), -(57, 2, 'Botsuana'), -(57, 3, 'Botswana'), +(57, 2, 'Botswana'), +(57, 3, 'Botsuana'), (58, 1, 'Brazil'), -(58, 2, 'Brasilien'), -(58, 3, 'Brazilië'), +(58, 2, 'Brazilië'), +(58, 3, 'Brasilien'), (59, 1, 'Brunei'), -(59, 2, 'Brunei Darussalam'), -(59, 3, 'Brunei'), +(59, 2, 'Brunei'), +(59, 3, 'Brunei Darussalam'), (60, 1, 'Burkina Faso'), (60, 2, 'Burkina Faso'), (60, 3, 'Burkina Faso'), (61, 1, 'Myanmar (Burma)'), -(61, 2, 'Myanmar'), -(61, 3, 'Myanmar (Birma)'), +(61, 2, 'Myanmar (Birma)'), +(61, 3, 'Myanmar'), (62, 1, 'Burundi'), (62, 2, 'Burundi'), (62, 3, 'Burundi'), (63, 1, 'Cambodia'), -(63, 2, 'Kambodscha'), -(63, 3, 'Cambodja'), +(63, 2, 'Cambodja'), +(63, 3, 'Kambodscha'), (64, 1, 'Cameroon'), -(64, 2, 'Kamerun'), -(64, 3, 'Kameroen'), +(64, 2, 'Kameroen'), +(64, 3, 'Kamerun'), (65, 1, 'Cape Verde'), -(65, 2, 'Cabo Verde'), -(65, 3, 'Kaapverdië'), +(65, 2, 'Kaapverdië'), +(65, 3, 'Cabo Verde'), (66, 1, 'Central African Republic'), -(66, 2, 'Zentralafrikanische Republik'), -(66, 3, 'Centraal-Afrikaanse Republiek'), +(66, 2, 'Centraal-Afrikaanse Republiek'), +(66, 3, 'Zentralafrikanische Republik'), (67, 1, 'Chad'), -(67, 2, 'Tschad'), -(67, 3, 'Tsjaad'), +(67, 2, 'Tsjaad'), +(67, 3, 'Tschad'), (68, 1, 'Chile'), -(68, 2, 'Chile'), -(68, 3, 'Chili'), +(68, 2, 'Chili'), +(68, 3, 'Chile'), (69, 1, 'Colombia'), -(69, 2, 'Kolumbien'), -(69, 3, 'Colombia'), +(69, 2, 'Colombia'), +(69, 3, 'Kolumbien'), (70, 1, 'Comoros'), -(70, 2, 'Komoren'), -(70, 3, 'Comoren'), +(70, 2, 'Comoren'), +(70, 3, 'Komoren'), (71, 1, 'Congo - Kinshasa'), -(71, 2, 'Kongo-Kinshasa'), -(71, 3, 'Congo-Kinshasa'), +(71, 2, 'Congo-Kinshasa'), +(71, 3, 'Kongo-Kinshasa'), (72, 1, 'Congo - Brazzaville'), -(72, 2, 'Kongo-Brazzaville'), -(72, 3, 'Congo-Brazzaville'), +(72, 2, 'Congo-Brazzaville'), +(72, 3, 'Kongo-Brazzaville'), (73, 1, 'Costa Rica'), (73, 2, 'Costa Rica'), (73, 3, 'Costa Rica'), (74, 1, 'Croatia'), -(74, 2, 'Kroatien'), -(74, 3, 'Kroatië'), +(74, 2, 'Kroatië'), +(74, 3, 'Kroatien'), (75, 1, 'Cuba'), -(75, 2, 'Kuba'), -(75, 3, 'Cuba'), +(75, 2, 'Cuba'), +(75, 3, 'Kuba'), (76, 1, 'Cyprus'), -(76, 2, 'Zypern'), -(76, 3, 'Cyprus'), +(76, 2, 'Cyprus'), +(76, 3, 'Zypern'), (77, 1, 'Djibouti'), -(77, 2, 'Dschibuti'), -(77, 3, 'Djibouti'), +(77, 2, 'Djibouti'), +(77, 3, 'Dschibuti'), (78, 1, 'Dominica'), (78, 2, 'Dominica'), (78, 3, 'Dominica'), (79, 1, 'Dominican Republic'), -(79, 2, 'Dominikanische Republik'), -(79, 3, 'Dominicaanse Republiek'), +(79, 2, 'Dominicaanse Republiek'), +(79, 3, 'Dominikanische Republik'), (80, 1, 'Timor-Leste'), -(80, 2, 'Timor-Leste'), -(80, 3, 'Oost-Timor'), +(80, 2, 'Oost-Timor'), +(80, 3, 'Timor-Leste'), (81, 1, 'Ecuador'), (81, 2, 'Ecuador'), (81, 3, 'Ecuador'), (82, 1, 'Egypt'), -(82, 2, 'Ägypten'), -(82, 3, 'Egypte'), +(82, 2, 'Egypte'), +(82, 3, 'Ägypten'), (83, 1, 'El Salvador'), (83, 2, 'El Salvador'), (83, 3, 'El Salvador'), (84, 1, 'Equatorial Guinea'), -(84, 2, 'Äquatorialguinea'), -(84, 3, 'Equatoriaal-Guinea'), +(84, 2, 'Equatoriaal-Guinea'), +(84, 3, 'Äquatorialguinea'), (85, 1, 'Eritrea'), (85, 2, 'Eritrea'), (85, 3, 'Eritrea'), @@ -4384,26 +4028,26 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (86, 2, 'Estland'), (86, 3, 'Estland'), (87, 1, 'Ethiopia'), -(87, 2, 'Äthiopien'), -(87, 3, 'Ethiopië'), +(87, 2, 'Ethiopië'), +(87, 3, 'Äthiopien'), (88, 1, 'Falkland Islands'), -(88, 2, 'Falklandinseln'), -(88, 3, 'Falklandeilanden'), +(88, 2, 'Falklandeilanden'), +(88, 3, 'Falklandinseln'), (89, 1, 'Faroe Islands'), -(89, 2, 'Färöer'), -(89, 3, 'Faeröer'), +(89, 2, 'Faeröer'), +(89, 3, 'Färöer'), (90, 1, 'Fiji'), -(90, 2, 'Fidschi'), -(90, 3, 'Fiji'), +(90, 2, 'Fiji'), +(90, 3, 'Fidschi'), (91, 1, 'Gabon'), -(91, 2, 'Gabun'), -(91, 3, 'Gabon'), +(91, 2, 'Gabon'), +(91, 3, 'Gabun'), (92, 1, 'Gambia'), (92, 2, 'Gambia'), (92, 3, 'Gambia'), (93, 1, 'Georgia'), -(93, 2, 'Georgien'), -(93, 3, 'Georgië'), +(93, 2, 'Georgië'), +(93, 3, 'Georgien'), (94, 1, 'Ghana'), (94, 2, 'Ghana'), (94, 3, 'Ghana'), @@ -4411,8 +4055,8 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (95, 2, 'Grenada'), (95, 3, 'Grenada'), (96, 1, 'Greenland'), -(96, 2, 'Grönland'), -(96, 3, 'Groenland'), +(96, 2, 'Groenland'), +(96, 3, 'Grönland'), (97, 1, 'Gibraltar'), (97, 2, 'Gibraltar'), (97, 3, 'Gibraltar'), @@ -4429,32 +4073,32 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (101, 2, 'Guernsey'), (101, 3, 'Guernsey'), (102, 1, 'Guinea'), -(102, 2, 'Guinea'), -(102, 3, 'Guinee'), +(102, 2, 'Guinee'), +(102, 3, 'Guinea'), (103, 1, 'Guinea-Bissau'), -(103, 2, 'Guinea-Bissau'), -(103, 3, 'Guinee-Bissau'), +(103, 2, 'Guinee-Bissau'), +(103, 3, 'Guinea-Bissau'), (104, 1, 'Guyana'), (104, 2, 'Guyana'), (104, 3, 'Guyana'), (105, 1, 'Haiti'), -(105, 2, 'Haiti'), -(105, 3, 'Haïti'), +(105, 2, 'Haïti'), +(105, 3, 'Haiti'), (106, 1, 'Vatican City'), -(106, 2, 'Vatikanstadt'), -(106, 3, 'Vaticaanstad'), +(106, 2, 'Vaticaanstad'), +(106, 3, 'Vatikanstadt'), (107, 1, 'Honduras'), (107, 2, 'Honduras'), (107, 3, 'Honduras'), (108, 1, 'Iceland'), -(108, 2, 'Island'), -(108, 3, 'IJsland'), +(108, 2, 'IJsland'), +(108, 3, 'Island'), (109, 1, 'India'), -(109, 2, 'Indien'), -(109, 3, 'India'), +(109, 2, 'India'), +(109, 3, 'Indien'), (110, 1, 'Indonesia'), -(110, 2, 'Indonesien'), -(110, 3, 'Indonesië'), +(110, 2, 'Indonesië'), +(110, 3, 'Indonesien'), (111, 1, 'Iran'), (111, 2, 'Iran'), (111, 3, 'Iran'), @@ -4465,17 +4109,17 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (113, 2, 'Isle of Man'), (113, 3, 'Isle of Man'), (114, 1, 'Jamaica'), -(114, 2, 'Jamaika'), -(114, 3, 'Jamaica'), +(114, 2, 'Jamaica'), +(114, 3, 'Jamaika'), (115, 1, 'Jersey'), (115, 2, 'Jersey'), (115, 3, 'Jersey'), (116, 1, 'Jordan'), -(116, 2, 'Jordanien'), -(116, 3, 'Jordanië'), +(116, 2, 'Jordanië'), +(116, 3, 'Jordanien'), (117, 1, 'Kazakhstan'), -(117, 2, 'Kasachstan'), -(117, 3, 'Kazachstan'), +(117, 2, 'Kazachstan'), +(117, 3, 'Kasachstan'), (118, 1, 'Kenya'), (118, 2, 'Kenia'), (118, 3, 'Kenia'), @@ -4483,20 +4127,20 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (119, 2, 'Kiribati'), (119, 3, 'Kiribati'), (120, 1, 'North Korea'), -(120, 2, 'Nordkorea'), -(120, 3, 'Noord-Korea'), +(120, 2, 'Noord-Korea'), +(120, 3, 'Nordkorea'), (121, 1, 'Kuwait'), -(121, 2, 'Kuwait'), -(121, 3, 'Koeweit'), +(121, 2, 'Koeweit'), +(121, 3, 'Kuwait'), (122, 1, 'Kyrgyzstan'), -(122, 2, 'Kirgisistan'), -(122, 3, 'Kirgizië'), +(122, 2, 'Kirgizië'), +(122, 3, 'Kirgisistan'), (123, 1, 'Laos'), (123, 2, 'Laos'), (123, 3, 'Laos'), (124, 1, 'Latvia'), -(124, 2, 'Lettland'), -(124, 3, 'Letland'), +(124, 2, 'Letland'), +(124, 3, 'Lettland'), (125, 1, 'Lebanon'), (125, 2, 'Libanon'), (125, 3, 'Libanon'), @@ -4507,20 +4151,20 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (127, 2, 'Liberia'), (127, 3, 'Liberia'), (128, 1, 'Libya'), -(128, 2, 'Libyen'), -(128, 3, 'Libië'), +(128, 2, 'Libië'), +(128, 3, 'Libyen'), (129, 1, 'Liechtenstein'), (129, 2, 'Liechtenstein'), (129, 3, 'Liechtenstein'), (130, 1, 'Lithuania'), -(130, 2, 'Litauen'), -(130, 3, 'Litouwen'), +(130, 2, 'Litouwen'), +(130, 3, 'Litauen'), (131, 1, 'Macao SAR China'), -(131, 2, 'Sonderverwaltungsregion Macau'), -(131, 3, 'Macau SAR van China'), +(131, 2, 'Macau SAR van China'), +(131, 3, 'Sonderverwaltungsregion Macau'), (132, 1, 'North Macedonia'), -(132, 2, 'Nordmazedonien'), -(132, 3, 'Noord-Macedonië'), +(132, 2, 'Noord-Macedonië'), +(132, 3, 'Nordmazedonien'), (133, 1, 'Madagascar'), (133, 2, 'Madagaskar'), (133, 3, 'Madagaskar'), @@ -4528,11 +4172,11 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (134, 2, 'Malawi'), (134, 3, 'Malawi'), (135, 1, 'Malaysia'), -(135, 2, 'Malaysia'), -(135, 3, 'Maleisië'), +(135, 2, 'Maleisië'), +(135, 3, 'Malaysia'), (136, 1, 'Maldives'), -(136, 2, 'Malediven'), -(136, 3, 'Maldiven'), +(136, 2, 'Maldiven'), +(136, 3, 'Malediven'), (137, 1, 'Mali'), (137, 2, 'Mali'), (137, 3, 'Mali'), @@ -4540,35 +4184,35 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (138, 2, 'Malta'), (138, 3, 'Malta'), (139, 1, 'Marshall Islands'), -(139, 2, 'Marshallinseln'), -(139, 3, 'Marshalleilanden'), +(139, 2, 'Marshalleilanden'), +(139, 3, 'Marshallinseln'), (140, 1, 'Martinique'), (140, 2, 'Martinique'), (140, 3, 'Martinique'), (141, 1, 'Mauritania'), -(141, 2, 'Mauretanien'), -(141, 3, 'Mauritanië'), +(141, 2, 'Mauritanië'), +(141, 3, 'Mauretanien'), (142, 1, 'Hungary'), -(142, 2, 'Ungarn'), -(142, 3, 'Hongarije'), +(142, 2, 'Hongarije'), +(142, 3, 'Ungarn'), (143, 1, 'Mayotte'), (143, 2, 'Mayotte'), (143, 3, 'Mayotte'), (144, 1, 'Mexico'), -(144, 2, 'Mexiko'), -(144, 3, 'Mexico'), +(144, 2, 'Mexico'), +(144, 3, 'Mexiko'), (145, 1, 'Micronesia'), -(145, 2, 'Mikronesien'), -(145, 3, 'Micronesia'), +(145, 2, 'Micronesia'), +(145, 3, 'Mikronesien'), (146, 1, 'Moldova'), -(146, 2, 'Republik Moldau'), -(146, 3, 'Moldavië'), +(146, 2, 'Moldavië'), +(146, 3, 'Republik Moldau'), (147, 1, 'Monaco'), (147, 2, 'Monaco'), (147, 3, 'Monaco'), (148, 1, 'Mongolia'), -(148, 2, 'Mongolei'), -(148, 3, 'Mongolië'), +(148, 2, 'Mongolië'), +(148, 3, 'Mongolei'), (149, 1, 'Montenegro'), (149, 2, 'Montenegro'), (149, 3, 'Montenegro'), @@ -4579,11 +4223,11 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (151, 2, 'Marokko'), (151, 3, 'Marokko'), (152, 1, 'Mozambique'), -(152, 2, 'Mosambik'), -(152, 3, 'Mozambique'), +(152, 2, 'Mozambique'), +(152, 3, 'Mosambik'), (153, 1, 'Namibia'), -(153, 2, 'Namibia'), -(153, 3, 'Namibië'), +(153, 2, 'Namibië'), +(153, 3, 'Namibia'), (154, 1, 'Nauru'), (154, 2, 'Nauru'), (154, 3, 'Nauru'), @@ -4591,8 +4235,8 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (155, 2, 'Nepal'), (155, 3, 'Nepal'), (156, 1, 'New Caledonia'), -(156, 2, 'Neukaledonien'), -(156, 3, 'Nieuw-Caledonië'), +(156, 2, 'Nieuw-Caledonië'), +(156, 3, 'Neukaledonien'), (157, 1, 'Nicaragua'), (157, 2, 'Nicaragua'), (157, 3, 'Nicaragua'), @@ -4603,11 +4247,11 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (159, 2, 'Niue'), (159, 3, 'Niue'), (160, 1, 'Norfolk Island'), -(160, 2, 'Norfolkinsel'), -(160, 3, 'Norfolk'), +(160, 2, 'Norfolk'), +(160, 3, 'Norfolkinsel'), (161, 1, 'Northern Mariana Islands'), -(161, 2, 'Nördliche Marianen'), -(161, 3, 'Noordelijke Marianen'), +(161, 2, 'Noordelijke Marianen'), +(161, 3, 'Nördliche Marianen'), (162, 1, 'Oman'), (162, 2, 'Oman'), (162, 3, 'Oman'), @@ -4618,14 +4262,14 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (164, 2, 'Palau'), (164, 3, 'Palau'), (165, 1, 'Palestinian Territories'), -(165, 2, 'Palästinensische Autonomiegebiete'), -(165, 3, 'Palestijnse gebieden'), +(165, 2, 'Palestijnse gebieden'), +(165, 3, 'Palästinensische Autonomiegebiete'), (166, 1, 'Panama'), (166, 2, 'Panama'), (166, 3, 'Panama'), (167, 1, 'Papua New Guinea'), -(167, 2, 'Papua-Neuguinea'), -(167, 3, 'Papoea-Nieuw-Guinea'), +(167, 2, 'Papoea-Nieuw-Guinea'), +(167, 3, 'Papua-Neuguinea'), (168, 1, 'Paraguay'), (168, 2, 'Paraguay'), (168, 3, 'Paraguay'), @@ -4633,44 +4277,44 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (169, 2, 'Peru'), (169, 3, 'Peru'), (170, 1, 'Philippines'), -(170, 2, 'Philippinen'), -(170, 3, 'Filipijnen'), +(170, 2, 'Filipijnen'), +(170, 3, 'Philippinen'), (171, 1, 'Pitcairn Islands'), -(171, 2, 'Pitcairninseln'), -(171, 3, 'Pitcairneilanden'), +(171, 2, 'Pitcairneilanden'), +(171, 3, 'Pitcairninseln'), (172, 1, 'Puerto Rico'), (172, 2, 'Puerto Rico'), (172, 3, 'Puerto Rico'), (173, 1, 'Qatar'), -(173, 2, 'Katar'), -(173, 3, 'Qatar'), +(173, 2, 'Qatar'), +(173, 3, 'Katar'), (174, 1, 'Réunion'), (174, 2, 'Réunion'), (174, 3, 'Réunion'), (175, 1, 'Russia'), -(175, 2, 'Russland'), -(175, 3, 'Rusland'), +(175, 2, 'Rusland'), +(175, 3, 'Russland'), (176, 1, 'Rwanda'), -(176, 2, 'Ruanda'), -(176, 3, 'Rwanda'), +(176, 2, 'Rwanda'), +(176, 3, 'Ruanda'), (177, 1, 'St. Barthélemy'), -(177, 2, 'St. Barthélemy'), -(177, 3, 'Saint-Barthélemy'), +(177, 2, 'Saint-Barthélemy'), +(177, 3, 'St. Barthélemy'), (178, 1, 'St. Kitts & Nevis'), -(178, 2, 'St. Kitts und Nevis'), -(178, 3, 'Saint Kitts en Nevis'), +(178, 2, 'Saint Kitts en Nevis'), +(178, 3, 'St. Kitts und Nevis'), (179, 1, 'St. Lucia'), -(179, 2, 'St. Lucia'), -(179, 3, 'Saint Lucia'), +(179, 2, 'Saint Lucia'), +(179, 3, 'St. Lucia'), (180, 1, 'St. Martin'), -(180, 2, 'St. Martin'), -(180, 3, 'Saint-Martin'), +(180, 2, 'Saint-Martin'), +(180, 3, 'St. Martin'), (181, 1, 'St. Pierre & Miquelon'), -(181, 2, 'St. Pierre und Miquelon'), -(181, 3, 'Saint-Pierre en Miquelon'), +(181, 2, 'Saint-Pierre en Miquelon'), +(181, 3, 'St. Pierre und Miquelon'), (182, 1, 'St. Vincent & Grenadines'), -(182, 2, 'St. Vincent und die Grenadinen'), -(182, 3, 'Saint Vincent en de Grenadines'), +(182, 2, 'Saint Vincent en de Grenadines'), +(182, 3, 'St. Vincent und die Grenadinen'), (183, 1, 'Samoa'), (183, 2, 'Samoa'), (183, 3, 'Samoa'), @@ -4678,17 +4322,17 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (184, 2, 'San Marino'), (184, 3, 'San Marino'), (185, 1, 'São Tomé & Príncipe'), -(185, 2, 'São Tomé und Príncipe'), -(185, 3, 'Sao Tomé en Principe'), +(185, 2, 'Sao Tomé en Principe'), +(185, 3, 'São Tomé und Príncipe'), (186, 1, 'Saudi Arabia'), -(186, 2, 'Saudi-Arabien'), -(186, 3, 'Saoedi-Arabië'), +(186, 2, 'Saoedi-Arabië'), +(186, 3, 'Saudi-Arabien'), (187, 1, 'Senegal'), (187, 2, 'Senegal'), (187, 3, 'Senegal'), (188, 1, 'Serbia'), -(188, 2, 'Serbien'), -(188, 3, 'Servië'), +(188, 2, 'Servië'), +(188, 3, 'Serbien'), (189, 1, 'Seychelles'), (189, 2, 'Seychellen'), (189, 3, 'Seychellen'), @@ -4696,44 +4340,44 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (190, 2, 'Sierra Leone'), (190, 3, 'Sierra Leone'), (191, 1, 'Slovenia'), -(191, 2, 'Slowenien'), -(191, 3, 'Slovenië'), +(191, 2, 'Slovenië'), +(191, 3, 'Slowenien'), (192, 1, 'Solomon Islands'), -(192, 2, 'Salomonen'), -(192, 3, 'Salomonseilanden'), +(192, 2, 'Salomonseilanden'), +(192, 3, 'Salomonen'), (193, 1, 'Somalia'), -(193, 2, 'Somalia'), -(193, 3, 'Somalië'), +(193, 2, 'Somalië'), +(193, 3, 'Somalia'), (194, 1, 'South Georgia & South Sandwich Islands'), -(194, 2, 'Südgeorgien und die Südlichen Sandwichinseln'), -(194, 3, 'Zuid-Georgia en Zuidelijke Sandwicheilanden'), +(194, 2, 'Zuid-Georgia en Zuidelijke Sandwicheilanden'), +(194, 3, 'Südgeorgien und die Südlichen Sandwichinseln'), (195, 1, 'Sri Lanka'), (195, 2, 'Sri Lanka'), (195, 3, 'Sri Lanka'), (196, 1, 'Sudan'), -(196, 2, 'Sudan'), -(196, 3, 'Soedan'), +(196, 2, 'Soedan'), +(196, 3, 'Sudan'), (197, 1, 'Suriname'), (197, 2, 'Suriname'), (197, 3, 'Suriname'), (198, 1, 'Svalbard & Jan Mayen'), -(198, 2, 'Spitzbergen und Jan Mayen'), -(198, 3, 'Spitsbergen en Jan Mayen'), +(198, 2, 'Spitsbergen en Jan Mayen'), +(198, 3, 'Spitzbergen und Jan Mayen'), (199, 1, 'Eswatini'), (199, 2, 'Eswatini'), (199, 3, 'Eswatini'), (200, 1, 'Syria'), -(200, 2, 'Syrien'), -(200, 3, 'Syrië'), +(200, 2, 'Syrië'), +(200, 3, 'Syrien'), (201, 1, 'Taiwan'), (201, 2, 'Taiwan'), (201, 3, 'Taiwan'), (202, 1, 'Tajikistan'), -(202, 2, 'Tadschikistan'), -(202, 3, 'Tadzjikistan'), +(202, 2, 'Tadzjikistan'), +(202, 3, 'Tadschikistan'), (203, 1, 'Tanzania'), -(203, 2, 'Tansania'), -(203, 3, 'Tanzania'), +(203, 2, 'Tanzania'), +(203, 3, 'Tansania'), (204, 1, 'Thailand'), (204, 2, 'Thailand'), (204, 3, 'Thailand'), @@ -4744,38 +4388,38 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (206, 2, 'Tonga'), (206, 3, 'Tonga'), (207, 1, 'Trinidad & Tobago'), -(207, 2, 'Trinidad und Tobago'), -(207, 3, 'Trinidad en Tobago'), +(207, 2, 'Trinidad en Tobago'), +(207, 3, 'Trinidad und Tobago'), (208, 1, 'Tunisia'), -(208, 2, 'Tunesien'), -(208, 3, 'Tunesië'), +(208, 2, 'Tunesië'), +(208, 3, 'Tunesien'), (209, 1, 'Turkey'), -(209, 2, 'Türkei'), -(209, 3, 'Turkije'), +(209, 2, 'Turkije'), +(209, 3, 'Türkei'), (210, 1, 'Turkmenistan'), (210, 2, 'Turkmenistan'), (210, 3, 'Turkmenistan'), (211, 1, 'Turks & Caicos Islands'), -(211, 2, 'Turks- und Caicosinseln'), -(211, 3, 'Turks- en Caicoseilanden'), +(211, 2, 'Turks- en Caicoseilanden'), +(211, 3, 'Turks- und Caicosinseln'), (212, 1, 'Tuvalu'), (212, 2, 'Tuvalu'), (212, 3, 'Tuvalu'), (213, 1, 'Uganda'), -(213, 2, 'Uganda'), -(213, 3, 'Oeganda'), +(213, 2, 'Oeganda'), +(213, 3, 'Uganda'), (214, 1, 'Ukraine'), -(214, 2, 'Ukraine'), -(214, 3, 'Oekraïne'), +(214, 2, 'Oekraïne'), +(214, 3, 'Ukraine'), (215, 1, 'United Arab Emirates'), -(215, 2, 'Vereinigte Arabische Emirate'), -(215, 3, 'Verenigde Arabische Emiraten'), +(215, 2, 'Verenigde Arabische Emiraten'), +(215, 3, 'Vereinigte Arabische Emirate'), (216, 1, 'Uruguay'), (216, 2, 'Uruguay'), (216, 3, 'Uruguay'), (217, 1, 'Uzbekistan'), -(217, 2, 'Usbekistan'), -(217, 3, 'Oezbekistan'), +(217, 2, 'Oezbekistan'), +(217, 3, 'Usbekistan'), (218, 1, 'Vanuatu'), (218, 2, 'Vanuatu'), (218, 3, 'Vanuatu'), @@ -4786,76 +4430,76 @@ INSERT INTO `ps_country_lang` (`id_country`, `id_lang`, `name`) VALUES (220, 2, 'Vietnam'), (220, 3, 'Vietnam'), (221, 1, 'British Virgin Islands'), -(221, 2, 'Britische Jungferninseln'), -(221, 3, 'Britse Maagdeneilanden'), +(221, 2, 'Britse Maagdeneilanden'), +(221, 3, 'Britische Jungferninseln'), (222, 1, 'U.S. Virgin Islands'), -(222, 2, 'Amerikanische Jungferninseln'), -(222, 3, 'Amerikaanse Maagdeneilanden'), +(222, 2, 'Amerikaanse Maagdeneilanden'), +(222, 3, 'Amerikanische Jungferninseln'), (223, 1, 'Wallis & Futuna'), -(223, 2, 'Wallis und Futuna'), -(223, 3, 'Wallis en Futuna'), +(223, 2, 'Wallis en Futuna'), +(223, 3, 'Wallis und Futuna'), (224, 1, 'Western Sahara'), -(224, 2, 'Westsahara'), -(224, 3, 'Westelijke Sahara'), +(224, 2, 'Westelijke Sahara'), +(224, 3, 'Westsahara'), (225, 1, 'Yemen'), (225, 2, 'Jemen'), (225, 3, 'Jemen'), (226, 1, 'Zambia'), -(226, 2, 'Sambia'), -(226, 3, 'Zambia'), +(226, 2, 'Zambia'), +(226, 3, 'Sambia'), (227, 1, 'Zimbabwe'), -(227, 2, 'Simbabwe'), -(227, 3, 'Zimbabwe'), +(227, 2, 'Zimbabwe'), +(227, 3, 'Simbabwe'), (228, 1, 'Albania'), -(228, 2, 'Albanien'), -(228, 3, 'Albanië'), +(228, 2, 'Albanië'), +(228, 3, 'Albanien'), (229, 1, 'Afghanistan'), (229, 2, 'Afghanistan'), (229, 3, 'Afghanistan'), (230, 1, 'Antarctica'), -(230, 2, 'Antarktis'), -(230, 3, 'Antarctica'), +(230, 2, 'Antarctica'), +(230, 3, 'Antarktis'), (231, 1, 'Bosnia & Herzegovina'), -(231, 2, 'Bosnien und Herzegowina'), -(231, 3, 'Bosnië en Herzegovina'), +(231, 2, 'Bosnië en Herzegovina'), +(231, 3, 'Bosnien und Herzegowina'), (232, 1, 'British Indian Ocean Territory'), -(232, 2, 'Britisches Territorium im Indischen Ozean'), -(232, 3, 'Brits Indische Oceaanterritorium'), +(232, 2, 'Brits Indische Oceaanterritorium'), +(232, 3, 'Britisches Territorium im Indischen Ozean'), (233, 1, 'Bulgaria'), -(233, 2, 'Bulgarien'), -(233, 3, 'Bulgarije'), +(233, 2, 'Bulgarije'), +(233, 3, 'Bulgarien'), (234, 1, 'Cayman Islands'), -(234, 2, 'Kaimaninseln'), -(234, 3, 'Kaaimaneilanden'), +(234, 2, 'Kaaimaneilanden'), +(234, 3, 'Kaimaninseln'), (235, 1, 'Christmas Island'), -(235, 2, 'Weihnachtsinsel'), -(235, 3, 'Christmaseiland'), +(235, 2, 'Christmaseiland'), +(235, 3, 'Weihnachtsinsel'), (236, 1, 'Cocos (Keeling) Islands'), -(236, 2, 'Kokosinseln'), -(236, 3, 'Cocoseilanden'), +(236, 2, 'Cocoseilanden'), +(236, 3, 'Kokosinseln'), (237, 1, 'Cook Islands'), -(237, 2, 'Cookinseln'), -(237, 3, 'Cookeilanden'), +(237, 2, 'Cookeilanden'), +(237, 3, 'Cookinseln'), (238, 1, 'French Guiana'), -(238, 2, 'Französisch-Guayana'), -(238, 3, 'Frans-Guyana'), +(238, 2, 'Frans-Guyana'), +(238, 3, 'Französisch-Guayana'), (239, 1, 'French Polynesia'), -(239, 2, 'Französisch-Polynesien'), -(239, 3, 'Frans-Polynesië'), +(239, 2, 'Frans-Polynesië'), +(239, 3, 'Französisch-Polynesien'), (240, 1, 'French Southern Territories'), -(240, 2, 'Französische Süd- und Antarktisgebiete'), -(240, 3, 'Franse Gebieden in de zuidelijke Indische Oceaan'), +(240, 2, 'Franse Gebieden in de zuidelijke Indische Oceaan'), +(240, 3, 'Französische Süd- und Antarktisgebiete'), (241, 1, 'Åland Islands'), -(241, 2, 'Ålandinseln'), -(241, 3, 'Åland'); +(241, 2, 'Åland'), +(241, 3, 'Ålandinseln'); DROP TABLE IF EXISTS `ps_country_shop`; CREATE TABLE `ps_country_shop` ( - `id_country` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_country` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_country`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_country_shop` (`id_country`, `id_shop`) VALUES (1, 1), @@ -5098,248 +4742,7 @@ INSERT INTO `ps_country_shop` (`id_country`, `id_shop`) VALUES (238, 1), (239, 1), (240, 1), -(241, 1), -(1, 2), -(2, 2), -(3, 2), -(4, 2), -(5, 2), -(6, 2), -(7, 2), -(8, 2), -(9, 2), -(10, 2), -(11, 2), -(12, 2), -(13, 2), -(14, 2), -(15, 2), -(16, 2), -(17, 2), -(18, 2), -(19, 2), -(20, 2), -(21, 2), -(22, 2), -(23, 2), -(24, 2), -(25, 2), -(26, 2), -(27, 2), -(28, 2), -(29, 2), -(30, 2), -(31, 2), -(32, 2), -(33, 2), -(34, 2), -(35, 2), -(36, 2), -(37, 2), -(38, 2), -(39, 2), -(40, 2), -(41, 2), -(42, 2), -(43, 2), -(44, 2), -(45, 2), -(46, 2), -(47, 2), -(48, 2), -(49, 2), -(50, 2), -(51, 2), -(52, 2), -(53, 2), -(54, 2), -(55, 2), -(56, 2), -(57, 2), -(58, 2), -(59, 2), -(60, 2), -(61, 2), -(62, 2), -(63, 2), -(64, 2), -(65, 2), -(66, 2), -(67, 2), -(68, 2), -(69, 2), -(70, 2), -(71, 2), -(72, 2), -(73, 2), -(74, 2), -(75, 2), -(76, 2), -(77, 2), -(78, 2), -(79, 2), -(80, 2), -(81, 2), -(82, 2), -(83, 2), -(84, 2), -(85, 2), -(86, 2), -(87, 2), -(88, 2), -(89, 2), -(90, 2), -(91, 2), -(92, 2), -(93, 2), -(94, 2), -(95, 2), -(96, 2), -(97, 2), -(98, 2), -(99, 2), -(100, 2), -(101, 2), -(102, 2), -(103, 2), -(104, 2), -(105, 2), -(106, 2), -(107, 2), -(108, 2), -(109, 2), -(110, 2), -(111, 2), -(112, 2), -(113, 2), -(114, 2), -(115, 2), -(116, 2), -(117, 2), -(118, 2), -(119, 2), -(120, 2), -(121, 2), -(122, 2), -(123, 2), -(124, 2), -(125, 2), -(126, 2), -(127, 2), -(128, 2), -(129, 2), -(130, 2), -(131, 2), -(132, 2), -(133, 2), -(134, 2), -(135, 2), -(136, 2), -(137, 2), -(138, 2), -(139, 2), -(140, 2), -(141, 2), -(142, 2), -(143, 2), -(144, 2), -(145, 2), -(146, 2), -(147, 2), -(148, 2), -(149, 2), -(150, 2), -(151, 2), -(152, 2), -(153, 2), -(154, 2), -(155, 2), -(156, 2), -(157, 2), -(158, 2), -(159, 2), -(160, 2), -(161, 2), -(162, 2), -(163, 2), -(164, 2), -(165, 2), -(166, 2), -(167, 2), -(168, 2), -(169, 2), -(170, 2), -(171, 2), -(172, 2), -(173, 2), -(174, 2), -(175, 2), -(176, 2), -(177, 2), -(178, 2), -(179, 2), -(180, 2), -(181, 2), -(182, 2), -(183, 2), -(184, 2), -(185, 2), -(186, 2), -(187, 2), -(188, 2), -(189, 2), -(190, 2), -(191, 2), -(192, 2), -(193, 2), -(194, 2), -(195, 2), -(196, 2), -(197, 2), -(198, 2), -(199, 2), -(200, 2), -(201, 2), -(202, 2), -(203, 2), -(204, 2), -(205, 2), -(206, 2), -(207, 2), -(208, 2), -(209, 2), -(210, 2), -(211, 2), -(212, 2), -(213, 2), -(214, 2), -(215, 2), -(216, 2), -(217, 2), -(218, 2), -(219, 2), -(220, 2), -(221, 2), -(222, 2), -(223, 2), -(224, 2), -(225, 2), -(226, 2), -(227, 2), -(228, 2), -(229, 2), -(230, 2), -(231, 2), -(232, 2), -(233, 2), -(234, 2), -(235, 2), -(236, 2), -(237, 2), -(238, 2), -(239, 2), -(240, 2), -(241, 2); +(241, 1); DROP TABLE IF EXISTS `ps_currency`; CREATE TABLE `ps_currency` ( @@ -5347,19 +4750,19 @@ CREATE TABLE `ps_currency` ( `name` varchar(64) NOT NULL, `iso_code` varchar(3) NOT NULL DEFAULT '0', `numeric_iso_code` varchar(3) DEFAULT NULL, - `precision` int(11) NOT NULL DEFAULT '6', + `precision` int(2) NOT NULL DEFAULT '6', `conversion_rate` decimal(13,6) NOT NULL, - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '1', - `unofficial` tinyint(3) unsigned NOT NULL DEFAULT '0', - `modified` tinyint(3) unsigned NOT NULL DEFAULT '0', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '1', + `unofficial` tinyint(1) unsigned NOT NULL DEFAULT '0', + `modified` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_currency`), KEY `currency_iso_code` (`iso_code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_currency` (`id_currency`, `name`, `iso_code`, `numeric_iso_code`, `precision`, `conversion_rate`, `deleted`, `active`, `unofficial`, `modified`) VALUES (1, '', 'EUR', '978', 2, 1.000000, 0, 1, 0, 0), -(2, '', 'USD', '840', 2, 1.085234, 0, 1, 0, 0); +(2, '', 'USD', '840', 2, 1.079716, 0, 1, 0, 0); DROP TABLE IF EXISTS `ps_currency_lang`; CREATE TABLE `ps_currency_lang` ( @@ -5369,36 +4772,34 @@ CREATE TABLE `ps_currency_lang` ( `symbol` varchar(255) NOT NULL, `pattern` varchar(255) DEFAULT NULL, PRIMARY KEY (`id_currency`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_currency_lang` (`id_currency`, `id_lang`, `name`, `symbol`, `pattern`) VALUES (1, 1, 'Euro', '€', ''), (1, 2, 'Euro', '€', ''), (1, 3, 'Euro', '€', ''), (2, 1, 'US Dollar', '$', ''), -(2, 2, 'US-Dollar', '$', ''), -(2, 3, 'Amerikaanse dollar', '$', ''); +(2, 2, 'Amerikaanse dollar', '$', ''), +(2, 3, 'US-Dollar', '$', ''); DROP TABLE IF EXISTS `ps_currency_shop`; CREATE TABLE `ps_currency_shop` ( - `id_currency` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_currency` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `conversion_rate` decimal(13,6) NOT NULL, PRIMARY KEY (`id_currency`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_currency_shop` (`id_currency`, `id_shop`, `conversion_rate`) VALUES (1, 1, 1.000000), -(1, 2, 1.000000), -(2, 1, 1.085234), -(2, 2, 1.085234); +(2, 1, 1.079716); DROP TABLE IF EXISTS `ps_customer`; CREATE TABLE `ps_customer` ( `id_customer` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop_group` int(10) unsigned NOT NULL DEFAULT '1', - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop_group` int(11) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_gender` int(10) unsigned NOT NULL, `id_default_group` int(10) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned DEFAULT NULL, @@ -5412,17 +4813,17 @@ CREATE TABLE `ps_customer` ( `passwd` varchar(255) NOT NULL, `last_passwd_gen` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `birthday` date DEFAULT NULL, - `newsletter` tinyint(3) unsigned NOT NULL DEFAULT '0', + `newsletter` tinyint(1) unsigned NOT NULL DEFAULT '0', `ip_registration_newsletter` varchar(15) DEFAULT NULL, `newsletter_date_add` datetime DEFAULT NULL, - `optin` tinyint(3) unsigned NOT NULL DEFAULT '0', + `optin` tinyint(1) unsigned NOT NULL DEFAULT '0', `website` varchar(128) DEFAULT NULL, `outstanding_allow_amount` decimal(20,6) NOT NULL DEFAULT '0.000000', - `show_public_prices` tinyint(3) unsigned NOT NULL DEFAULT '0', + `show_public_prices` tinyint(1) unsigned NOT NULL DEFAULT '0', `max_payment_days` int(10) unsigned NOT NULL DEFAULT '60', `secure_key` varchar(32) NOT NULL DEFAULT '-1', `note` text, - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `is_guest` tinyint(1) NOT NULL DEFAULT '0', `deleted` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, @@ -5436,13 +4837,12 @@ CREATE TABLE `ps_customer` ( KEY `id_gender` (`id_gender`), KEY `id_shop_group` (`id_shop_group`), KEY `id_shop` (`id_shop`,`date_add`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_customer` (`id_customer`, `id_shop_group`, `id_shop`, `id_gender`, `id_default_group`, `id_lang`, `id_risk`, `company`, `siret`, `ape`, `firstname`, `lastname`, `email`, `passwd`, `last_passwd_gen`, `birthday`, `newsletter`, `ip_registration_newsletter`, `newsletter_date_add`, `optin`, `website`, `outstanding_allow_amount`, `show_public_prices`, `max_payment_days`, `secure_key`, `note`, `active`, `is_guest`, `deleted`, `date_add`, `date_upd`, `reset_password_token`, `reset_password_validity`) VALUES -(1, 1, 1, 1, 3, 1, 0, '', '', '', 'Anonymous', 'Anonymous', 'anonymous@psgdpr.com', '$2y$10$T4rXnzJ6WlMwZ3foAIYfqOrivupBqnh0sZ6KGHHEVocwtY6NFsxF.', '2023-05-02 06:17:00', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, '902ad78a4595938c30f9f27665f54a28', '', 0, 0, 0, '2023-05-02 12:17:00', '2023-05-02 12:17:00', '', '0000-00-00 00:00:00'), -(2, 1, 1, 1, 3, 1, 0, '', '', '', 'John', 'DOE', 'pub@prestashop.com', '$2y$10$f2BEuL7S22hIQbCKKIntGuaSpPLi4A.2Zy5qfeb3DsPqI9pGVARJa', '2023-05-02 06:18:38', '1970-01-15', 1, '', '2013-12-13 08:19:15', 1, '', 0.000000, 0, 0, 'dde10d65a88301c97a07d0778504c572', '', 1, 0, 0, '2023-05-02 12:18:38', '2023-05-02 12:18:38', '', '0000-00-00 00:00:00'), -(3, 1, 2, 1, 3, 1, 0, NULL, NULL, NULL, 'INVERTUS', 'RRRRRRR', 'demo@demo.com', '$2y$10$ql1JyAHrvAXIlu9d8y3Jou9kmjB.syg7F.Jqs/DcSFekW7rXtsqDW', '2023-05-08 11:09:50', '0000-00-00', 1, NULL, '2023-05-08 17:09:50', 1, NULL, 0.000000, 0, 0, '0c46e3398a8f3f024dc6569fc56ed4eb', NULL, 1, 0, 0, '2023-05-08 17:09:50', '2023-05-15 10:31:36', NULL, '0000-00-00 00:00:00'), -(4, 1, 1, 1, 3, 1, 0, '', '', '', 'TEST TEST', 'TESSST', 'demo@demo.com', '$2y$10$9e3ChqC7envKbcw0JGVCyuq9/emLY96Rl3QNfeCVf1P9WZFBFjva.', '2023-08-28 05:54:29', '0000-00-00', 1, '', '2023-08-28 11:54:29', 1, '', 0.000000, 0, 0, '3374052bdf067ccff64d284a39dec0fd', '', 1, 0, 0, '2023-08-28 11:54:29', '2023-08-28 11:54:29', '', '0000-00-00 00:00:00'); +(1, 1, 1, 1, 3, 1, 0, '', '', '', 'Anonymous', 'Anonymous', 'anonymous@psgdpr.com', '$2y$10$cJnwNb08TEjDg/UTtSyq6eApZ.gNa2h8d3bFfNQuMH3GmOYPxxtcK', '2023-08-28 07:26:22', '0000-00-00', 0, '', '0000-00-00 00:00:00', 0, '', 0.000000, 0, 0, 'c3e9f01c4bf9cebcf7b444669ce58539', '', 0, 0, 0, '2023-08-28 13:26:22', '2023-08-28 13:26:22', '', '0000-00-00 00:00:00'), +(2, 1, 1, 1, 3, 1, 0, '', '', '', 'John', 'DOE', 'pub@prestashop.com', '$2y$10$YeezeAd.j9mGjWMl6WYcEOeM8R83Xdfb4uTpfAbMSQrL12a4MRRoS', '2023-08-28 07:28:03', '1970-01-15', 1, '', '2013-12-13 08:19:15', 1, '', 0.000000, 0, 0, '959d7ce9f2b75c9b901c71862f15fd1d', '', 1, 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', '', '0000-00-00 00:00:00'), +(3, 1, 1, 1, 3, 1, 0, '', '', '', 'TEST TEST', 'TESSST', 'demo@prestashop.com', '$2y$10$KMi6f2RJ9skzUw7LThgnauDO7s3Rj49lYQrP.uPql2gEdyLuHr3Vq', '2023-08-28 07:48:29', '0000-00-00', 1, '', '2023-08-28 13:48:29', 1, '', 0.000000, 0, 0, '4c26b11e96bb59693af803acba66be93', '', 1, 0, 0, '2023-08-28 13:48:29', '2023-08-28 13:48:29', '', '0000-00-00 00:00:00'); DROP TABLE IF EXISTS `ps_customer_group`; CREATE TABLE `ps_customer_group` ( @@ -5451,13 +4851,12 @@ CREATE TABLE `ps_customer_group` ( PRIMARY KEY (`id_customer`,`id_group`), KEY `customer_login` (`id_group`), KEY `id_customer` (`id_customer`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_customer_group` (`id_customer`, `id_group`) VALUES (1, 3), (2, 3), -(3, 3), -(4, 3); +(3, 3); DROP TABLE IF EXISTS `ps_customer_message`; CREATE TABLE `ps_customer_message` ( @@ -5475,40 +4874,33 @@ CREATE TABLE `ps_customer_message` ( PRIMARY KEY (`id_customer_message`), KEY `id_customer_thread` (`id_customer_thread`), KEY `id_employee` (`id_employee`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_customer_message_sync_imap`; CREATE TABLE `ps_customer_message_sync_imap` ( `md5_header` varbinary(32) NOT NULL, KEY `md5_header_index` (`md5_header`(4)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_customer_session`; CREATE TABLE `ps_customer_session` ( - `id_customer_session` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_customer_session` int(11) unsigned NOT NULL AUTO_INCREMENT, `id_customer` int(10) unsigned DEFAULT NULL, `token` varchar(40) DEFAULT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_customer_session`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_customer_session` (`id_customer_session`, `id_customer`, `token`, `date_add`, `date_upd`) VALUES -(1, 3, 'b89b580c4791ecaa32c8b832ffd0cba90dc7cef7', '2023-05-08 17:09:50', '2023-05-09 08:26:16'), -(2, 3, '32822b1e2f0a880cefac8582c395858c5df5340f', '2023-05-15 09:53:53', '2023-05-15 09:53:56'), -(3, 3, '6d6fb28c3e98fed31691246d7e13ddbd3b715859', '2023-05-15 09:55:49', '2023-05-15 10:04:22'), -(4, 3, '0775365b2d960dc57ba7e74f530c9d38f26a0df5', '2023-05-15 10:10:56', '2023-05-15 10:12:27'), -(5, 3, 'a2c2e75644d05ba9e2bcac8dd95e7ab6a7977127', '2023-05-15 10:22:06', '2023-05-15 10:22:08'), -(6, 3, 'b22097c67b73534db5f63a9f156872b445788417', '2023-05-15 10:23:47', '2023-05-15 10:30:12'), -(7, 3, '2d3eacd9e2a09019f50cd97066a962c8869f211f', '2023-05-15 10:31:36', '2023-05-15 10:42:02'), -(8, 4, 'a310c60579b905c14559fe6e2a63abb94aee0b62', '2023-08-28 11:54:29', '2023-08-28 11:58:58'); +(1, 3, '869119ac5c7c814bbdcf864b0b396e074d6b447b', '2023-08-28 13:48:29', '2023-08-28 13:51:28'); DROP TABLE IF EXISTS `ps_customer_thread`; CREATE TABLE `ps_customer_thread` ( - `id_customer_thread` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_customer_thread` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, `id_contact` int(10) unsigned NOT NULL, `id_customer` int(10) unsigned DEFAULT NULL, @@ -5526,7 +4918,7 @@ CREATE TABLE `ps_customer_thread` ( KEY `id_customer` (`id_customer`), KEY `id_order` (`id_order`), KEY `id_product` (`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_customization`; @@ -5535,15 +4927,15 @@ CREATE TABLE `ps_customization` ( `id_product_attribute` int(10) unsigned NOT NULL DEFAULT '0', `id_address_delivery` int(10) unsigned NOT NULL DEFAULT '0', `id_cart` int(10) unsigned NOT NULL, - `id_product` int(11) NOT NULL, - `quantity` int(11) NOT NULL, + `id_product` int(10) NOT NULL, + `quantity` int(10) NOT NULL, `quantity_refunded` int(11) NOT NULL DEFAULT '0', `quantity_returned` int(11) NOT NULL DEFAULT '0', - `in_cart` tinyint(3) unsigned NOT NULL DEFAULT '0', + `in_cart` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_customization`,`id_cart`,`id_product`,`id_address_delivery`), KEY `id_product_attribute` (`id_product_attribute`), KEY `id_cart_product` (`id_cart`,`id_product`,`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_customization_field`; @@ -5556,7 +4948,7 @@ CREATE TABLE `ps_customization_field` ( `is_deleted` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id_customization_field`), KEY `id_product` (`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_customization_field` (`id_customization_field`, `id_product`, `type`, `required`, `is_module`, `is_deleted`) VALUES (1, 19, 1, 1, 0, 0); @@ -5568,27 +4960,24 @@ CREATE TABLE `ps_customization_field_lang` ( `id_shop` int(10) unsigned NOT NULL DEFAULT '1', `name` varchar(255) NOT NULL, PRIMARY KEY (`id_customization_field`,`id_lang`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_customization_field_lang` (`id_customization_field`, `id_lang`, `id_shop`, `name`) VALUES (1, 1, 1, 'Type your text here'), -(1, 1, 2, 'Type your text here'), (1, 2, 1, 'Type your text here'), -(1, 2, 2, 'Type your text here'), -(1, 3, 1, 'Type your text here'), -(1, 3, 2, 'Type your text here'); +(1, 3, 1, 'Type your text here'); DROP TABLE IF EXISTS `ps_customized_data`; CREATE TABLE `ps_customized_data` ( `id_customization` int(10) unsigned NOT NULL, `type` tinyint(1) NOT NULL, - `index` int(11) NOT NULL, + `index` int(3) NOT NULL, `value` varchar(255) NOT NULL, - `id_module` int(11) NOT NULL DEFAULT '0', + `id_module` int(10) NOT NULL DEFAULT '0', `price` decimal(20,6) NOT NULL DEFAULT '0.000000', `weight` decimal(20,6) NOT NULL DEFAULT '0.000000', PRIMARY KEY (`id_customization`,`type`,`index`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_date_range`; @@ -5597,7 +4986,7 @@ CREATE TABLE `ps_date_range` ( `time_start` datetime NOT NULL, `time_end` datetime NOT NULL, PRIMARY KEY (`id_date_range`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_delivery`; @@ -5615,7 +5004,7 @@ CREATE TABLE `ps_delivery` ( KEY `id_carrier` (`id_carrier`,`id_zone`), KEY `id_range_price` (`id_range_price`), KEY `id_range_weight` (`id_range_weight`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_delivery` (`id_delivery`, `id_shop`, `id_shop_group`, `id_carrier`, `id_range_price`, `id_range_weight`, `id_zone`, `price`) VALUES (1, NULL, NULL, 2, 0, 1, 1, 5.000000), @@ -5633,19 +5022,11 @@ INSERT INTO `ps_delivery` (`id_delivery`, `id_shop`, `id_shop_group`, `id_carrie (13, NULL, NULL, 4, 0, 3, 1, 2.000000), (14, NULL, NULL, 4, 0, 3, 2, 3.000000), (15, NULL, NULL, 4, 0, 4, 1, 5.000000), -(16, NULL, NULL, 4, 0, 4, 2, 6.000000), -(25, NULL, NULL, 5, NULL, 5, 4, 0.000000), -(26, NULL, NULL, 5, NULL, 5, 3, 0.000000), -(27, NULL, NULL, 5, NULL, 5, 8, 0.000000), -(28, NULL, NULL, 5, NULL, 5, 1, 5.000000), -(29, NULL, NULL, 5, NULL, 5, 7, 0.000000), -(30, NULL, NULL, 5, NULL, 5, 2, 5.000000), -(31, NULL, NULL, 5, NULL, 5, 5, 0.000000), -(32, NULL, NULL, 5, NULL, 5, 6, 0.000000); +(16, NULL, NULL, 4, 0, 4, 2, 6.000000); DROP TABLE IF EXISTS `ps_emailsubscription`; CREATE TABLE `ps_emailsubscription` ( - `id` int(11) NOT NULL AUTO_INCREMENT, + `id` int(6) NOT NULL AUTO_INCREMENT, `id_shop` int(10) unsigned NOT NULL DEFAULT '1', `id_shop_group` int(10) unsigned NOT NULL DEFAULT '1', `email` varchar(255) NOT NULL, @@ -5653,7 +5034,7 @@ CREATE TABLE `ps_emailsubscription` ( `ip_registration_newsletter` varchar(15) NOT NULL, `http_referer` varchar(255) DEFAULT NULL, `active` tinyint(1) NOT NULL DEFAULT '0', - `id_lang` int(11) NOT NULL DEFAULT '0', + `id_lang` int(10) NOT NULL DEFAULT '0', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -5672,7 +5053,7 @@ CREATE TABLE `ps_employee` ( `stats_date_to` date DEFAULT NULL, `stats_compare_from` date DEFAULT NULL, `stats_compare_to` date DEFAULT NULL, - `stats_compare_option` int(10) unsigned NOT NULL DEFAULT '1', + `stats_compare_option` int(1) unsigned NOT NULL DEFAULT '1', `preselect_date_range` varchar(32) DEFAULT NULL, `bo_color` varchar(32) DEFAULT NULL, `bo_theme` varchar(32) DEFAULT NULL, @@ -5680,8 +5061,8 @@ CREATE TABLE `ps_employee` ( `default_tab` int(10) unsigned NOT NULL DEFAULT '0', `bo_width` int(10) unsigned NOT NULL DEFAULT '0', `bo_menu` tinyint(1) NOT NULL DEFAULT '1', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', - `optin` tinyint(3) unsigned DEFAULT NULL, + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', + `optin` tinyint(1) unsigned DEFAULT NULL, `id_last_order` int(10) unsigned NOT NULL DEFAULT '0', `id_last_customer_message` int(10) unsigned NOT NULL DEFAULT '0', `id_last_customer` int(10) unsigned NOT NULL DEFAULT '0', @@ -5693,57 +5074,46 @@ CREATE TABLE `ps_employee` ( KEY `employee_login` (`email`,`passwd`), KEY `id_employee_passwd` (`id_employee`,`passwd`), KEY `id_profile` (`id_profile`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_employee` (`id_employee`, `id_profile`, `id_lang`, `lastname`, `firstname`, `email`, `passwd`, `last_passwd_gen`, `stats_date_from`, `stats_date_to`, `stats_compare_from`, `stats_compare_to`, `stats_compare_option`, `preselect_date_range`, `bo_color`, `bo_theme`, `bo_css`, `default_tab`, `bo_width`, `bo_menu`, `active`, `optin`, `id_last_order`, `id_last_customer_message`, `id_last_customer`, `last_connection_date`, `reset_password_token`, `reset_password_validity`, `has_enabled_gravatar`) VALUES -(1, 1, 1, 'Doe', 'John', 'demo@prestashop.com', '$2y$10$q322jp6mz0cb71ZbjPycduo540qj3ptvpvX/CkuSI3TV4HmvmdPG2', '2023-05-02 06:16:59', '2023-04-02', '2023-05-02', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-08-28', NULL, '0000-00-00 00:00:00', 0); +(1, 1, 1, 'Doe', 'John', 'demo@prestashop.com', '$2y$10$PZPz0Oyk3E9q0p0uSBgHGOJcqRIol/MCt.SHEWA943zLjzu8bwVM.', '2023-08-28 07:26:21', '2023-07-28', '2023-08-28', '0000-00-00', '0000-00-00', 1, NULL, NULL, 'default', 'theme.css', 1, 0, 1, 1, NULL, 0, 0, 0, '2023-08-28', NULL, '0000-00-00 00:00:00', 0); DROP TABLE IF EXISTS `ps_employee_session`; CREATE TABLE `ps_employee_session` ( - `id_employee_session` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_employee_session` int(11) unsigned NOT NULL AUTO_INCREMENT, `id_employee` int(10) unsigned DEFAULT NULL, `token` varchar(40) DEFAULT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_employee_session`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_employee_session` (`id_employee_session`, `id_employee`, `token`, `date_add`, `date_upd`) VALUES -(2, 1, '67bce813a9adb970ad2c9813d74cb830104423fd', '2023-05-09 08:25:33', '2023-05-09 08:36:07'), -(3, 1, '1871862a3644644536938d69cb4c237747d55ce1', '2023-05-15 09:53:35', '2023-05-15 09:55:03'), -(4, 1, '96e2c290feb46f4ae5e970d08e94297506a85240', '2023-05-15 09:55:41', '2023-05-15 10:03:03'), -(5, 1, '82ec834d1e15c6d8d559b89e35f3de0fade68d29', '2023-05-15 10:13:30', '2023-05-15 10:42:45'), -(6, 1, '90f28ac72faade5f2e803e9ef2560cd6df8b952d', '2023-05-15 10:21:50', '2023-05-15 10:23:21'), -(7, 1, '46c91e6e4113ab4a2048ee3ac31d2d505ae01269', '2023-05-15 10:23:38', '2023-05-15 10:30:06'), -(8, 1, '8a368b7b836014e2491dc0f454e476496beecb1f', '2023-08-28 10:56:38', '2023-08-28 10:56:48'), -(9, 1, 'f1f085b5f15db8783771114436f6c2a64c00f21c', '2023-08-28 10:57:58', '2023-08-28 11:52:35'), -(10, 1, '66cbeffc6425f31c80496679d672a0e87c6987c2', '2023-08-28 11:49:41', '2023-08-28 11:49:42'), -(11, 1, 'e36aa25c95cf531e1c07db56f4e3c4c02d9dbde0', '2023-08-28 11:50:13', '2023-08-28 11:50:21'), -(12, 1, 'b3f27265c70b3e66b606a26571b4b78ace3a7544', '2023-08-28 11:50:48', '2023-08-28 11:50:55'); +(1, 1, 'db7f0afd0d89faa3ca43a8de6712352f9b6de9bd', '2023-08-28 13:42:08', '2023-08-28 13:51:11'); DROP TABLE IF EXISTS `ps_employee_shop`; CREATE TABLE `ps_employee_shop` ( - `id_employee` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_employee` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_employee`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_employee_shop` (`id_employee`, `id_shop`) VALUES -(1, 1), -(1, 2); +(1, 1); DROP TABLE IF EXISTS `ps_feature`; CREATE TABLE `ps_feature` ( `id_feature` int(10) unsigned NOT NULL AUTO_INCREMENT, `position` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_feature`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_feature` (`id_feature`, `position`) VALUES (1, 0), (2, 1), -(3, 2); +(3, 1); DROP TABLE IF EXISTS `ps_feature_flag`; CREATE TABLE `ps_feature_flag` ( @@ -5770,18 +5140,18 @@ CREATE TABLE `ps_feature_lang` ( `name` varchar(128) DEFAULT NULL, PRIMARY KEY (`id_feature`,`id_lang`), KEY `id_lang` (`id_lang`,`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_feature_lang` (`id_feature`, `id_lang`, `name`) VALUES -(1, 1, 'Composition'), -(2, 1, 'Property'), -(3, 1, 'Voucher'), -(1, 2, 'Composition'), -(2, 2, 'Property'), -(3, 2, 'Voucher'), -(1, 3, 'Composition'), -(2, 3, 'Property'), -(3, 3, 'Voucher'); +(2, 1, 'Composition'), +(3, 1, 'Property'), +(1, 1, 'Voucher'), +(2, 2, 'Composition'), +(3, 2, 'Property'), +(1, 2, 'Voucher'), +(2, 3, 'Composition'), +(3, 3, 'Property'), +(1, 3, 'Voucher'); DROP TABLE IF EXISTS `ps_feature_product`; CREATE TABLE `ps_feature_product` ( @@ -5791,7 +5161,7 @@ CREATE TABLE `ps_feature_product` ( PRIMARY KEY (`id_feature`,`id_product`,`id_feature_value`), KEY `id_feature_value` (`id_feature_value`), KEY `id_product` (`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_feature_product` (`id_feature`, `id_product`, `id_feature_value`) VALUES (1, 9, 1), @@ -5820,19 +5190,16 @@ INSERT INTO `ps_feature_product` (`id_feature`, `id_product`, `id_feature_value` DROP TABLE IF EXISTS `ps_feature_shop`; CREATE TABLE `ps_feature_shop` ( - `id_feature` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_feature` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_feature`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_feature_shop` (`id_feature`, `id_shop`) VALUES (1, 1), (2, 1), -(3, 1), -(1, 2), -(2, 2), -(3, 2); +(3, 1); DROP TABLE IF EXISTS `ps_feature_value`; CREATE TABLE `ps_feature_value` ( @@ -5841,7 +5208,7 @@ CREATE TABLE `ps_feature_value` ( `custom` tinyint(3) unsigned DEFAULT NULL, PRIMARY KEY (`id_feature_value`), KEY `feature` (`id_feature`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_feature_value` (`id_feature_value`, `id_feature`, `custom`) VALUES (1, 1, 0), @@ -5850,13 +5217,13 @@ INSERT INTO `ps_feature_value` (`id_feature_value`, `id_feature`, `custom`) VALU (4, 1, 0), (5, 1, 0), (6, 1, 0), -(7, 2, 0), -(8, 2, 0), -(9, 2, 0), +(7, 1, 0), +(8, 1, 0), +(9, 1, 0), (10, 2, 0), -(11, 3, 0), -(12, 3, 0), -(13, 3, 0); +(11, 2, 0), +(12, 2, 0), +(13, 2, 0); DROP TABLE IF EXISTS `ps_feature_value_lang`; CREATE TABLE `ps_feature_value_lang` ( @@ -5864,54 +5231,54 @@ CREATE TABLE `ps_feature_value_lang` ( `id_lang` int(10) unsigned NOT NULL, `value` varchar(255) DEFAULT NULL, PRIMARY KEY (`id_feature_value`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_feature_value_lang` (`id_feature_value`, `id_lang`, `value`) VALUES -(1, 1, 'Polyester'), -(1, 2, 'Polyester'), -(1, 3, 'Polyester'), -(2, 1, 'Wool'), -(2, 2, 'Wolle'), -(2, 3, 'Wol'), -(3, 1, 'Ceramic'), -(3, 2, 'Ceramic'), -(3, 3, 'Ceramic'), -(4, 1, 'Cotton'), -(4, 2, 'Baumwolle'), -(4, 3, 'Katoen'), -(5, 1, 'Recycled cardboard'), -(5, 2, 'Recycled cardboard'), -(5, 3, 'Recycled cardboard'), -(6, 1, 'Matt paper'), -(6, 2, 'Matt paper'), -(6, 3, 'Matt paper'), -(7, 1, 'Long sleeves'), -(7, 2, 'Long sleeves'), -(7, 3, 'Long sleeves'), -(8, 1, 'Short sleeves'), -(8, 2, 'Short sleeves'), -(8, 3, 'Short sleeves'), -(9, 1, 'Removable cover'), -(9, 2, 'Removable cover'), -(9, 3, 'Removable cover'), -(10, 1, '120 pages'), -(10, 2, '120 pages'), -(10, 3, '120 pages'), -(11, 1, 'meal'), -(11, 2, 'meal'), -(11, 3, 'meal'), -(12, 1, 'gift'), -(12, 2, 'gift'), -(12, 3, 'gift'), -(13, 1, 'eco'), -(13, 2, 'eco'), -(13, 3, 'eco'); +(1, 1, 'meal'), +(1, 2, 'meal'), +(1, 3, 'meal'), +(2, 1, 'gift'), +(2, 2, 'gift'), +(2, 3, 'gift'), +(3, 1, 'eco'), +(3, 2, 'eco'), +(3, 3, 'eco'), +(4, 1, 'Polyester'), +(4, 2, 'Polyester'), +(4, 3, 'Polyester'), +(5, 1, 'Wool'), +(5, 2, 'Wol'), +(5, 3, 'Wolle'), +(6, 1, 'Ceramic'), +(6, 2, 'Ceramic'), +(6, 3, 'Ceramic'), +(7, 1, 'Cotton'), +(7, 2, 'Katoen'), +(7, 3, 'Baumwolle'), +(8, 1, 'Recycled cardboard'), +(8, 2, 'Recycled cardboard'), +(8, 3, 'Recycled cardboard'), +(9, 1, 'Matt paper'), +(9, 2, 'Matt paper'), +(9, 3, 'Matt paper'), +(10, 1, 'Long sleeves'), +(10, 2, 'Long sleeves'), +(10, 3, 'Long sleeves'), +(11, 1, 'Short sleeves'), +(11, 2, 'Short sleeves'), +(11, 3, 'Short sleeves'), +(12, 1, 'Removable cover'), +(12, 2, 'Removable cover'), +(12, 3, 'Removable cover'), +(13, 1, '120 pages'), +(13, 2, '120 pages'), +(13, 3, '120 pages'); DROP TABLE IF EXISTS `ps_ganalytics`; CREATE TABLE `ps_ganalytics` ( `id_google_analytics` int(11) NOT NULL AUTO_INCREMENT, `id_order` int(11) NOT NULL, - `id_customer` int(11) NOT NULL, + `id_customer` int(10) NOT NULL, `id_shop` int(11) NOT NULL, `sent` tinyint(1) DEFAULT NULL, `refund_sent` tinyint(1) DEFAULT NULL, @@ -5922,17 +5289,7 @@ CREATE TABLE `ps_ganalytics` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_ganalytics` (`id_google_analytics`, `id_order`, `id_customer`, `id_shop`, `sent`, `refund_sent`, `date_add`) VALUES -(1, 6, 0, 2, 0, NULL, '2023-05-09 06:26:16'), -(2, 7, 0, 2, 0, NULL, '2023-05-15 07:57:13'), -(3, 8, 0, 2, 0, NULL, '2023-05-15 08:01:15'), -(4, 9, 0, 2, 0, NULL, '2023-05-15 08:02:42'), -(5, 10, 0, 2, 0, NULL, '2023-05-15 08:12:20'), -(6, 11, 0, 2, 0, NULL, '2023-05-15 08:25:41'), -(7, 12, 0, 2, 0, NULL, '2023-05-15 08:26:36'), -(8, 13, 0, 2, 0, NULL, '2023-05-15 08:27:21'), -(9, 14, 0, 2, 0, NULL, '2023-05-15 08:28:10'), -(10, 15, 0, 2, 0, NULL, '2023-05-15 08:29:18'), -(11, 16, 0, 1, 0, NULL, '2023-08-28 09:55:58'); +(1, 6, 0, 1, 0, NULL, '2023-08-28 11:51:23'); DROP TABLE IF EXISTS `ps_ganalytics_data`; CREATE TABLE `ps_ganalytics_data` ( @@ -5943,36 +5300,14 @@ CREATE TABLE `ps_ganalytics_data` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_ganalytics_data` (`id_cart`, `id_shop`, `data`) VALUES -(6, 2, '[[[[[[[[[\"MBG.addCheckoutOption(2,\'\');\"]]]]]]]]]'), -(7, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(8, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(9, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(10, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(11, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(12, 2, '[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]'), -(13, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(14, 2, '[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]'), -(15, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(16, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(17, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(18, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(19, 2, '[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]'), -(20, 2, '[[[[[[{\"2\":{\"id\":\"2-9\",\"name\":\"hummingbird-printed-sweater\",\"category\":\"women\",\"brand\":\"studio-design\",\"variant\":\"s\",\"type\":\"typical\",\"position\":\"0\",\"quantity\":3,\"list\":\"cart\",\"url\":\"\",\"price\":28.719999999999999}}]]]]]]'), -(21, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(22, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(23, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(24, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(25, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(26, 2, '[[[[[[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]]]]]]'), -(27, 2, '[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]'), -(28, 1, '[[[[[[[\"MBG.addCheckoutOption(2,\'\');\"]]]]]]]'); +(6, 1, '[[\"MBG.addCheckoutOption(2,\'Click and collect\');\"]]'); DROP TABLE IF EXISTS `ps_gender`; CREATE TABLE `ps_gender` ( `id_gender` int(11) NOT NULL AUTO_INCREMENT, `type` tinyint(1) NOT NULL, PRIMARY KEY (`id_gender`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_gender` (`id_gender`, `type`) VALUES (1, 0), @@ -5985,31 +5320,31 @@ CREATE TABLE `ps_gender_lang` ( `name` varchar(20) NOT NULL, PRIMARY KEY (`id_gender`,`id_lang`), KEY `id_gender` (`id_gender`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_gender_lang` (`id_gender`, `id_lang`, `name`) VALUES (1, 1, 'Mr.'), -(1, 2, 'Herr'), -(1, 3, 'Dhr.'), +(1, 2, 'Dhr.'), +(1, 3, 'Herr'), (2, 1, 'Mrs.'), -(2, 2, 'Frau'), -(2, 3, 'Mw.'); +(2, 2, 'Mw.'), +(2, 3, 'Frau'); DROP TABLE IF EXISTS `ps_group`; CREATE TABLE `ps_group` ( `id_group` int(10) unsigned NOT NULL AUTO_INCREMENT, `reduction` decimal(5,2) NOT NULL DEFAULT '0.00', `price_display_method` tinyint(4) NOT NULL DEFAULT '0', - `show_prices` tinyint(3) unsigned NOT NULL DEFAULT '1', + `show_prices` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_group` (`id_group`, `reduction`, `price_display_method`, `show_prices`, `date_add`, `date_upd`) VALUES -(1, 0.00, 0, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56'), -(2, 0.00, 0, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56'), -(3, 0.00, 0, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56'); +(1, 0.00, 0, 1, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(2, 0.00, 0, 1, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(3, 0.00, 0, 1, '2023-08-28 13:26:17', '2023-08-28 13:26:17'); DROP TABLE IF EXISTS `ps_group_lang`; CREATE TABLE `ps_group_lang` ( @@ -6017,18 +5352,18 @@ CREATE TABLE `ps_group_lang` ( `id_lang` int(10) unsigned NOT NULL, `name` varchar(32) NOT NULL, PRIMARY KEY (`id_group`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_group_lang` (`id_group`, `id_lang`, `name`) VALUES (1, 1, 'Visitor'), -(1, 2, 'Besucher'), -(1, 3, 'Bezoeker'), +(1, 2, 'Bezoeker'), +(1, 3, 'Besucher'), (2, 1, 'Guest'), (2, 2, 'Gast'), (2, 3, 'Gast'), (3, 1, 'Customer'), -(3, 2, 'Kunde'), -(3, 3, 'Klant'); +(3, 2, 'Klant'), +(3, 3, 'Kunde'); DROP TABLE IF EXISTS `ps_group_reduction`; CREATE TABLE `ps_group_reduction` ( @@ -6038,24 +5373,21 @@ CREATE TABLE `ps_group_reduction` ( `reduction` decimal(5,4) NOT NULL, PRIMARY KEY (`id_group_reduction`), UNIQUE KEY `id_group` (`id_group`,`id_category`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_group_shop`; CREATE TABLE `ps_group_shop` ( - `id_group` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_group` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_group`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_group_shop` (`id_group`, `id_shop`) VALUES (1, 1), (2, 1), -(3, 1), -(1, 2), -(2, 2), -(3, 2); +(3, 1); DROP TABLE IF EXISTS `ps_gsitemap_sitemap`; CREATE TABLE `ps_gsitemap_sitemap` ( @@ -6086,1227 +5418,12 @@ CREATE TABLE `ps_guest` ( KEY `id_customer` (`id_customer`), KEY `id_operating_system` (`id_operating_system`), KEY `id_web_browser` (`id_web_browser`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_guest` (`id_guest`, `id_operating_system`, `id_web_browser`, `id_customer`, `javascript`, `screen_resolution_x`, `screen_resolution_y`, `screen_color`, `sun_java`, `adobe_flash`, `adobe_director`, `apple_quicktime`, `real_player`, `windows_media`, `accept_language`, `mobile_theme`) VALUES (1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), (2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(3, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(14, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(21, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(27, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(31, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(32, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(33, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(35, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(36, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(37, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(38, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(39, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(41, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(42, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(44, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(45, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(46, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(47, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(48, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(53, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(54, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(58, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(59, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(61, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(62, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(63, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(65, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(73, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(74, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(75, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(76, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(77, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(78, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(79, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(81, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(82, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(83, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(84, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(86, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(87, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(88, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(89, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(90, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(91, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(93, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(94, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(96, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(98, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(99, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(124, 7, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(153, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(157, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(168, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(169, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(173, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(187, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(196, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(204, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(205, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(207, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(211, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(215, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(225, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(226, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(227, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(229, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(230, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(231, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(232, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(233, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(234, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(235, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(236, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(237, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(238, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(240, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(242, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(243, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(244, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(245, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(246, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(247, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(248, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(249, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(250, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(251, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(252, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(254, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(256, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(257, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(258, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(260, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(261, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(263, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(264, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(265, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(266, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(267, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(268, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(269, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(270, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(271, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(272, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(273, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(274, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(275, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(276, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(277, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(278, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(279, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(280, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(281, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(282, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(283, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(284, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(285, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(286, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(287, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(288, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(289, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(290, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(291, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(292, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(293, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(294, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(295, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(296, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(297, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(298, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(299, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(301, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(302, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(303, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(304, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(305, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(306, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(307, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(308, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(309, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(310, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(311, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(312, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(313, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(314, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(315, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(316, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(317, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(318, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(319, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(320, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(321, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(322, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(323, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(324, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(325, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(326, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(327, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(328, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(329, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(330, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(331, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(332, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(333, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(334, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(335, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(336, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(337, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(338, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(339, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(340, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(341, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(342, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(343, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(344, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(345, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(346, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(347, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(348, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(349, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(350, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(351, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(352, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(353, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(354, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(355, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(356, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(357, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(358, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(359, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(360, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(361, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(362, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(363, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(364, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(365, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(366, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(367, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(368, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(369, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(370, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(371, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(372, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(373, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(374, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(375, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(376, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(377, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(378, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(379, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(380, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(381, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(382, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(383, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(385, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(386, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(387, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(388, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(389, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(390, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(391, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(392, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(393, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(394, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(395, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(396, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(397, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(398, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(399, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(401, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(402, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(403, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(404, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(405, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(406, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(407, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(408, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(409, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(410, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(411, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(412, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(413, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(414, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(415, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(416, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(417, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(418, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(419, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(420, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(421, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(422, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(423, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(424, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(425, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(426, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(427, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(428, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(429, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(430, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(431, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(432, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(433, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(434, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(435, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(436, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(437, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(438, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(439, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(440, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(441, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(442, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(443, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(444, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(445, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(446, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(447, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(448, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(449, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(450, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(451, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(452, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(453, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(454, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(455, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(456, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(457, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(458, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(459, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(460, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(461, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(462, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(463, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(464, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(465, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(466, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(467, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(468, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(469, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(470, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(471, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(472, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(473, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(474, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(475, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(476, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(477, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(478, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(479, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(480, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(481, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(482, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(483, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(484, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(485, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(486, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(487, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(488, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(489, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(490, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(491, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(492, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(493, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(494, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(495, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(496, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(497, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(498, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(499, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(501, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(502, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(503, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(504, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(505, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(506, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(507, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(508, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(509, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(510, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(511, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(512, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(513, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(514, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(515, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(516, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(517, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(518, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(519, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(520, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(521, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(522, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(523, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(524, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(525, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(526, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(527, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(528, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(529, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(530, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(531, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(532, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(533, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(534, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(535, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(536, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(537, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(538, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(539, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(540, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(541, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(542, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(543, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(544, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(545, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(546, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(547, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(548, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(549, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(550, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(551, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(552, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(553, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(554, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(555, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(556, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(557, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(558, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(559, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(560, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(561, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(562, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(563, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(564, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(565, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(566, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(567, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(568, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(569, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(570, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(571, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(572, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(573, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(574, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(575, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(576, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(577, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(578, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(579, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(580, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(581, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(582, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(583, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(584, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(585, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(586, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(587, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(588, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(589, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(590, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(591, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(592, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(593, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(594, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(595, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(596, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(597, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(598, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(599, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(600, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(601, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(602, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(603, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(604, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(605, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(606, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(607, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(608, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(609, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(610, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(611, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(612, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(613, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(614, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(615, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(616, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(617, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(618, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(619, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(620, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(621, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(622, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(623, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(624, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(625, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(626, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(627, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(628, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(629, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(630, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(631, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(632, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(633, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(634, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(635, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(636, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(637, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(639, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(640, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(641, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(642, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(643, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(644, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(645, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(646, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(647, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(648, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(649, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(650, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(651, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(652, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(654, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(655, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(656, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(657, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(658, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(659, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(660, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(661, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(662, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(663, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(664, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(665, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(666, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(667, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(668, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(669, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(670, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(671, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(672, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(673, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(674, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(675, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(676, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(677, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(678, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(679, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(680, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(681, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(682, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(683, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(684, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(685, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(686, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(687, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(688, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(689, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(690, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(691, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(692, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(693, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(694, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(695, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(696, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(697, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(698, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(699, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(701, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(702, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(703, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(705, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(706, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(707, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(708, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(709, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(710, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(711, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(712, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(713, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(714, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(715, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(716, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(717, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(718, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(719, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(720, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(721, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(722, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(723, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(724, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(725, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(726, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(727, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(728, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(729, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(730, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(732, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(733, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(734, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(735, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(736, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(737, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(738, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(739, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(740, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(741, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(742, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(743, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(744, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(745, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(746, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(747, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(748, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(749, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(750, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(751, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(752, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(753, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(754, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(755, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(756, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(758, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(759, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(760, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(761, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(762, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(763, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(764, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(765, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(766, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(767, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(768, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(769, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(770, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(771, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(772, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(773, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(774, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(775, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(777, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(778, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(779, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(780, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(781, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(782, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(783, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(784, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(785, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(786, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(787, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(788, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(789, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(791, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(792, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(793, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(794, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(795, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(796, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(797, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(798, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(799, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(801, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(802, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(803, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(804, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(805, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(806, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(807, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(808, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(809, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(810, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(811, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(812, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(813, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(814, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(815, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(816, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(817, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(818, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(819, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(820, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(821, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(822, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(823, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(824, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(825, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(826, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(827, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(828, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(829, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(830, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(831, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(832, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(833, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(834, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(835, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(836, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(837, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(838, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(839, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(840, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(841, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(842, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(843, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(844, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(845, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(847, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(848, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(849, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(850, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(851, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(852, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(853, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(854, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(855, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(856, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(857, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(858, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(859, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(860, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(861, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(862, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(863, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(864, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(865, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(866, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(867, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(868, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(869, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(870, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(871, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(872, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(873, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(874, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(875, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(876, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(877, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(878, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(879, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(880, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(881, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(882, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(883, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(884, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(885, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(886, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(887, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(888, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(889, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(890, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(891, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(892, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(893, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(894, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(895, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(896, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(897, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(898, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(899, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(901, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(902, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(903, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(904, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(905, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(906, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(907, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(908, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(909, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(910, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(911, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(912, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(913, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(914, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(915, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(916, 7, 3, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0), -(917, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(918, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(919, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(920, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(921, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(922, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(923, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(924, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(925, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(926, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(927, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(928, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(929, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(930, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(931, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(932, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(933, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(934, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(935, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(936, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(937, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(938, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(939, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(940, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(941, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(942, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(943, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(944, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(945, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(946, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(947, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(948, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(949, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(950, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(951, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(952, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(953, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(954, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(955, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(956, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(957, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(958, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(959, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(960, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(961, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(962, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(963, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(964, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(965, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(966, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(967, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(968, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(969, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(970, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(971, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(972, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(973, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(974, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(975, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(976, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(977, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(978, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(979, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(980, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(981, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(982, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(983, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(984, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(985, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(986, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(987, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(988, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(989, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(990, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(991, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(992, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(993, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(994, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(995, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(996, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(997, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(998, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1001, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1002, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1003, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1004, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1005, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1006, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1007, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1008, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1009, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1010, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1011, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1012, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1013, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1014, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1015, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1016, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1017, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1018, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1019, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1020, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1021, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1022, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1023, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1025, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1026, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1027, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1028, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1029, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1030, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1031, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1032, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1033, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1034, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1035, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1036, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1037, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1038, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1039, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1040, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1041, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1042, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1043, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1044, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1045, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1046, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1047, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1048, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1049, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1050, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1051, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1052, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1053, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1054, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1055, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1056, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1057, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1058, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1059, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1060, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1061, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1062, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1063, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1064, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1065, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1066, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1067, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1068, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1069, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1070, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1071, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1072, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1073, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1074, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1075, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1076, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1077, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1078, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1079, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1080, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1081, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1082, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1083, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1084, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1085, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1086, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1087, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1088, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1089, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1090, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1091, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1092, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1093, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1094, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1095, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1096, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1097, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1098, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1099, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1103, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1105, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1106, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1108, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1109, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1114, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1117, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1118, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1119, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1120, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1121, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1123, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1124, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1125, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1126, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1127, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1129, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1130, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1131, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1132, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1133, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1134, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1136, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1138, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1139, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1140, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1145, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1146, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1147, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1148, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1149, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1152, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1153, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1154, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1157, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1158, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1160, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1161, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1162, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1163, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1165, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1166, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1167, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1168, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1169, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1170, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1171, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1172, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1173, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1177, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1180, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1181, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1182, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1183, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1184, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1185, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1186, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1187, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1188, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1189, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1190, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1192, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1193, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1194, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1195, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1196, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1197, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1198, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1199, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1201, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1202, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1203, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1204, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1205, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1206, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1207, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1208, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1209, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1210, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1211, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1214, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1215, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1216, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1219, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1220, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0), -(1224, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '', 0); +(3, 7, 3, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'en', 0); DROP TABLE IF EXISTS `ps_homeslider`; CREATE TABLE `ps_homeslider` ( @@ -7317,17 +5434,14 @@ CREATE TABLE `ps_homeslider` ( INSERT INTO `ps_homeslider` (`id_homeslider_slides`, `id_shop`) VALUES (1, 1), -(1, 2), (2, 1), -(2, 2), -(3, 1), -(3, 2); +(3, 1); DROP TABLE IF EXISTS `ps_homeslider_slides`; CREATE TABLE `ps_homeslider_slides` ( `id_homeslider_slides` int(10) unsigned NOT NULL AUTO_INCREMENT, `position` int(10) unsigned NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_homeslider_slides`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -7365,11 +5479,11 @@ CREATE TABLE `ps_hook` ( `name` varchar(191) NOT NULL, `title` varchar(255) NOT NULL, `description` text, - `active` tinyint(3) unsigned NOT NULL DEFAULT '1', + `active` tinyint(1) unsigned NOT NULL DEFAULT '1', `position` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id_hook`), UNIQUE KEY `hook_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_hook` (`id_hook`, `name`, `title`, `description`, `active`, `position`) VALUES (1, 'actionValidateOrder', 'New orders', '', 1, 1), @@ -8252,22 +6366,22 @@ INSERT INTO `ps_hook` (`id_hook`, `name`, `title`, `description`, `active`, `pos (888, 'displayProductButtons', 'displayProductButtons', '', 1, 1), (889, 'dashboardZoneTwo', 'dashboardZoneTwo', '', 1, 1), (890, 'dashboardData', 'dashboardData', '', 1, 1), -(891, 'GraphEngine', 'GraphEngine', '', 1, 1), -(892, 'actionObjectOrderAddAfter', 'actionObjectOrderAddAfter', '', 1, 1), -(893, 'actionSearch', 'actionSearch', '', 1, 1), -(894, 'paymentOptions', 'paymentOptions', '', 1, 1), +(891, 'actionObjectOrderAddAfter', 'actionObjectOrderAddAfter', '', 1, 1), +(892, 'actionSearch', 'actionSearch', '', 1, 1), +(893, 'paymentOptions', 'paymentOptions', '', 1, 1), +(894, 'paymentReturn', 'paymentReturn', '', 1, 1), (895, 'AdminStatsModules', 'AdminStatsModules', '', 1, 1), -(896, 'authentication', 'authentication', '', 1, 1), -(897, 'createAccount', 'createAccount', '', 1, 1), -(898, 'actionProductCoverage', 'actionProductCoverage', '', 1, 1), -(899, 'GridEngine', 'GridEngine', '', 1, 1), -(900, 'gSitemapAppendUrls', 'GSitemap Append URLs', 'This hook allows a module to add URLs to a generated sitemap', 1, 1), -(901, 'paymentReturn', 'paymentReturn', '', 1, 1), -(902, 'dashboardZoneOne', 'dashboardZoneOne', '', 1, 1), -(903, 'actionObjectCustomerAddAfter', 'actionObjectCustomerAddAfter', '', 1, 1), -(904, 'actionObjectCustomerMessageAddAfter', 'actionObjectCustomerMessageAddAfter', '', 1, 1), -(905, 'actionObjectCustomerThreadAddAfter', 'actionObjectCustomerThreadAddAfter', '', 1, 1), -(906, 'actionObjectOrderReturnAddAfter', 'actionObjectOrderReturnAddAfter', '', 1, 1), +(896, 'dashboardZoneOne', 'dashboardZoneOne', '', 1, 1), +(897, 'actionObjectCustomerAddAfter', 'actionObjectCustomerAddAfter', '', 1, 1), +(898, 'actionObjectCustomerMessageAddAfter', 'actionObjectCustomerMessageAddAfter', '', 1, 1), +(899, 'actionObjectCustomerThreadAddAfter', 'actionObjectCustomerThreadAddAfter', '', 1, 1), +(900, 'actionObjectOrderReturnAddAfter', 'actionObjectOrderReturnAddAfter', '', 1, 1), +(901, 'gSitemapAppendUrls', 'GSitemap Append URLs', 'This hook allows a module to add URLs to a generated sitemap', 1, 1), +(902, 'GraphEngine', 'GraphEngine', '', 1, 1), +(903, 'actionProductCoverage', 'actionProductCoverage', '', 1, 1), +(904, 'GridEngine', 'GridEngine', '', 1, 1), +(905, 'authentication', 'authentication', '', 1, 1), +(906, 'createAccount', 'createAccount', '', 1, 1), (907, 'actionAdminOrdersListingFieldsModifier', 'actionAdminOrdersListingFieldsModifier', '', 1, 1), (908, 'displayExpressCheckout', 'displayExpressCheckout', '', 1, 1), (909, 'actionObjectOrderPaymentAddAfter', 'actionObjectOrderPaymentAddAfter', '', 1, 1), @@ -8286,7 +6400,7 @@ CREATE TABLE `ps_hook_alias` ( `name` varchar(191) NOT NULL, PRIMARY KEY (`id_hook_alias`), UNIQUE KEY `alias` (`alias`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_hook_alias` (`id_hook_alias`, `alias`, `name`) VALUES (1, 'newOrder', 'actionValidateOrder'), @@ -8381,14 +6495,14 @@ INSERT INTO `ps_hook_alias` (`id_hook_alias`, `alias`, `name`) VALUES DROP TABLE IF EXISTS `ps_hook_module`; CREATE TABLE `ps_hook_module` ( `id_module` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_hook` int(10) unsigned NOT NULL, - `position` tinyint(3) unsigned NOT NULL, + `position` tinyint(2) unsigned NOT NULL, PRIMARY KEY (`id_module`,`id_hook`,`id_shop`), KEY `id_hook` (`id_hook`), KEY `id_module` (`id_module`), KEY `position` (`id_shop`,`position`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VALUES (1, 1, 42, 1), @@ -8461,66 +6575,66 @@ INSERT INTO `ps_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VAL (25, 1, 849, 1), (26, 1, 60, 1), (27, 1, 57, 1), -(28, 1, 889, 1), -(28, 1, 890, 1), -(29, 1, 891, 1), -(30, 1, 892, 1), -(30, 1, 893, 1), -(32, 1, 47, 1), +(28, 1, 10, 1), +(31, 1, 889, 1), +(31, 1, 890, 1), +(31, 1, 891, 1), +(31, 1, 892, 1), +(32, 1, 893, 1), (32, 1, 894, 1), (34, 1, 895, 1), -(35, 1, 18, 1), -(35, 1, 37, 1), -(35, 1, 64, 1), -(35, 1, 73, 1), -(35, 1, 78, 1), -(36, 1, 699, 1), -(36, 1, 700, 1), -(36, 1, 703, 1), -(37, 1, 25, 1), -(37, 1, 896, 1), -(37, 1, 897, 1), -(45, 1, 1, 1), -(45, 1, 9, 1), -(45, 1, 59, 1), -(45, 1, 67, 1), -(45, 1, 118, 1), -(45, 1, 888, 1), -(45, 1, 898, 1), -(47, 1, 899, 1), -(50, 1, 8, 1), -(54, 1, 10, 1), -(55, 1, 901, 1), -(60, 1, 902, 1), -(60, 1, 903, 1), +(38, 1, 699, 1), +(38, 1, 700, 1), +(38, 1, 703, 1), +(45, 1, 18, 1), +(45, 1, 37, 1), +(45, 1, 47, 1), +(45, 1, 64, 1), +(45, 1, 73, 1), +(45, 1, 78, 1), +(46, 1, 896, 1), +(46, 1, 897, 1), +(46, 1, 898, 1), +(46, 1, 899, 1), +(46, 1, 900, 1), +(50, 1, 902, 1), +(52, 1, 1, 1), +(52, 1, 9, 1), +(52, 1, 59, 1), +(52, 1, 67, 1), +(52, 1, 118, 1), +(52, 1, 888, 1), +(52, 1, 903, 1), +(53, 1, 8, 1), (60, 1, 904, 1), -(60, 1, 905, 1), -(60, 1, 906, 1), -(66, 1, 83, 1), -(66, 1, 85, 1), -(66, 1, 89, 1), -(66, 1, 90, 1), -(66, 1, 91, 1), -(66, 1, 92, 1), -(66, 1, 93, 1), -(66, 1, 94, 1), -(66, 1, 95, 1), -(66, 1, 96, 1), -(66, 1, 97, 1), -(66, 1, 98, 1), -(66, 1, 99, 1), -(66, 1, 100, 1), -(66, 1, 101, 1), -(66, 1, 102, 1), -(66, 1, 103, 1), -(66, 1, 105, 1), -(66, 1, 428, 1), -(66, 1, 436, 1), -(66, 1, 444, 1), -(66, 1, 660, 1), -(66, 1, 885, 1), -(66, 1, 886, 1), -(66, 1, 887, 1), +(63, 1, 25, 1), +(63, 1, 905, 1), +(63, 1, 906, 1), +(67, 1, 83, 1), +(67, 1, 85, 1), +(67, 1, 89, 1), +(67, 1, 90, 1), +(67, 1, 91, 1), +(67, 1, 92, 1), +(67, 1, 93, 1), +(67, 1, 94, 1), +(67, 1, 95, 1), +(67, 1, 96, 1), +(67, 1, 97, 1), +(67, 1, 98, 1), +(67, 1, 99, 1), +(67, 1, 100, 1), +(67, 1, 101, 1), +(67, 1, 102, 1), +(67, 1, 103, 1), +(67, 1, 105, 1), +(67, 1, 428, 1), +(67, 1, 436, 1), +(67, 1, 444, 1), +(67, 1, 660, 1), +(67, 1, 885, 1), +(67, 1, 886, 1), +(67, 1, 887, 1), (3, 1, 842, 2), (4, 1, 50, 2), (4, 1, 843, 2), @@ -8541,28 +6655,28 @@ INSERT INTO `ps_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VAL (22, 1, 879, 2), (22, 1, 880, 2), (22, 1, 881, 2), -(28, 1, 71, 2), -(30, 1, 889, 2), -(30, 1, 890, 2), -(31, 1, 57, 2), +(28, 1, 15, 2), +(28, 1, 862, 2), +(28, 1, 863, 2), +(28, 1, 864, 2), +(29, 1, 57, 2), +(33, 1, 892, 2), (35, 1, 32, 2), -(35, 1, 47, 2), -(43, 1, 893, 2), -(44, 1, 895, 2), -(45, 1, 77, 2), -(45, 1, 107, 2), -(50, 1, 894, 2), -(54, 1, 15, 2), -(54, 1, 859, 2), -(54, 1, 860, 2), -(54, 1, 861, 2), -(57, 1, 10, 2), -(57, 1, 862, 2), -(57, 1, 863, 2), -(57, 1, 864, 2), -(60, 1, 892, 2), -(62, 1, 865, 2), -(62, 1, 866, 2), +(40, 1, 865, 2), +(40, 1, 866, 2), +(43, 1, 10, 2), +(43, 1, 859, 2), +(43, 1, 860, 2), +(43, 1, 861, 2), +(45, 1, 71, 2), +(46, 1, 890, 2), +(46, 1, 891, 2), +(52, 1, 77, 2), +(52, 1, 107, 2), +(53, 1, 893, 2), +(55, 1, 895, 2), +(58, 1, 889, 2), +(64, 1, 47, 2), (2, 1, 840, 3), (5, 1, 42, 3), (8, 1, 852, 3), @@ -8574,22 +6688,22 @@ INSERT INTO `ps_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VAL (17, 1, 21, 3), (19, 1, 842, 3), (25, 1, 879, 3), -(28, 1, 843, 3), -(33, 1, 57, 3), -(35, 1, 71, 3), -(39, 1, 26, 3), -(40, 1, 889, 3), -(40, 1, 890, 3), -(42, 1, 124, 3), -(45, 1, 50, 3), -(45, 1, 60, 3), -(45, 1, 880, 3), -(45, 1, 881, 3), -(46, 1, 895, 3), -(49, 1, 32, 3), -(55, 1, 894, 3), -(57, 1, 15, 3), -(66, 1, 84, 3), +(30, 1, 57, 3), +(40, 1, 32, 3), +(40, 1, 60, 3), +(43, 1, 15, 3), +(46, 1, 843, 3), +(48, 1, 26, 3), +(49, 1, 124, 3), +(52, 1, 50, 3), +(52, 1, 880, 3), +(52, 1, 881, 3), +(57, 1, 71, 3), +(58, 1, 890, 3), +(59, 1, 895, 3), +(62, 1, 889, 3), +(64, 1, 893, 3), +(67, 1, 84, 3), (3, 1, 42, 4), (9, 1, 852, 4), (15, 1, 16, 4), @@ -8597,303 +6711,64 @@ INSERT INTO `ps_hook_module` (`id_module`, `id_shop`, `id_hook`, `position`) VAL (18, 1, 20, 4), (18, 1, 21, 4), (22, 1, 17, 4), -(29, 1, 843, 4), -(38, 1, 57, 4), -(45, 1, 842, 4), -(56, 1, 32, 4), -(56, 1, 71, 4), -(60, 1, 890, 4), +(33, 1, 57, 4), +(45, 1, 32, 4), +(50, 1, 843, 4), +(52, 1, 60, 4), +(52, 1, 842, 4), +(58, 1, 71, 4), (61, 1, 895, 4), -(62, 1, 60, 4), -(66, 1, 15, 4), +(62, 1, 890, 4), +(67, 1, 15, 4), (16, 1, 16, 5), (18, 1, 29, 5), -(35, 1, 17, 5), -(35, 1, 42, 5), -(39, 1, 57, 5), -(40, 1, 843, 5), -(49, 1, 20, 5), -(49, 1, 21, 5), -(62, 1, 32, 5), -(63, 1, 895, 5), +(35, 1, 20, 5), +(35, 1, 21, 5), +(36, 1, 57, 5), +(45, 1, 17, 5), +(45, 1, 42, 5), +(57, 1, 32, 5), +(58, 1, 843, 5), +(65, 1, 895, 5), (17, 1, 16, 6), -(41, 1, 57, 6), -(45, 1, 29, 6), -(60, 1, 843, 6), +(35, 1, 29, 6), +(37, 1, 57, 6), +(62, 1, 843, 6), (18, 1, 16, 7), -(43, 1, 57, 7), -(49, 1, 29, 7), -(35, 1, 16, 8), -(51, 1, 57, 8), -(52, 1, 57, 9), -(53, 1, 57, 10), -(58, 1, 57, 11), -(59, 1, 57, 12), -(65, 1, 57, 13), -(1, 2, 42, 1), -(1, 2, 143, 1), -(1, 2, 325, 1), -(2, 2, 23, 1), -(2, 2, 27, 1), -(2, 2, 839, 1), -(2, 2, 841, 1), -(2, 2, 842, 1), -(3, 2, 29, 1), -(3, 2, 45, 1), -(3, 2, 50, 1), -(3, 2, 77, 1), -(3, 2, 104, 1), -(3, 2, 107, 1), -(3, 2, 209, 1), -(3, 2, 843, 1), -(3, 2, 844, 1), -(4, 2, 48, 1), -(4, 2, 124, 1), -(5, 2, 846, 1), -(5, 2, 847, 1), -(5, 2, 848, 1), -(5, 2, 850, 1), -(6, 2, 852, 1), -(7, 2, 851, 1), -(9, 2, 17, 1), -(10, 2, 26, 1), -(10, 2, 84, 1), -(10, 2, 853, 1), -(10, 2, 854, 1), -(10, 2, 855, 1), -(10, 2, 856, 1), -(10, 2, 857, 1), -(10, 2, 858, 1), -(10, 2, 859, 1), -(10, 2, 860, 1), -(10, 2, 861, 1), -(10, 2, 862, 1), -(10, 2, 863, 1), -(10, 2, 864, 1), -(10, 2, 865, 1), -(10, 2, 866, 1), -(10, 2, 867, 1), -(10, 2, 868, 1), -(11, 2, 869, 1), -(12, 2, 16, 1), -(13, 2, 20, 1), -(13, 2, 21, 1), -(13, 2, 870, 1), -(13, 2, 872, 1), -(14, 2, 873, 1), -(16, 2, 874, 1), -(16, 2, 875, 1), -(16, 2, 876, 1), -(18, 2, 71, 1), -(19, 2, 49, 1), -(19, 2, 840, 1), -(19, 2, 877, 1), -(19, 2, 879, 1), -(19, 2, 880, 1), -(19, 2, 881, 1), -(21, 2, 882, 1), -(21, 2, 883, 1), -(22, 2, 32, 1), -(22, 2, 137, 1), -(22, 2, 884, 1), -(23, 2, 15, 1), -(25, 2, 849, 1), -(26, 2, 60, 1), -(27, 2, 57, 1), -(28, 2, 889, 1), -(28, 2, 890, 1), -(29, 2, 891, 1), -(30, 2, 892, 1), -(30, 2, 893, 1), -(32, 2, 47, 1), -(32, 2, 894, 1), -(34, 2, 895, 1), -(35, 2, 18, 1), -(35, 2, 37, 1), -(35, 2, 64, 1), -(35, 2, 73, 1), -(35, 2, 78, 1), -(36, 2, 699, 1), -(36, 2, 700, 1), -(36, 2, 703, 1), -(37, 2, 25, 1), -(37, 2, 896, 1), -(37, 2, 897, 1), -(45, 2, 1, 1), -(45, 2, 9, 1), -(45, 2, 59, 1), -(45, 2, 67, 1), -(45, 2, 118, 1), -(45, 2, 888, 1), -(45, 2, 898, 1), -(47, 2, 899, 1), -(50, 2, 8, 1), -(54, 2, 10, 1), -(55, 2, 901, 1), -(60, 2, 902, 1), -(60, 2, 903, 1), -(60, 2, 904, 1), -(60, 2, 905, 1), -(60, 2, 906, 1), -(66, 2, 83, 1), -(66, 2, 85, 1), -(66, 2, 89, 1), -(66, 2, 90, 1), -(66, 2, 91, 1), -(66, 2, 92, 1), -(66, 2, 93, 1), -(66, 2, 94, 1), -(66, 2, 95, 1), -(66, 2, 96, 1), -(66, 2, 97, 1), -(66, 2, 98, 1), -(66, 2, 99, 1), -(66, 2, 100, 1), -(66, 2, 101, 1), -(66, 2, 102, 1), -(66, 2, 103, 1), -(66, 2, 105, 1), -(66, 2, 428, 1), -(66, 2, 436, 1), -(66, 2, 444, 1), -(66, 2, 660, 1), -(66, 2, 885, 1), -(66, 2, 886, 1), -(66, 2, 887, 1), -(3, 2, 842, 2), -(4, 2, 50, 2), -(4, 2, 843, 2), -(7, 2, 852, 2), -(11, 2, 17, 2), -(11, 2, 26, 2), -(12, 2, 868, 2), -(13, 2, 16, 2), -(13, 2, 29, 2), -(13, 2, 84, 2), -(16, 2, 20, 2), -(16, 2, 21, 2), -(19, 2, 48, 2), -(19, 2, 124, 2), -(20, 2, 840, 2), -(21, 2, 42, 2), -(22, 2, 60, 2), -(22, 2, 879, 2), -(22, 2, 880, 2), -(22, 2, 881, 2), -(28, 2, 71, 2), -(30, 2, 889, 2), -(30, 2, 890, 2), -(31, 2, 57, 2), -(35, 2, 32, 2), -(35, 2, 47, 2), -(43, 2, 893, 2), -(44, 2, 895, 2), -(45, 2, 77, 2), -(45, 2, 107, 2), -(50, 2, 894, 2), -(54, 2, 15, 2), -(54, 2, 859, 2), -(54, 2, 860, 2), -(54, 2, 861, 2), -(57, 2, 10, 2), -(57, 2, 862, 2), -(57, 2, 863, 2), -(57, 2, 864, 2), -(60, 2, 892, 2), -(62, 2, 865, 2), -(62, 2, 866, 2), -(2, 2, 840, 3), -(5, 2, 42, 3), -(8, 2, 852, 3), -(12, 2, 17, 3), -(14, 2, 16, 3), -(15, 2, 868, 3), -(16, 2, 29, 3), -(17, 2, 20, 3), -(17, 2, 21, 3), -(19, 2, 842, 3), -(25, 2, 879, 3), -(28, 2, 843, 3), -(33, 2, 57, 3), -(35, 2, 71, 3), -(39, 2, 26, 3), -(40, 2, 889, 3), -(40, 2, 890, 3), -(42, 2, 124, 3), -(45, 2, 50, 3), -(45, 2, 60, 3), -(45, 2, 880, 3), -(45, 2, 881, 3), -(46, 2, 895, 3), -(49, 2, 32, 3), -(55, 2, 894, 3), -(57, 2, 15, 3), -(66, 2, 84, 3), -(3, 2, 42, 4), -(9, 2, 852, 4), -(15, 2, 16, 4), -(17, 2, 29, 4), -(18, 2, 20, 4), -(18, 2, 21, 4), -(22, 2, 17, 4), -(29, 2, 843, 4), -(38, 2, 57, 4), -(45, 2, 842, 4), -(56, 2, 32, 4), -(56, 2, 71, 4), -(60, 2, 890, 4), -(61, 2, 895, 4), -(62, 2, 60, 4), -(66, 2, 15, 4), -(16, 2, 16, 5), -(18, 2, 29, 5), -(35, 2, 17, 5), -(35, 2, 42, 5), -(39, 2, 57, 5), -(40, 2, 843, 5), -(49, 2, 20, 5), -(49, 2, 21, 5), -(62, 2, 32, 5), -(63, 2, 895, 5), -(17, 2, 16, 6), -(41, 2, 57, 6), -(45, 2, 29, 6), -(60, 2, 843, 6), -(18, 2, 16, 7), -(43, 2, 57, 7), -(49, 2, 29, 7), -(35, 2, 16, 8), -(51, 2, 57, 8), -(52, 2, 57, 9), -(53, 2, 57, 10), -(58, 2, 57, 11), -(59, 2, 57, 12), -(65, 2, 57, 13); +(39, 1, 57, 7), +(52, 1, 29, 7), +(41, 1, 57, 8), +(45, 1, 16, 8), +(42, 1, 57, 9), +(44, 1, 57, 10), +(48, 1, 57, 11), +(54, 1, 57, 12), +(56, 1, 57, 13); DROP TABLE IF EXISTS `ps_hook_module_exceptions`; CREATE TABLE `ps_hook_module_exceptions` ( `id_hook_module_exceptions` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_module` int(10) unsigned NOT NULL, `id_hook` int(10) unsigned NOT NULL, `file_name` varchar(255) DEFAULT NULL, PRIMARY KEY (`id_hook_module_exceptions`), KEY `id_module` (`id_module`), KEY `id_hook` (`id_hook`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_image`; CREATE TABLE `ps_image` ( `id_image` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_product` int(10) unsigned NOT NULL, - `position` smallint(5) unsigned NOT NULL DEFAULT '0', - `cover` tinyint(3) unsigned DEFAULT NULL, + `position` smallint(2) unsigned NOT NULL DEFAULT '0', + `cover` tinyint(1) unsigned DEFAULT NULL, PRIMARY KEY (`id_image`), UNIQUE KEY `id_product_cover` (`id_product`,`cover`), UNIQUE KEY `idx_product_image` (`id_image`,`id_product`,`cover`), KEY `image_product` (`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_image` (`id_image`, `id_product`, `position`, `cover`) VALUES (1, 1, 1, 1), @@ -8927,7 +6802,7 @@ CREATE TABLE `ps_image_lang` ( `legend` varchar(128) DEFAULT NULL, PRIMARY KEY (`id_image`,`id_lang`), KEY `id_image` (`id_image`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_image_lang` (`id_image`, `id_lang`, `legend`) VALUES (1, 1, 'Hummingbird printed t-shirt'), @@ -9003,61 +6878,38 @@ INSERT INTO `ps_image_lang` (`id_image`, `id_lang`, `legend`) VALUES DROP TABLE IF EXISTS `ps_image_shop`; CREATE TABLE `ps_image_shop` ( `id_product` int(10) unsigned NOT NULL, - `id_image` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, - `cover` tinyint(3) unsigned DEFAULT NULL, + `id_image` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, + `cover` tinyint(1) unsigned DEFAULT NULL, PRIMARY KEY (`id_image`,`id_shop`), UNIQUE KEY `id_product` (`id_product`,`id_shop`,`cover`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_image_shop` (`id_product`, `id_image`, `id_shop`, `cover`) VALUES (1, 2, 1, NULL), (1, 1, 1, 1), -(1, 2, 2, NULL), -(1, 1, 2, 1), (2, 21, 1, 1), -(2, 21, 2, 1), (3, 3, 1, 1), -(3, 3, 2, 1), (4, 4, 1, 1), -(4, 4, 2, 1), (5, 5, 1, 1), -(5, 5, 2, 1), (6, 6, 1, 1), -(6, 6, 2, 1), (7, 7, 1, 1), -(7, 7, 2, 1), (8, 8, 1, 1), -(8, 8, 2, 1), (9, 10, 1, NULL), (9, 9, 1, 1), -(9, 10, 2, NULL), -(9, 9, 2, 1), (10, 12, 1, NULL), (10, 11, 1, 1), -(10, 12, 2, NULL), -(10, 11, 2, 1), (11, 14, 1, NULL), (11, 13, 1, 1), -(11, 14, 2, NULL), -(11, 13, 2, 1), (12, 15, 1, 1), -(12, 15, 2, 1), (13, 16, 1, 1), -(13, 16, 2, 1), (14, 17, 1, 1), -(14, 17, 2, 1), (15, 23, 1, 1), -(15, 23, 2, 1), (16, 18, 1, 1), -(16, 18, 2, 1), (17, 19, 1, 1), -(17, 19, 2, 1), (18, 20, 1, 1), -(18, 20, 2, 1), -(19, 22, 1, 1), -(19, 22, 2, 1); +(19, 22, 1, 1); DROP TABLE IF EXISTS `ps_image_type`; CREATE TABLE `ps_image_type` ( @@ -9072,7 +6924,7 @@ CREATE TABLE `ps_image_type` ( `stores` tinyint(1) NOT NULL DEFAULT '1', PRIMARY KEY (`id_image_type`), KEY `image_type_name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_image_type` (`id_image_type`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `stores`) VALUES (1, 'cart_default', 125, 125, 1, 0, 0, 0, 0), @@ -9085,12 +6937,12 @@ INSERT INTO `ps_image_type` (`id_image_type`, `name`, `width`, `height`, `produc DROP TABLE IF EXISTS `ps_import_match`; CREATE TABLE `ps_import_match` ( - `id_import_match` int(11) NOT NULL AUTO_INCREMENT, + `id_import_match` int(10) NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL, `match` text NOT NULL, - `skip` int(11) NOT NULL, + `skip` int(2) NOT NULL, PRIMARY KEY (`id_import_match`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_info`; @@ -9113,11 +6965,8 @@ CREATE TABLE `ps_info_lang` ( INSERT INTO `ps_info_lang` (`id_info`, `id_shop`, `id_lang`, `text`) VALUES (1, 1, 1, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'), -(1, 2, 1, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'), (1, 1, 2, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'), -(1, 2, 2, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'), -(1, 1, 3, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'), -(1, 2, 3, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'); +(1, 1, 3, '

Custom Text Block

\n

Lorem ipsum dolor sit amet conse ctetu

\n

Sit amet conse ctetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit.

'); DROP TABLE IF EXISTS `ps_info_shop`; CREATE TABLE `ps_info_shop` ( @@ -9127,8 +6976,7 @@ CREATE TABLE `ps_info_shop` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_info_shop` (`id_info`, `id_shop`) VALUES -(1, 1), -(1, 2); +(1, 1); DROP TABLE IF EXISTS `ps_lang`; CREATE TABLE `ps_lang` ( @@ -9146,8 +6994,8 @@ CREATE TABLE `ps_lang` ( INSERT INTO `ps_lang` (`id_lang`, `name`, `active`, `iso_code`, `language_code`, `locale`, `date_format_lite`, `date_format_full`, `is_rtl`) VALUES (1, 'English (English)', 1, 'en', 'en-us', 'en-US', 'm/d/Y', 'm/d/Y H:i:s', 0), -(2, 'Deutsch (German)', 1, 'de', 'de-de', 'de-DE', 'd.m.Y', 'd.m.Y H:i:s', 0), -(3, 'Nederlands (Dutch)', 1, 'nl', 'nl-nl', 'nl-NL', 'd-m-Y', 'd-m-Y H:i:s', 0); +(2, 'Nederlands (Dutch)', 1, 'nl', 'nl-nl', 'nl-NL', 'd-m-Y', 'd-m-Y H:i:s', 0), +(3, 'Deutsch (German)', 1, 'de', 'de-de', 'de-DE', 'd.m.Y', 'd.m.Y H:i:s', 0); DROP TABLE IF EXISTS `ps_lang_shop`; CREATE TABLE `ps_lang_shop` ( @@ -9160,16 +7008,13 @@ CREATE TABLE `ps_lang_shop` ( INSERT INTO `ps_lang_shop` (`id_lang`, `id_shop`) VALUES (1, 1), -(1, 2), (2, 1), -(2, 2), -(3, 1), -(3, 2); +(3, 1); DROP TABLE IF EXISTS `ps_layered_category`; CREATE TABLE `ps_layered_category` ( `id_layered_category` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `id_category` int(10) unsigned NOT NULL, `id_value` int(10) unsigned DEFAULT '0', `type` enum('category','id_feature','id_attribute_group','quantity','condition','manufacturer','weight','price') NOT NULL, @@ -9183,101 +7028,101 @@ CREATE TABLE `ps_layered_category` ( INSERT INTO `ps_layered_category` (`id_layered_category`, `id_shop`, `id_category`, `id_value`, `type`, `position`, `filter_type`, `filter_show_limit`) VALUES (1, 1, 2, NULL, 'category', 1, 0, 0), -(2, 1, 2, 1, 'id_attribute_group', 2, 0, 0), -(3, 1, 2, 2, 'id_attribute_group', 3, 0, 0), +(2, 1, 2, 2, 'id_attribute_group', 2, 0, 0), +(3, 1, 2, 3, 'id_attribute_group', 3, 0, 0), (4, 1, 2, 1, 'id_feature', 4, 0, 0), -(5, 1, 2, 2, 'id_feature', 5, 0, 0), -(6, 1, 2, NULL, 'quantity', 6, 0, 0), -(7, 1, 2, NULL, 'manufacturer', 7, 0, 0), -(8, 1, 2, NULL, 'condition', 8, 0, 0), -(9, 1, 2, NULL, 'weight', 9, 0, 0), -(10, 1, 2, NULL, 'price', 10, 0, 0), -(11, 1, 2, 3, 'id_attribute_group', 11, 0, 0), -(12, 1, 2, 4, 'id_attribute_group', 12, 0, 0), +(5, 1, 2, NULL, 'quantity', 5, 0, 0), +(6, 1, 2, NULL, 'manufacturer', 6, 0, 0), +(7, 1, 2, NULL, 'condition', 7, 0, 0), +(8, 1, 2, NULL, 'weight', 8, 0, 0), +(9, 1, 2, NULL, 'price', 9, 0, 0), +(10, 1, 2, 4, 'id_attribute_group', 10, 0, 0), +(11, 1, 2, 5, 'id_attribute_group', 11, 0, 0), +(12, 1, 2, 2, 'id_feature', 12, 0, 0), (13, 1, 3, NULL, 'category', 1, 0, 0), -(14, 1, 3, 1, 'id_attribute_group', 2, 0, 0), -(15, 1, 3, 2, 'id_attribute_group', 3, 0, 0), +(14, 1, 3, 2, 'id_attribute_group', 2, 0, 0), +(15, 1, 3, 3, 'id_attribute_group', 3, 0, 0), (16, 1, 3, 1, 'id_feature', 4, 0, 0), -(17, 1, 3, 2, 'id_feature', 5, 0, 0), -(18, 1, 3, NULL, 'quantity', 6, 0, 0), -(19, 1, 3, NULL, 'manufacturer', 7, 0, 0), -(20, 1, 3, NULL, 'condition', 8, 0, 0), -(21, 1, 3, NULL, 'weight', 9, 0, 0), -(22, 1, 3, NULL, 'price', 10, 0, 0), -(23, 1, 3, 3, 'id_attribute_group', 11, 0, 0), -(24, 1, 3, 4, 'id_attribute_group', 12, 0, 0), +(17, 1, 3, NULL, 'quantity', 5, 0, 0), +(18, 1, 3, NULL, 'manufacturer', 6, 0, 0), +(19, 1, 3, NULL, 'condition', 7, 0, 0), +(20, 1, 3, NULL, 'weight', 8, 0, 0), +(21, 1, 3, NULL, 'price', 9, 0, 0), +(22, 1, 3, 4, 'id_attribute_group', 10, 0, 0), +(23, 1, 3, 5, 'id_attribute_group', 11, 0, 0), +(24, 1, 3, 2, 'id_feature', 12, 0, 0), (25, 1, 4, NULL, 'category', 1, 0, 0), -(26, 1, 4, 1, 'id_attribute_group', 2, 0, 0), -(27, 1, 4, 2, 'id_attribute_group', 3, 0, 0), +(26, 1, 4, 2, 'id_attribute_group', 2, 0, 0), +(27, 1, 4, 3, 'id_attribute_group', 3, 0, 0), (28, 1, 4, 1, 'id_feature', 4, 0, 0), -(29, 1, 4, 2, 'id_feature', 5, 0, 0), -(30, 1, 4, NULL, 'quantity', 6, 0, 0), -(31, 1, 4, NULL, 'manufacturer', 7, 0, 0), -(32, 1, 4, NULL, 'condition', 8, 0, 0), -(33, 1, 4, NULL, 'weight', 9, 0, 0), -(34, 1, 4, NULL, 'price', 10, 0, 0), -(35, 1, 4, 3, 'id_attribute_group', 11, 0, 0), -(36, 1, 4, 4, 'id_attribute_group', 12, 0, 0), +(29, 1, 4, NULL, 'quantity', 5, 0, 0), +(30, 1, 4, NULL, 'manufacturer', 6, 0, 0), +(31, 1, 4, NULL, 'condition', 7, 0, 0), +(32, 1, 4, NULL, 'weight', 8, 0, 0), +(33, 1, 4, NULL, 'price', 9, 0, 0), +(34, 1, 4, 4, 'id_attribute_group', 10, 0, 0), +(35, 1, 4, 5, 'id_attribute_group', 11, 0, 0), +(36, 1, 4, 2, 'id_feature', 12, 0, 0), (37, 1, 5, NULL, 'category', 1, 0, 0), -(38, 1, 5, 1, 'id_attribute_group', 2, 0, 0), -(39, 1, 5, 2, 'id_attribute_group', 3, 0, 0), +(38, 1, 5, 2, 'id_attribute_group', 2, 0, 0), +(39, 1, 5, 3, 'id_attribute_group', 3, 0, 0), (40, 1, 5, 1, 'id_feature', 4, 0, 0), -(41, 1, 5, 2, 'id_feature', 5, 0, 0), -(42, 1, 5, NULL, 'quantity', 6, 0, 0), -(43, 1, 5, NULL, 'manufacturer', 7, 0, 0), -(44, 1, 5, NULL, 'condition', 8, 0, 0), -(45, 1, 5, NULL, 'weight', 9, 0, 0), -(46, 1, 5, NULL, 'price', 10, 0, 0), -(47, 1, 5, 3, 'id_attribute_group', 11, 0, 0), -(48, 1, 5, 4, 'id_attribute_group', 12, 0, 0), +(41, 1, 5, NULL, 'quantity', 5, 0, 0), +(42, 1, 5, NULL, 'manufacturer', 6, 0, 0), +(43, 1, 5, NULL, 'condition', 7, 0, 0), +(44, 1, 5, NULL, 'weight', 8, 0, 0), +(45, 1, 5, NULL, 'price', 9, 0, 0), +(46, 1, 5, 4, 'id_attribute_group', 10, 0, 0), +(47, 1, 5, 5, 'id_attribute_group', 11, 0, 0), +(48, 1, 5, 2, 'id_feature', 12, 0, 0), (49, 1, 9, NULL, 'category', 1, 0, 0), -(50, 1, 9, 1, 'id_attribute_group', 2, 0, 0), -(51, 1, 9, 2, 'id_attribute_group', 3, 0, 0), +(50, 1, 9, 2, 'id_attribute_group', 2, 0, 0), +(51, 1, 9, 3, 'id_attribute_group', 3, 0, 0), (52, 1, 9, 1, 'id_feature', 4, 0, 0), -(53, 1, 9, 2, 'id_feature', 5, 0, 0), -(54, 1, 9, NULL, 'quantity', 6, 0, 0), -(55, 1, 9, NULL, 'manufacturer', 7, 0, 0), -(56, 1, 9, NULL, 'condition', 8, 0, 0), -(57, 1, 9, NULL, 'weight', 9, 0, 0), -(58, 1, 9, NULL, 'price', 10, 0, 0), -(59, 1, 9, 3, 'id_attribute_group', 11, 0, 0), -(60, 1, 9, 4, 'id_attribute_group', 12, 0, 0), +(53, 1, 9, NULL, 'quantity', 5, 0, 0), +(54, 1, 9, NULL, 'manufacturer', 6, 0, 0), +(55, 1, 9, NULL, 'condition', 7, 0, 0), +(56, 1, 9, NULL, 'weight', 8, 0, 0), +(57, 1, 9, NULL, 'price', 9, 0, 0), +(58, 1, 9, 4, 'id_attribute_group', 10, 0, 0), +(59, 1, 9, 5, 'id_attribute_group', 11, 0, 0), +(60, 1, 9, 2, 'id_feature', 12, 0, 0), (61, 1, 6, NULL, 'category', 1, 0, 0), -(62, 1, 6, 1, 'id_attribute_group', 2, 0, 0), -(63, 1, 6, 2, 'id_attribute_group', 3, 0, 0), +(62, 1, 6, 2, 'id_attribute_group', 2, 0, 0), +(63, 1, 6, 3, 'id_attribute_group', 3, 0, 0), (64, 1, 6, 1, 'id_feature', 4, 0, 0), -(65, 1, 6, 2, 'id_feature', 5, 0, 0), -(66, 1, 6, NULL, 'quantity', 6, 0, 0), -(67, 1, 6, NULL, 'manufacturer', 7, 0, 0), -(68, 1, 6, NULL, 'condition', 8, 0, 0), -(69, 1, 6, NULL, 'weight', 9, 0, 0), -(70, 1, 6, NULL, 'price', 10, 0, 0), -(71, 1, 6, 3, 'id_attribute_group', 11, 0, 0), -(72, 1, 6, 4, 'id_attribute_group', 12, 0, 0), +(65, 1, 6, NULL, 'quantity', 5, 0, 0), +(66, 1, 6, NULL, 'manufacturer', 6, 0, 0), +(67, 1, 6, NULL, 'condition', 7, 0, 0), +(68, 1, 6, NULL, 'weight', 8, 0, 0), +(69, 1, 6, NULL, 'price', 9, 0, 0), +(70, 1, 6, 4, 'id_attribute_group', 10, 0, 0), +(71, 1, 6, 5, 'id_attribute_group', 11, 0, 0), +(72, 1, 6, 2, 'id_feature', 12, 0, 0), (73, 1, 8, NULL, 'category', 1, 0, 0), -(74, 1, 8, 1, 'id_attribute_group', 2, 0, 0), -(75, 1, 8, 2, 'id_attribute_group', 3, 0, 0), +(74, 1, 8, 2, 'id_attribute_group', 2, 0, 0), +(75, 1, 8, 3, 'id_attribute_group', 3, 0, 0), (76, 1, 8, 1, 'id_feature', 4, 0, 0), -(77, 1, 8, 2, 'id_feature', 5, 0, 0), -(78, 1, 8, NULL, 'quantity', 6, 0, 0), -(79, 1, 8, NULL, 'manufacturer', 7, 0, 0), -(80, 1, 8, NULL, 'condition', 8, 0, 0), -(81, 1, 8, NULL, 'weight', 9, 0, 0), -(82, 1, 8, NULL, 'price', 10, 0, 0), -(83, 1, 8, 3, 'id_attribute_group', 11, 0, 0), -(84, 1, 8, 4, 'id_attribute_group', 12, 0, 0), +(77, 1, 8, NULL, 'quantity', 5, 0, 0), +(78, 1, 8, NULL, 'manufacturer', 6, 0, 0), +(79, 1, 8, NULL, 'condition', 7, 0, 0), +(80, 1, 8, NULL, 'weight', 8, 0, 0), +(81, 1, 8, NULL, 'price', 9, 0, 0), +(82, 1, 8, 4, 'id_attribute_group', 10, 0, 0), +(83, 1, 8, 5, 'id_attribute_group', 11, 0, 0), +(84, 1, 8, 2, 'id_feature', 12, 0, 0), (85, 1, 7, NULL, 'category', 1, 0, 0), -(86, 1, 7, 1, 'id_attribute_group', 2, 0, 0), -(87, 1, 7, 2, 'id_attribute_group', 3, 0, 0), +(86, 1, 7, 2, 'id_attribute_group', 2, 0, 0), +(87, 1, 7, 3, 'id_attribute_group', 3, 0, 0), (88, 1, 7, 1, 'id_feature', 4, 0, 0), -(89, 1, 7, 2, 'id_feature', 5, 0, 0), -(90, 1, 7, NULL, 'quantity', 6, 0, 0), -(91, 1, 7, NULL, 'manufacturer', 7, 0, 0), -(92, 1, 7, NULL, 'condition', 8, 0, 0), -(93, 1, 7, NULL, 'weight', 9, 0, 0), -(94, 1, 7, NULL, 'price', 10, 0, 0), -(95, 1, 7, 3, 'id_attribute_group', 11, 0, 0), -(96, 1, 7, 4, 'id_attribute_group', 12, 0, 0); +(89, 1, 7, NULL, 'quantity', 5, 0, 0), +(90, 1, 7, NULL, 'manufacturer', 6, 0, 0), +(91, 1, 7, NULL, 'condition', 7, 0, 0), +(92, 1, 7, NULL, 'weight', 8, 0, 0), +(93, 1, 7, NULL, 'price', 9, 0, 0), +(94, 1, 7, 4, 'id_attribute_group', 10, 0, 0), +(95, 1, 7, 5, 'id_attribute_group', 11, 0, 0), +(96, 1, 7, 2, 'id_feature', 12, 0, 0); DROP TABLE IF EXISTS `ps_layered_filter`; CREATE TABLE `ps_layered_filter` ( @@ -9290,7 +7135,7 @@ CREATE TABLE `ps_layered_filter` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_layered_filter` (`id_layered_filter`, `name`, `filters`, `n_categories`, `date_add`) VALUES -(1, 'My template 2023-05-02', 'a:14:{s:10:\"categories\";a:8:{i:0;i:2;i:1;i:3;i:2;i:4;i:3;i:5;i:4;i:9;i:5;i:6;i:6;i:8;i:7;i:7;}s:9:\"shop_list\";a:1:{i:1;i:1;}s:31:\"layered_selection_subcategories\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_1\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_2\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:24:\"layered_selection_feat_1\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:24:\"layered_selection_feat_2\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:23:\"layered_selection_stock\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:30:\"layered_selection_manufacturer\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:27:\"layered_selection_condition\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:31:\"layered_selection_weight_slider\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:30:\"layered_selection_price_slider\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_3\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_4\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}}', 8, '2023-05-02 10:18:41'); +(1, 'My template 2023-08-28', 'a:14:{s:10:\"categories\";a:8:{i:0;i:2;i:1;i:3;i:2;i:4;i:3;i:5;i:4;i:9;i:5;i:6;i:6;i:8;i:7;i:7;}s:9:\"shop_list\";a:1:{i:1;i:1;}s:31:\"layered_selection_subcategories\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_2\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_3\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:24:\"layered_selection_feat_1\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:23:\"layered_selection_stock\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:30:\"layered_selection_manufacturer\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:27:\"layered_selection_condition\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:31:\"layered_selection_weight_slider\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:30:\"layered_selection_price_slider\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_4\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:22:\"layered_selection_ag_5\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}s:24:\"layered_selection_feat_2\";a:2:{s:11:\"filter_type\";i:0;s:17:\"filter_show_limit\";i:0;}}', 8, '2023-08-28 11:28:06'); DROP TABLE IF EXISTS `ps_layered_filter_block`; CREATE TABLE `ps_layered_filter_block` ( @@ -9303,7 +7148,7 @@ CREATE TABLE `ps_layered_filter_block` ( DROP TABLE IF EXISTS `ps_layered_filter_shop`; CREATE TABLE `ps_layered_filter_shop` ( `id_layered_filter` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_layered_filter`,`id_shop`), KEY `id_shop` (`id_shop`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -9322,7 +7167,8 @@ INSERT INTO `ps_layered_indexable_attribute_group` (`id_attribute_group`, `index (1, 0), (2, 0), (3, 0), -(4, 0); +(4, 0), +(5, 0); DROP TABLE IF EXISTS `ps_layered_indexable_attribute_group_lang_value`; CREATE TABLE `ps_layered_indexable_attribute_group_lang_value` ( @@ -9353,7 +7199,8 @@ CREATE TABLE `ps_layered_indexable_feature` ( INSERT INTO `ps_layered_indexable_feature` (`id_feature`, `indexable`) VALUES (1, 0), -(2, 0); +(2, 0), +(3, 0); DROP TABLE IF EXISTS `ps_layered_indexable_feature_lang_value`; CREATE TABLE `ps_layered_indexable_feature_lang_value` ( @@ -9393,117 +7240,117 @@ INSERT INTO `ps_layered_price_index` (`id_product`, `id_currency`, `id_shop`, `p (1, 1, 1, 19.120000, 23.900000, 8), (1, 1, 1, 19.120000, 23.900000, 17), (1, 1, 1, 19.120000, 23.900000, 21), -(1, 2, 1, 20.971791, 26.214739, 8), -(1, 2, 1, 20.971791, 26.214739, 17), -(1, 2, 1, 20.971791, 26.214739, 21), +(1, 2, 1, 20.644170, 25.805212, 8), +(1, 2, 1, 20.644170, 25.805212, 17), +(1, 2, 1, 20.644170, 25.805212, 21), (2, 1, 1, 28.720000, 35.900000, 8), (2, 1, 1, 28.720000, 35.900000, 17), (2, 1, 1, 28.720000, 35.900000, 21), -(2, 2, 1, 31.501561, 39.376951, 8), -(2, 2, 1, 31.501561, 39.376951, 17), -(2, 2, 1, 31.501561, 39.376951, 21), +(2, 2, 1, 31.009444, 38.761804, 8), +(2, 2, 1, 31.009444, 38.761804, 17), +(2, 2, 1, 31.009444, 38.761804, 21), (3, 1, 1, 29.000000, 29.000000, 8), (3, 1, 1, 29.000000, 29.000000, 17), (3, 1, 1, 29.000000, 29.000000, 21), -(3, 2, 1, 31.808679, 31.808679, 8), -(3, 2, 1, 31.808679, 31.808679, 17), -(3, 2, 1, 31.808679, 31.808679, 21), +(3, 2, 1, 31.311764, 31.311764, 8), +(3, 2, 1, 31.311764, 31.311764, 17), +(3, 2, 1, 31.311764, 31.311764, 21), (4, 1, 1, 29.000000, 29.000000, 8), (4, 1, 1, 29.000000, 29.000000, 17), (4, 1, 1, 29.000000, 29.000000, 21), -(4, 2, 1, 31.808679, 31.808679, 8), -(4, 2, 1, 31.808679, 31.808679, 17), -(4, 2, 1, 31.808679, 31.808679, 21), +(4, 2, 1, 31.311764, 31.311764, 8), +(4, 2, 1, 31.311764, 31.311764, 17), +(4, 2, 1, 31.311764, 31.311764, 21), (5, 1, 1, 29.000000, 29.000000, 8), (5, 1, 1, 29.000000, 29.000000, 17), (5, 1, 1, 29.000000, 29.000000, 21), -(5, 2, 1, 31.808679, 31.808679, 8), -(5, 2, 1, 31.808679, 31.808679, 17), -(5, 2, 1, 31.808679, 31.808679, 21), +(5, 2, 1, 31.311764, 31.311764, 8), +(5, 2, 1, 31.311764, 31.311764, 17), +(5, 2, 1, 31.311764, 31.311764, 21), (6, 1, 1, 11.900000, 11.900000, 8), (6, 1, 1, 11.900000, 11.900000, 17), (6, 1, 1, 11.900000, 11.900000, 21), -(6, 2, 1, 13.052527, 13.052527, 8), -(6, 2, 1, 13.052527, 13.052527, 17), -(6, 2, 1, 13.052527, 13.052527, 21), +(6, 2, 1, 12.848620, 12.848620, 8), +(6, 2, 1, 12.848620, 12.848620, 17), +(6, 2, 1, 12.848620, 12.848620, 21), (7, 1, 1, 11.900000, 11.900000, 8), (7, 1, 1, 11.900000, 11.900000, 17), (7, 1, 1, 11.900000, 11.900000, 21), -(7, 2, 1, 13.052527, 13.052527, 8), -(7, 2, 1, 13.052527, 13.052527, 17), -(7, 2, 1, 13.052527, 13.052527, 21), +(7, 2, 1, 12.848620, 12.848620, 8), +(7, 2, 1, 12.848620, 12.848620, 17), +(7, 2, 1, 12.848620, 12.848620, 21), (8, 1, 1, 11.900000, 11.900000, 8), (8, 1, 1, 11.900000, 11.900000, 17), (8, 1, 1, 11.900000, 11.900000, 21), -(8, 2, 1, 13.052527, 13.052527, 8), -(8, 2, 1, 13.052527, 13.052527, 17), -(8, 2, 1, 13.052527, 13.052527, 21), +(8, 2, 1, 12.848620, 12.848620, 8), +(8, 2, 1, 12.848620, 12.848620, 17), +(8, 2, 1, 12.848620, 12.848620, 21), (9, 1, 1, 18.900000, 18.900000, 8), (9, 1, 1, 18.900000, 18.900000, 17), (9, 1, 1, 18.900000, 18.900000, 21), -(9, 2, 1, 20.730484, 20.730484, 8), -(9, 2, 1, 20.730484, 20.730484, 17), -(9, 2, 1, 20.730484, 20.730484, 21), +(9, 2, 1, 20.406632, 20.406632, 8), +(9, 2, 1, 20.406632, 20.406632, 17), +(9, 2, 1, 20.406632, 20.406632, 21), (10, 1, 1, 18.900000, 18.900000, 8), (10, 1, 1, 18.900000, 18.900000, 17), (10, 1, 1, 18.900000, 18.900000, 21), -(10, 2, 1, 20.730484, 20.730484, 8), -(10, 2, 1, 20.730484, 20.730484, 17), -(10, 2, 1, 20.730484, 20.730484, 21), +(10, 2, 1, 20.406632, 20.406632, 8), +(10, 2, 1, 20.406632, 20.406632, 17), +(10, 2, 1, 20.406632, 20.406632, 21), (11, 1, 1, 18.900000, 18.900000, 8), (11, 1, 1, 18.900000, 18.900000, 17), (11, 1, 1, 18.900000, 18.900000, 21), -(11, 2, 1, 20.730484, 20.730484, 8), -(11, 2, 1, 20.730484, 20.730484, 17), -(11, 2, 1, 20.730484, 20.730484, 21), +(11, 2, 1, 20.406632, 20.406632, 8), +(11, 2, 1, 20.406632, 20.406632, 17), +(11, 2, 1, 20.406632, 20.406632, 21), (12, 1, 1, 9.000000, 9.000000, 8), (12, 1, 1, 9.000000, 9.000000, 17), (12, 1, 1, 9.000000, 9.000000, 21), -(12, 2, 1, 9.871659, 9.871659, 8), -(12, 2, 1, 9.871659, 9.871659, 17), -(12, 2, 1, 9.871659, 9.871659, 21), +(12, 2, 1, 9.717444, 9.717444, 8), +(12, 2, 1, 9.717444, 9.717444, 17), +(12, 2, 1, 9.717444, 9.717444, 21), (13, 1, 1, 9.000000, 9.000000, 8), (13, 1, 1, 9.000000, 9.000000, 17), (13, 1, 1, 9.000000, 9.000000, 21), -(13, 2, 1, 9.871659, 9.871659, 8), -(13, 2, 1, 9.871659, 9.871659, 17), -(13, 2, 1, 9.871659, 9.871659, 21), +(13, 2, 1, 9.717444, 9.717444, 8), +(13, 2, 1, 9.717444, 9.717444, 17), +(13, 2, 1, 9.717444, 9.717444, 21), (14, 1, 1, 9.000000, 9.000000, 8), (14, 1, 1, 9.000000, 9.000000, 17), (14, 1, 1, 9.000000, 9.000000, 21), -(14, 2, 1, 9.871659, 9.871659, 8), -(14, 2, 1, 9.871659, 9.871659, 17), -(14, 2, 1, 9.871659, 9.871659, 21), +(14, 2, 1, 9.717444, 9.717444, 8), +(14, 2, 1, 9.717444, 9.717444, 17), +(14, 2, 1, 9.717444, 9.717444, 21), (15, 1, 1, 35.000000, 35.000000, 8), (15, 1, 1, 35.000000, 35.000000, 17), (15, 1, 1, 35.000000, 35.000000, 21), -(15, 2, 1, 38.389785, 38.389785, 8), -(15, 2, 1, 38.389785, 38.389785, 17), -(15, 2, 1, 38.389785, 38.389785, 21), +(15, 2, 1, 37.790060, 37.790060, 8), +(15, 2, 1, 37.790060, 37.790060, 17), +(15, 2, 1, 37.790060, 37.790060, 21), (16, 1, 1, 12.900000, 12.900000, 8), (16, 1, 1, 12.900000, 12.900000, 17), (16, 1, 1, 12.900000, 12.900000, 21), -(16, 2, 1, 14.149378, 14.149378, 8), -(16, 2, 1, 14.149378, 14.149378, 17), -(16, 2, 1, 14.149378, 14.149378, 21), +(16, 2, 1, 13.928336, 13.928336, 8), +(16, 2, 1, 13.928336, 13.928336, 17), +(16, 2, 1, 13.928336, 13.928336, 21), (17, 1, 1, 12.900000, 12.900000, 8), (17, 1, 1, 12.900000, 12.900000, 17), (17, 1, 1, 12.900000, 12.900000, 21), -(17, 2, 1, 14.149378, 14.149378, 8), -(17, 2, 1, 14.149378, 14.149378, 17), -(17, 2, 1, 14.149378, 14.149378, 21), +(17, 2, 1, 13.928336, 13.928336, 8), +(17, 2, 1, 13.928336, 13.928336, 17), +(17, 2, 1, 13.928336, 13.928336, 21), (18, 1, 1, 12.900000, 12.900000, 8), (18, 1, 1, 12.900000, 12.900000, 17), (18, 1, 1, 12.900000, 12.900000, 21), -(18, 2, 1, 14.149378, 14.149378, 8), -(18, 2, 1, 14.149378, 14.149378, 17), -(18, 2, 1, 14.149378, 14.149378, 21), +(18, 2, 1, 13.928336, 13.928336, 8), +(18, 2, 1, 13.928336, 13.928336, 17), +(18, 2, 1, 13.928336, 13.928336, 21), (19, 1, 1, 13.900000, 13.900000, 8), (19, 1, 1, 13.900000, 13.900000, 17), (19, 1, 1, 13.900000, 13.900000, 21), -(19, 2, 1, 15.246229, 15.246229, 8), -(19, 2, 1, 15.246229, 15.246229, 17), -(19, 2, 1, 15.246229, 15.246229, 21); +(19, 2, 1, 15.008052, 15.008052, 8), +(19, 2, 1, 15.008052, 15.008052, 17), +(19, 2, 1, 15.008052, 15.008052, 21); DROP TABLE IF EXISTS `ps_layered_product_attribute`; CREATE TABLE `ps_layered_product_attribute` ( @@ -9516,48 +7363,48 @@ CREATE TABLE `ps_layered_product_attribute` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_layered_product_attribute` (`id_attribute`, `id_product`, `id_attribute_group`, `id_shop`) VALUES -(1, 1, 1, 1), -(1, 2, 1, 1), -(2, 1, 1, 1), -(2, 2, 1, 1), -(3, 1, 1, 1), -(3, 2, 1, 1), -(4, 1, 1, 1), -(4, 2, 1, 1), +(6, 1, 2, 1), +(6, 2, 2, 1), +(7, 1, 2, 1), +(7, 2, 2, 1), (8, 1, 2, 1), -(8, 9, 2, 1), -(8, 10, 2, 1), -(8, 11, 2, 1), -(11, 1, 2, 1), -(11, 9, 2, 1), -(11, 10, 2, 1), -(11, 11, 2, 1), -(19, 3, 3, 1), -(19, 4, 3, 1), -(19, 5, 3, 1), -(20, 3, 3, 1), -(20, 4, 3, 1), -(20, 5, 3, 1), -(21, 3, 3, 1), -(21, 4, 3, 1), -(21, 5, 3, 1), -(22, 16, 4, 1), -(22, 17, 4, 1), -(22, 18, 4, 1), -(23, 16, 4, 1), -(23, 17, 4, 1), -(23, 18, 4, 1), -(24, 16, 4, 1), -(24, 17, 4, 1), -(24, 18, 4, 1), -(25, 16, 4, 1), -(25, 17, 4, 1), -(25, 18, 4, 1); +(8, 2, 2, 1), +(9, 1, 2, 1), +(9, 2, 2, 1), +(13, 1, 3, 1), +(13, 9, 3, 1), +(13, 10, 3, 1), +(13, 11, 3, 1), +(16, 1, 3, 1), +(16, 9, 3, 1), +(16, 10, 3, 1), +(16, 11, 3, 1), +(24, 3, 4, 1), +(24, 4, 4, 1), +(24, 5, 4, 1), +(25, 3, 4, 1), +(25, 4, 4, 1), +(25, 5, 4, 1), +(26, 3, 4, 1), +(26, 4, 4, 1), +(26, 5, 4, 1), +(27, 16, 5, 1), +(27, 17, 5, 1), +(27, 18, 5, 1), +(28, 16, 5, 1), +(28, 17, 5, 1), +(28, 18, 5, 1), +(29, 16, 5, 1), +(29, 17, 5, 1), +(29, 18, 5, 1), +(30, 16, 5, 1), +(30, 17, 5, 1), +(30, 18, 5, 1); DROP TABLE IF EXISTS `ps_linksmenutop`; CREATE TABLE `ps_linksmenutop` ( `id_linksmenutop` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `new_window` tinyint(1) NOT NULL, PRIMARY KEY (`id_linksmenutop`), KEY `id_shop` (`id_shop`) @@ -9566,9 +7413,9 @@ CREATE TABLE `ps_linksmenutop` ( DROP TABLE IF EXISTS `ps_linksmenutop_lang`; CREATE TABLE `ps_linksmenutop_lang` ( - `id_linksmenutop` int(10) unsigned NOT NULL, - `id_lang` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_linksmenutop` int(11) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `label` varchar(128) NOT NULL, `link` varchar(128) NOT NULL, KEY `id_linksmenutop` (`id_linksmenutop`,`id_lang`,`id_shop`) @@ -9578,7 +7425,7 @@ CREATE TABLE `ps_linksmenutop_lang` ( DROP TABLE IF EXISTS `ps_link_block`; CREATE TABLE `ps_link_block` ( `id_link_block` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_hook` int(10) unsigned DEFAULT NULL, + `id_hook` int(1) unsigned DEFAULT NULL, `position` int(10) unsigned NOT NULL DEFAULT '0', `content` text, PRIMARY KEY (`id_link_block`) @@ -9599,11 +7446,11 @@ CREATE TABLE `ps_link_block_lang` ( INSERT INTO `ps_link_block_lang` (`id_link_block`, `id_lang`, `name`, `custom_content`) VALUES (1, 1, 'Products', NULL), -(1, 2, 'Products', NULL), -(1, 3, 'Products', NULL), +(1, 2, 'Producten', NULL), +(1, 3, 'Artikel', NULL), (2, 1, 'Our company', NULL), -(2, 2, 'Our company', NULL), -(2, 3, 'Our company', NULL); +(2, 2, 'Ons bedrijf', NULL), +(2, 3, 'Unternehmen', NULL); DROP TABLE IF EXISTS `ps_link_block_shop`; CREATE TABLE `ps_link_block_shop` ( @@ -9628,644 +7475,497 @@ CREATE TABLE `ps_log` ( `id_shop` int(10) unsigned DEFAULT NULL, `id_shop_group` int(10) unsigned DEFAULT NULL, `id_lang` int(10) unsigned DEFAULT NULL, - `in_all_shops` tinyint(3) unsigned NOT NULL DEFAULT '0', + `in_all_shops` tinyint(1) unsigned NOT NULL DEFAULT '0', `id_employee` int(10) unsigned DEFAULT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_log`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_log` (`id_log`, `severity`, `error_code`, `message`, `object_type`, `object_id`, `id_shop`, `id_shop_group`, `id_lang`, `in_all_shops`, `id_employee`, `date_add`, `date_upd`) VALUES -(1, 1, 0, 'Exporting mail with theme modern for language English (English)', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(2, 1, 0, 'Core output folder: /var/www/html/mails', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(3, 1, 0, 'Modules output folder: /var/www/html/modules/', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(4, 1, 0, 'Generate html template account at /var/www/html/mails/en/account.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(5, 1, 0, 'Generate txt template account at /var/www/html/mails/en/account.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(6, 1, 0, 'Generate html template backoffice_order at /var/www/html/mails/en/backoffice_order.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(7, 1, 0, 'Generate txt template backoffice_order at /var/www/html/mails/en/backoffice_order.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(8, 1, 0, 'Generate html template bankwire at /var/www/html/mails/en/bankwire.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(9, 1, 0, 'Generate txt template bankwire at /var/www/html/mails/en/bankwire.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:51', '2023-05-02 12:16:51'), -(10, 1, 0, 'Generate html template cheque at /var/www/html/mails/en/cheque.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(11, 1, 0, 'Generate txt template cheque at /var/www/html/mails/en/cheque.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(12, 1, 0, 'Generate html template contact at /var/www/html/mails/en/contact.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(13, 1, 0, 'Generate txt template contact at /var/www/html/mails/en/contact.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(14, 1, 0, 'Generate html template contact_form at /var/www/html/mails/en/contact_form.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(15, 1, 0, 'Generate txt template contact_form at /var/www/html/mails/en/contact_form.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(16, 1, 0, 'Generate html template credit_slip at /var/www/html/mails/en/credit_slip.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(17, 1, 0, 'Generate txt template credit_slip at /var/www/html/mails/en/credit_slip.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(18, 1, 0, 'Generate html template download_product at /var/www/html/mails/en/download_product.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(19, 1, 0, 'Generate txt template download_product at /var/www/html/mails/en/download_product.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(20, 1, 0, 'Generate html template employee_password at /var/www/html/mails/en/employee_password.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(21, 1, 0, 'Generate txt template employee_password at /var/www/html/mails/en/employee_password.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(22, 1, 0, 'Generate html template forward_msg at /var/www/html/mails/en/forward_msg.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(23, 1, 0, 'Generate txt template forward_msg at /var/www/html/mails/en/forward_msg.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(24, 1, 0, 'Generate html template guest_to_customer at /var/www/html/mails/en/guest_to_customer.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(25, 1, 0, 'Generate txt template guest_to_customer at /var/www/html/mails/en/guest_to_customer.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(26, 1, 0, 'Generate html template import at /var/www/html/mails/en/import.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(27, 1, 0, 'Generate txt template import at /var/www/html/mails/en/import.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(28, 1, 0, 'Generate html template in_transit at /var/www/html/mails/en/in_transit.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(29, 1, 0, 'Generate txt template in_transit at /var/www/html/mails/en/in_transit.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(30, 1, 0, 'Generate html template log_alert at /var/www/html/mails/en/log_alert.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(31, 1, 0, 'Generate txt template log_alert at /var/www/html/mails/en/log_alert.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(32, 1, 0, 'Generate html template newsletter at /var/www/html/mails/en/newsletter.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(33, 1, 0, 'Generate txt template newsletter at /var/www/html/mails/en/newsletter.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(34, 1, 0, 'Generate html template order_canceled at /var/www/html/mails/en/order_canceled.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(35, 1, 0, 'Generate txt template order_canceled at /var/www/html/mails/en/order_canceled.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(36, 1, 0, 'Generate html template order_changed at /var/www/html/mails/en/order_changed.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:52', '2023-05-02 12:16:52'), -(37, 1, 0, 'Generate txt template order_changed at /var/www/html/mails/en/order_changed.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(38, 1, 0, 'Generate html template order_conf at /var/www/html/mails/en/order_conf.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(39, 1, 0, 'Generate txt template order_conf at /var/www/html/mails/en/order_conf.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(40, 1, 0, 'Generate html template order_customer_comment at /var/www/html/mails/en/order_customer_comment.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(41, 1, 0, 'Generate txt template order_customer_comment at /var/www/html/mails/en/order_customer_comment.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(42, 1, 0, 'Generate html template order_merchant_comment at /var/www/html/mails/en/order_merchant_comment.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(43, 1, 0, 'Generate txt template order_merchant_comment at /var/www/html/mails/en/order_merchant_comment.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(44, 1, 0, 'Generate html template order_return_state at /var/www/html/mails/en/order_return_state.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(45, 1, 0, 'Generate txt template order_return_state at /var/www/html/mails/en/order_return_state.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(46, 1, 0, 'Generate html template outofstock at /var/www/html/mails/en/outofstock.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(47, 1, 0, 'Generate txt template outofstock at /var/www/html/mails/en/outofstock.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(48, 1, 0, 'Generate html template password at /var/www/html/mails/en/password.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(49, 1, 0, 'Generate txt template password at /var/www/html/mails/en/password.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(50, 1, 0, 'Generate html template password_query at /var/www/html/mails/en/password_query.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(51, 1, 0, 'Generate txt template password_query at /var/www/html/mails/en/password_query.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(52, 1, 0, 'Generate html template payment at /var/www/html/mails/en/payment.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(53, 1, 0, 'Generate txt template payment at /var/www/html/mails/en/payment.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(54, 1, 0, 'Generate html template payment_error at /var/www/html/mails/en/payment_error.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(55, 1, 0, 'Generate txt template payment_error at /var/www/html/mails/en/payment_error.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(56, 1, 0, 'Generate html template preparation at /var/www/html/mails/en/preparation.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(57, 1, 0, 'Generate txt template preparation at /var/www/html/mails/en/preparation.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(58, 1, 0, 'Generate html template productoutofstock at /var/www/html/mails/en/productoutofstock.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(59, 1, 0, 'Generate txt template productoutofstock at /var/www/html/mails/en/productoutofstock.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:53', '2023-05-02 12:16:53'), -(60, 1, 0, 'Generate html template refund at /var/www/html/mails/en/refund.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(61, 1, 0, 'Generate txt template refund at /var/www/html/mails/en/refund.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(62, 1, 0, 'Generate html template reply_msg at /var/www/html/mails/en/reply_msg.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(63, 1, 0, 'Generate txt template reply_msg at /var/www/html/mails/en/reply_msg.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(64, 1, 0, 'Generate html template shipped at /var/www/html/mails/en/shipped.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(65, 1, 0, 'Generate txt template shipped at /var/www/html/mails/en/shipped.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(66, 1, 0, 'Generate html template test at /var/www/html/mails/en/test.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(67, 1, 0, 'Generate txt template test at /var/www/html/mails/en/test.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(68, 1, 0, 'Generate html template voucher at /var/www/html/mails/en/voucher.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(69, 1, 0, 'Generate txt template voucher at /var/www/html/mails/en/voucher.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(70, 1, 0, 'Generate html template voucher_new at /var/www/html/mails/en/voucher_new.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(71, 1, 0, 'Generate txt template voucher_new at /var/www/html/mails/en/voucher_new.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(72, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//ps_reminder/mails/en/followup_1.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(73, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//ps_reminder/mails/en/followup_1.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(74, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//ps_reminder/mails/en/followup_2.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(75, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//ps_reminder/mails/en/followup_2.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(76, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//ps_reminder/mails/en/followup_3.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(77, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//ps_reminder/mails/en/followup_3.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(78, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//ps_reminder/mails/en/followup_4.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(79, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//ps_reminder/mails/en/followup_4.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(80, 1, 0, 'Generate html template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/en/referralprogram-congratulations.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(81, 1, 0, 'Generate txt template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/en/referralprogram-congratulations.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(82, 1, 0, 'Generate html template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/en/referralprogram-invitation.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(83, 1, 0, 'Generate txt template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/en/referralprogram-invitation.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(84, 1, 0, 'Generate html template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/en/referralprogram-voucher.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(85, 1, 0, 'Generate txt template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/en/referralprogram-voucher.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(86, 1, 0, 'Generate html template customer_qty at /var/www/html/modules//ps_emailalerts/mails/en/customer_qty.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(87, 1, 0, 'Generate txt template customer_qty at /var/www/html/modules//ps_emailalerts/mails/en/customer_qty.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:54', '2023-05-02 12:16:54'), -(88, 1, 0, 'Generate html template new_order at /var/www/html/modules//ps_emailalerts/mails/en/new_order.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(89, 1, 0, 'Generate txt template new_order at /var/www/html/modules//ps_emailalerts/mails/en/new_order.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(90, 1, 0, 'Generate html template order_changed at /var/www/html/modules//ps_emailalerts/mails/en/order_changed.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(91, 1, 0, 'Generate txt template order_changed at /var/www/html/modules//ps_emailalerts/mails/en/order_changed.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(92, 1, 0, 'Generate html template productcoverage at /var/www/html/modules//ps_emailalerts/mails/en/productcoverage.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(93, 1, 0, 'Generate txt template productcoverage at /var/www/html/modules//ps_emailalerts/mails/en/productcoverage.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(94, 1, 0, 'Generate html template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/en/productoutofstock.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(95, 1, 0, 'Generate txt template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/en/productoutofstock.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(96, 1, 0, 'Generate html template return_slip at /var/www/html/modules//ps_emailalerts/mails/en/return_slip.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(97, 1, 0, 'Generate txt template return_slip at /var/www/html/modules//ps_emailalerts/mails/en/return_slip.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(98, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//followup/mails/en/followup_1.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(99, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//followup/mails/en/followup_1.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(100, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//followup/mails/en/followup_2.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(101, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//followup/mails/en/followup_2.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(102, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//followup/mails/en/followup_3.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(103, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//followup/mails/en/followup_3.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(104, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//followup/mails/en/followup_4.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(105, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//followup/mails/en/followup_4.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(106, 1, 0, 'Generate html template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_conf.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(107, 1, 0, 'Generate txt template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_conf.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(108, 1, 0, 'Generate html template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_verif.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(109, 1, 0, 'Generate txt template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_verif.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(110, 1, 0, 'Generate html template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_voucher.html', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(111, 1, 0, 'Generate txt template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_voucher.txt', '', 0, 1, NULL, 0, 0, 0, '2023-05-02 12:16:55', '2023-05-02 12:16:55'), -(112, 1, 0, 'Protect vendor folder in module ps_linklist', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(113, 1, 0, 'Module ps_linklist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:16:59', '2023-05-02 12:16:59'), -(114, 1, 0, 'Protect vendor folder in module blockreassurance', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(115, 1, 0, 'Module blockreassurance has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(116, 1, 0, 'Protect vendor folder in module blockwishlist', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(117, 1, 0, 'Module blockwishlist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(118, 1, 0, 'Protect vendor folder in module psgdpr', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(119, 1, 0, 'Module psgdpr has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(120, 1, 0, 'Protect vendor folder in module ps_contactinfo', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(121, 1, 0, 'Module ps_contactinfo has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(122, 1, 0, 'Protect vendor folder in module ps_languageselector', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(123, 1, 0, 'Module ps_languageselector has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(124, 1, 0, 'Protect vendor folder in module ps_currencyselector', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(125, 1, 0, 'Module ps_currencyselector has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(126, 1, 0, 'Protect vendor folder in module ps_customersignin', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(127, 1, 0, 'Module ps_customersignin has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(128, 1, 0, 'Protect vendor folder in module ps_shoppingcart', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(129, 1, 0, 'Module ps_shoppingcart has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:00', '2023-05-02 12:17:00'), -(130, 1, 0, 'Protect vendor folder in module ps_mainmenu', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(131, 1, 0, 'Module ps_mainmenu has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(132, 1, 0, 'Protect vendor folder in module ps_searchbar', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(133, 1, 0, 'Module ps_searchbar has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(134, 1, 0, 'Protect vendor folder in module ps_imageslider', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(135, 1, 0, 'Module ps_imageslider has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(136, 1, 0, 'Protect vendor folder in module ps_featuredproducts', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(137, 1, 0, 'Module ps_featuredproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(138, 1, 0, 'Protect vendor folder in module ps_banner', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(139, 1, 0, 'Module ps_banner has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(140, 1, 0, 'Protect vendor folder in module ps_customtext', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(141, 1, 0, 'Module ps_customtext has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(142, 1, 0, 'Protect vendor folder in module ps_specials', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(143, 1, 0, 'Module ps_specials has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(144, 1, 0, 'Protect vendor folder in module ps_newproducts', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(145, 1, 0, 'Module ps_newproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(146, 1, 0, 'Protect vendor folder in module ps_bestsellers', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(147, 1, 0, 'Module ps_bestsellers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:01', '2023-05-02 12:17:01'), -(148, 1, 0, 'Protect vendor folder in module ps_emailsubscription', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(149, 1, 0, 'Module ps_emailsubscription has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(150, 1, 0, 'Protect vendor folder in module ps_socialfollow', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(151, 1, 0, 'Module ps_socialfollow has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(152, 1, 0, 'Protect vendor folder in module ps_customeraccountlinks', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(153, 1, 0, 'Module ps_customeraccountlinks has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(154, 1, 0, 'Protect vendor folder in module productcomments', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(155, 1, 0, 'Module productcomments has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(156, 1, 0, 'Protect vendor folder in module ps_categorytree', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(157, 1, 0, 'Module ps_categorytree has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(158, 1, 0, 'Protect vendor folder in module ps_facetedsearch', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(159, 1, 0, 'Module ps_facetedsearch has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:02', '2023-05-02 12:17:02'), -(160, 1, 0, 'Protect vendor folder in module contactform', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(161, 1, 0, 'Module contactform has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(162, 1, 0, 'Protect vendor folder in module ps_sharebuttons', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(163, 1, 0, 'Module ps_sharebuttons has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:17:03', '2023-05-02 12:17:03'), -(164, 1, 0, 'Protect vendor folder in module statssales', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(165, 1, 0, 'Module statssales has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(166, 1, 0, 'Protect vendor folder in module dashtrends', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(167, 1, 0, 'Module dashtrends has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(168, 1, 0, 'Protect vendor folder in module graphnvd3', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(169, 1, 0, 'Module graphnvd3 has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(170, 1, 0, 'Protect vendor folder in module dashproducts', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(171, 1, 0, 'Module dashproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(172, 1, 0, 'Protect vendor folder in module statsbestvouchers', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(173, 1, 0, 'Module statsbestvouchers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(174, 1, 0, 'Protect vendor folder in module ps_cashondelivery', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(175, 1, 0, 'Module ps_cashondelivery has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(176, 1, 0, 'Protect vendor folder in module statsbestproducts', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(177, 1, 0, 'Module statsbestproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(178, 1, 0, 'Protect vendor folder in module statsstock', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(179, 1, 0, 'Module statsstock has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(180, 1, 0, 'Protect vendor folder in module ps_googleanalytics', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(181, 1, 0, 'Module ps_googleanalytics has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(182, 1, 0, 'Protect vendor folder in module ps_distributionapiclient', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(183, 1, 0, 'Module ps_distributionapiclient has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(184, 1, 0, 'Protect vendor folder in module statsdata', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(185, 1, 0, 'Module statsdata has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:35', '2023-05-02 12:18:35'), -(186, 1, 0, 'Protect vendor folder in module statsforecast', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(187, 1, 0, 'Module statsforecast has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(188, 1, 0, 'Protect vendor folder in module pagesnotfound', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(189, 1, 0, 'Module pagesnotfound has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(190, 1, 0, 'Protect vendor folder in module dashgoals', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(191, 1, 0, 'Module dashgoals has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(192, 1, 0, 'Protect vendor folder in module statsproduct', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(193, 1, 0, 'Module statsproduct has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(194, 1, 0, 'Protect vendor folder in module ps_dataprivacy', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(195, 1, 0, 'Module ps_dataprivacy has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(196, 1, 0, 'Protect vendor folder in module statssearch', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(197, 1, 0, 'Module statssearch has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(198, 1, 0, 'Protect vendor folder in module statscatalog', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(199, 1, 0, 'Module statscatalog has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(200, 1, 0, 'Protect vendor folder in module ps_emailalerts', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(201, 1, 0, 'Module ps_emailalerts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(202, 1, 0, 'Protect vendor folder in module statsbestsuppliers', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(203, 1, 0, 'Module statsbestsuppliers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(204, 1, 0, 'Protect vendor folder in module gridhtml', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(205, 1, 0, 'Module gridhtml has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:36', '2023-05-02 12:18:36'), -(206, 1, 0, 'Protect vendor folder in module gsitemap', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(207, 1, 0, 'Module gsitemap has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(208, 1, 0, 'Protect vendor folder in module ps_categoryproducts', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(209, 1, 0, 'Module ps_categoryproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(210, 1, 0, 'Protect vendor folder in module ps_wirepayment', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(211, 1, 0, 'Module ps_wirepayment has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(212, 1, 0, 'Protect vendor folder in module statspersonalinfos', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(213, 1, 0, 'Module statspersonalinfos has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(214, 1, 0, 'Protect vendor folder in module statscheckup', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(215, 1, 0, 'Module statscheckup has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(216, 1, 0, 'Protect vendor folder in module statsbestcategories', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(217, 1, 0, 'Module statsbestcategories has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(218, 1, 0, 'Protect vendor folder in module ps_supplierlist', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(219, 1, 0, 'Module ps_supplierlist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(220, 1, 0, 'Protect vendor folder in module ps_checkpayment', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(221, 1, 0, 'Module ps_checkpayment has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(222, 1, 0, 'Protect vendor folder in module ps_crossselling', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(223, 1, 0, 'Module ps_crossselling has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(224, 1, 0, 'Protect vendor folder in module ps_brandlist', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(225, 1, 0, 'Module ps_brandlist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(226, 1, 0, 'Protect vendor folder in module statscarrier', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(227, 1, 0, 'Module statscarrier has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(228, 1, 0, 'Protect vendor folder in module statsnewsletter', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(229, 1, 0, 'Module statsnewsletter has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(230, 1, 0, 'Protect vendor folder in module dashactivity', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(231, 1, 0, 'Module dashactivity has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(232, 1, 0, 'Protect vendor folder in module statsbestcustomers', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(233, 1, 0, 'Module statsbestcustomers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:37', '2023-05-02 12:18:37'), -(234, 1, 0, 'Protect vendor folder in module ps_viewedproduct', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(235, 1, 0, 'Module ps_viewedproduct has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(236, 1, 0, 'Protect vendor folder in module statsbestmanufacturers', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(237, 1, 0, 'Module statsbestmanufacturers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(238, 1, 0, 'Protect vendor folder in module ps_themecusto', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(239, 1, 0, 'Module ps_themecusto has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(240, 1, 0, 'Protect vendor folder in module statsregistrations', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(241, 1, 0, 'Module statsregistrations has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:38', '2023-05-02 12:18:38'), -(242, 1, 0, 'Protect vendor folder in module ps_facetedsearch', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(243, 1, 0, 'Module ps_facetedsearch has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-05-02 12:18:41', '2023-05-02 12:18:41'), -(244, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-05-08 16:29:54', '2023-05-08 16:29:54'), -(245, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-05-08 16:30:12', '2023-05-08 16:30:12'), -(246, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-05-08 16:30:25', '2023-05-08 16:30:25'), -(247, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-05-08 16:45:20', '2023-05-08 16:45:20'), -(248, 1, 0, 'Exporting mail with theme modern for language Deutsch (German)', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(249, 1, 0, 'Core output folder: /var/www/html/mails', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(250, 1, 0, 'Modules output folder: /var/www/html/modules/', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(251, 1, 0, 'Generate html template account at /var/www/html/mails/de/account.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(252, 1, 0, 'Generate txt template account at /var/www/html/mails/de/account.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(253, 1, 0, 'Generate html template backoffice_order at /var/www/html/mails/de/backoffice_order.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(254, 1, 0, 'Generate txt template backoffice_order at /var/www/html/mails/de/backoffice_order.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(255, 1, 0, 'Generate html template bankwire at /var/www/html/mails/de/bankwire.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(256, 1, 0, 'Generate txt template bankwire at /var/www/html/mails/de/bankwire.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(257, 1, 0, 'Generate html template cheque at /var/www/html/mails/de/cheque.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(258, 1, 0, 'Generate txt template cheque at /var/www/html/mails/de/cheque.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:38', '2023-05-08 16:58:38'), -(259, 1, 0, 'Generate html template contact at /var/www/html/mails/de/contact.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(260, 1, 0, 'Generate txt template contact at /var/www/html/mails/de/contact.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(261, 1, 0, 'Generate html template contact_form at /var/www/html/mails/de/contact_form.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(262, 1, 0, 'Generate txt template contact_form at /var/www/html/mails/de/contact_form.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(263, 1, 0, 'Generate html template credit_slip at /var/www/html/mails/de/credit_slip.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(264, 1, 0, 'Generate txt template credit_slip at /var/www/html/mails/de/credit_slip.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(265, 1, 0, 'Generate html template download_product at /var/www/html/mails/de/download_product.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(266, 1, 0, 'Generate txt template download_product at /var/www/html/mails/de/download_product.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(267, 1, 0, 'Generate html template employee_password at /var/www/html/mails/de/employee_password.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(268, 1, 0, 'Generate txt template employee_password at /var/www/html/mails/de/employee_password.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(269, 1, 0, 'Generate html template forward_msg at /var/www/html/mails/de/forward_msg.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(270, 1, 0, 'Generate txt template forward_msg at /var/www/html/mails/de/forward_msg.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(271, 1, 0, 'Generate html template guest_to_customer at /var/www/html/mails/de/guest_to_customer.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(272, 1, 0, 'Generate txt template guest_to_customer at /var/www/html/mails/de/guest_to_customer.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(273, 1, 0, 'Generate html template import at /var/www/html/mails/de/import.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(274, 1, 0, 'Generate txt template import at /var/www/html/mails/de/import.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(275, 1, 0, 'Generate html template in_transit at /var/www/html/mails/de/in_transit.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(276, 1, 0, 'Generate txt template in_transit at /var/www/html/mails/de/in_transit.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(277, 1, 0, 'Generate html template log_alert at /var/www/html/mails/de/log_alert.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(278, 1, 0, 'Generate txt template log_alert at /var/www/html/mails/de/log_alert.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(279, 1, 0, 'Generate html template newsletter at /var/www/html/mails/de/newsletter.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(280, 1, 0, 'Generate txt template newsletter at /var/www/html/mails/de/newsletter.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:39', '2023-05-08 16:58:39'), -(281, 1, 0, 'Generate html template order_canceled at /var/www/html/mails/de/order_canceled.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(282, 1, 0, 'Generate txt template order_canceled at /var/www/html/mails/de/order_canceled.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(283, 1, 0, 'Generate html template order_changed at /var/www/html/mails/de/order_changed.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(284, 1, 0, 'Generate txt template order_changed at /var/www/html/mails/de/order_changed.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(285, 1, 0, 'Generate html template order_conf at /var/www/html/mails/de/order_conf.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(286, 1, 0, 'Generate txt template order_conf at /var/www/html/mails/de/order_conf.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(287, 1, 0, 'Generate html template order_customer_comment at /var/www/html/mails/de/order_customer_comment.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(288, 1, 0, 'Generate txt template order_customer_comment at /var/www/html/mails/de/order_customer_comment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(289, 1, 0, 'Generate html template order_merchant_comment at /var/www/html/mails/de/order_merchant_comment.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(290, 1, 0, 'Generate txt template order_merchant_comment at /var/www/html/mails/de/order_merchant_comment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(291, 1, 0, 'Generate html template order_return_state at /var/www/html/mails/de/order_return_state.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(292, 1, 0, 'Generate txt template order_return_state at /var/www/html/mails/de/order_return_state.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(293, 1, 0, 'Generate html template outofstock at /var/www/html/mails/de/outofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(294, 1, 0, 'Generate txt template outofstock at /var/www/html/mails/de/outofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(295, 1, 0, 'Generate html template password at /var/www/html/mails/de/password.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(296, 1, 0, 'Generate txt template password at /var/www/html/mails/de/password.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(297, 1, 0, 'Generate html template password_query at /var/www/html/mails/de/password_query.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(298, 1, 0, 'Generate txt template password_query at /var/www/html/mails/de/password_query.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(299, 1, 0, 'Generate html template payment at /var/www/html/mails/de/payment.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(300, 1, 0, 'Generate txt template payment at /var/www/html/mails/de/payment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(301, 1, 0, 'Generate html template payment_error at /var/www/html/mails/de/payment_error.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(302, 1, 0, 'Generate txt template payment_error at /var/www/html/mails/de/payment_error.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:40', '2023-05-08 16:58:40'), -(303, 1, 0, 'Generate html template preparation at /var/www/html/mails/de/preparation.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(304, 1, 0, 'Generate txt template preparation at /var/www/html/mails/de/preparation.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(305, 1, 0, 'Generate html template productoutofstock at /var/www/html/mails/de/productoutofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(306, 1, 0, 'Generate txt template productoutofstock at /var/www/html/mails/de/productoutofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(307, 1, 0, 'Generate html template refund at /var/www/html/mails/de/refund.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(308, 1, 0, 'Generate txt template refund at /var/www/html/mails/de/refund.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(309, 1, 0, 'Generate html template reply_msg at /var/www/html/mails/de/reply_msg.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(310, 1, 0, 'Generate txt template reply_msg at /var/www/html/mails/de/reply_msg.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(311, 1, 0, 'Generate html template shipped at /var/www/html/mails/de/shipped.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(312, 1, 0, 'Generate txt template shipped at /var/www/html/mails/de/shipped.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(313, 1, 0, 'Generate html template test at /var/www/html/mails/de/test.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(314, 1, 0, 'Generate txt template test at /var/www/html/mails/de/test.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(315, 1, 0, 'Generate html template voucher at /var/www/html/mails/de/voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(316, 1, 0, 'Generate txt template voucher at /var/www/html/mails/de/voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(317, 1, 0, 'Generate html template voucher_new at /var/www/html/mails/de/voucher_new.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(318, 1, 0, 'Generate txt template voucher_new at /var/www/html/mails/de/voucher_new.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(319, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//ps_reminder/mails/de/followup_1.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(320, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//ps_reminder/mails/de/followup_1.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(321, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//ps_reminder/mails/de/followup_2.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(322, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//ps_reminder/mails/de/followup_2.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(323, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//ps_reminder/mails/de/followup_3.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(324, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//ps_reminder/mails/de/followup_3.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(325, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//ps_reminder/mails/de/followup_4.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(326, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//ps_reminder/mails/de/followup_4.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(327, 1, 0, 'Generate html template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/de/referralprogram-congratulations.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(328, 1, 0, 'Generate txt template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/de/referralprogram-congratulations.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:41', '2023-05-08 16:58:41'), -(329, 1, 0, 'Generate html template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/de/referralprogram-invitation.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(330, 1, 0, 'Generate txt template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/de/referralprogram-invitation.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(331, 1, 0, 'Generate html template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/de/referralprogram-voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(332, 1, 0, 'Generate txt template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/de/referralprogram-voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(333, 1, 0, 'Generate html template customer_qty at /var/www/html/modules//ps_emailalerts/mails/de/customer_qty.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(334, 1, 0, 'Generate txt template customer_qty at /var/www/html/modules//ps_emailalerts/mails/de/customer_qty.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(335, 1, 0, 'Generate html template new_order at /var/www/html/modules//ps_emailalerts/mails/de/new_order.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(336, 1, 0, 'Generate txt template new_order at /var/www/html/modules//ps_emailalerts/mails/de/new_order.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(337, 1, 0, 'Generate html template order_changed at /var/www/html/modules//ps_emailalerts/mails/de/order_changed.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(338, 1, 0, 'Generate txt template order_changed at /var/www/html/modules//ps_emailalerts/mails/de/order_changed.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(339, 1, 0, 'Generate html template productcoverage at /var/www/html/modules//ps_emailalerts/mails/de/productcoverage.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(340, 1, 0, 'Generate txt template productcoverage at /var/www/html/modules//ps_emailalerts/mails/de/productcoverage.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(341, 1, 0, 'Generate html template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/de/productoutofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(342, 1, 0, 'Generate txt template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/de/productoutofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(343, 1, 0, 'Generate html template return_slip at /var/www/html/modules//ps_emailalerts/mails/de/return_slip.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(344, 1, 0, 'Generate txt template return_slip at /var/www/html/modules//ps_emailalerts/mails/de/return_slip.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(345, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//followup/mails/de/followup_1.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(346, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//followup/mails/de/followup_1.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(347, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//followup/mails/de/followup_2.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(348, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//followup/mails/de/followup_2.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(349, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//followup/mails/de/followup_3.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(350, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//followup/mails/de/followup_3.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:42', '2023-05-08 16:58:42'), -(351, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//followup/mails/de/followup_4.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(352, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//followup/mails/de/followup_4.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(353, 1, 0, 'Generate html template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_conf.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(354, 1, 0, 'Generate txt template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_conf.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(355, 1, 0, 'Generate html template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_verif.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(356, 1, 0, 'Generate txt template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_verif.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(357, 1, 0, 'Generate html template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(358, 1, 0, 'Generate txt template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-05-08 16:58:43', '2023-05-08 16:58:43'), -(359, 1, 0, 'ShopUrl addition', 'ShopUrl', 2, NULL, NULL, 1, 1, 1, '2023-05-08 17:09:11', '2023-05-08 17:09:11'), -(360, 1, 0, 'Error - The following e-mail template is missing: en/account.txt', '', 0, 2, NULL, 1, 0, 0, '2023-05-08 17:09:50', '2023-05-08 17:09:50'), -(361, 1, 0, 'Error - The following e-mail template is missing: account', '', 0, 2, NULL, 1, 0, 0, '2023-05-08 17:09:50', '2023-05-08 17:09:50'), -(362, 1, 0, 'Back office connection from 88.216.176.47', '', 0, NULL, NULL, 1, 1, 1, '2023-05-09 08:25:33', '2023-05-09 08:25:33'), -(363, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 1, 0, 0, '2023-05-09 08:26:15', '2023-05-09 08:26:15'), -(364, 1, 0, 'Error - The following e-mail template is missing: en/cheque.txt', '', 0, 2, NULL, 1, 0, 0, '2023-05-09 08:26:15', '2023-05-09 08:26:15'), -(365, 1, 0, 'Error - The following e-mail template is missing: cheque', '', 0, 2, NULL, 1, 0, 0, '2023-05-09 08:26:15', '2023-05-09 08:26:15'), -(366, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 1, 0, 0, '2023-05-09 08:26:15', '2023-05-09 08:26:15'), -(367, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 1, 0, 0, '2023-05-09 08:26:15', '2023-05-09 08:26:15'), -(368, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-05-15 09:47:00', '2023-05-15 09:47:00'), -(369, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-05-15 09:47:16', '2023-05-15 09:47:16'), -(370, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 09:47:28', '2023-05-15 09:47:28'), -(371, 1, 0, 'Back office connection from 88.216.176.47', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 09:53:35', '2023-05-15 09:53:35'), -(372, 1, 0, 'Back office connection from 88.216.176.47', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 09:55:41', '2023-05-15 09:55:41'), -(373, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:06', '2023-05-15 09:57:06'), -(374, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:06', '2023-05-15 09:57:06'), -(375, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:07', '2023-05-15 09:57:07'), -(376, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:07', '2023-05-15 09:57:07'), -(377, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:07', '2023-05-15 09:57:07'), -(378, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:09', '2023-05-15 09:57:09'), -(379, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:09', '2023-05-15 09:57:09'), -(380, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 09:57:09', '2023-05-15 09:57:09'), -(381, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 7, 2, NULL, 2, 0, 0, '2023-05-15 09:57:11', '2023-05-15 09:57:11'), -(382, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 7, 2, NULL, 2, 0, 0, '2023-05-15 09:57:12', '2023-05-15 09:57:12'), -(383, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 7, 2, NULL, 2, 0, 0, '2023-05-15 09:57:12', '2023-05-15 09:57:12'), -(384, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:09', '2023-05-15 10:01:09'), -(385, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:09', '2023-05-15 10:01:09'), -(386, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:09', '2023-05-15 10:01:09'), -(387, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:09', '2023-05-15 10:01:09'), -(388, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:09', '2023-05-15 10:01:09'), -(389, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:11', '2023-05-15 10:01:11'), -(390, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:11', '2023-05-15 10:01:11'), -(391, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:11', '2023-05-15 10:01:11'), -(392, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 13, 2, NULL, 2, 0, 0, '2023-05-15 10:01:13', '2023-05-15 10:01:13'), -(393, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 13, 2, NULL, 2, 0, 0, '2023-05-15 10:01:14', '2023-05-15 10:01:14'), -(394, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 13, 2, NULL, 2, 0, 0, '2023-05-15 10:01:14', '2023-05-15 10:01:14'), -(395, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:38', '2023-05-15 10:01:38'), -(396, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:01:50', '2023-05-15 10:01:50'), -(397, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:35', '2023-05-15 10:02:35'), -(398, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:35', '2023-05-15 10:02:35'), -(399, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:35', '2023-05-15 10:02:35'), -(400, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:35', '2023-05-15 10:02:35'), -(401, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:35', '2023-05-15 10:02:35'), -(402, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:37', '2023-05-15 10:02:37'), -(403, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:37', '2023-05-15 10:02:37'), -(404, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:02:37', '2023-05-15 10:02:37'), -(405, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 15, 2, NULL, 2, 0, 0, '2023-05-15 10:02:40', '2023-05-15 10:02:40'), -(406, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:03:05', '2023-05-15 10:03:05'), -(407, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:03:06', '2023-05-15 10:03:06'), -(408, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:13', '2023-05-15 10:12:13'), -(409, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:14', '2023-05-15 10:12:14'), -(410, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:14', '2023-05-15 10:12:14'), -(411, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:14', '2023-05-15 10:12:14'), -(412, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:14', '2023-05-15 10:12:14'), -(413, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:16', '2023-05-15 10:12:16'), -(414, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:16', '2023-05-15 10:12:16'), -(415, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:16', '2023-05-15 10:12:16'), -(416, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 20, 2, NULL, 2, 0, 0, '2023-05-15 10:12:18', '2023-05-15 10:12:18'), -(417, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 20, 2, NULL, 2, 0, 0, '2023-05-15 10:12:18', '2023-05-15 10:12:18'), -(418, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 20, 2, NULL, 2, 0, 0, '2023-05-15 10:12:18', '2023-05-15 10:12:18'), -(419, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:12:28', '2023-05-15 10:12:28'), -(420, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:13:28', '2023-05-15 10:13:28'), -(421, 1, 0, 'Back office connection from 88.216.176.47', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:13:30', '2023-05-15 10:13:30'), -(422, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-05-15 10:20:06', '2023-05-15 10:20:06'), -(423, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-05-15 10:20:21', '2023-05-15 10:20:21'), -(424, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:20:33', '2023-05-15 10:20:33'), -(425, 1, 0, 'Back office connection from 88.216.176.47', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:21:50', '2023-05-15 10:21:50'), -(426, 1, 0, 'Back office connection from 88.216.176.47', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:23:38', '2023-05-15 10:23:38'), -(427, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:31', '2023-05-15 10:25:31'), -(428, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:32', '2023-05-15 10:25:32'), -(429, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:32', '2023-05-15 10:25:32'), -(430, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:32', '2023-05-15 10:25:32'), -(431, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:32', '2023-05-15 10:25:32'), -(432, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:34', '2023-05-15 10:25:34'), -(433, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:34', '2023-05-15 10:25:34'), -(434, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:25:34', '2023-05-15 10:25:34'), -(435, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 21, 2, NULL, 2, 0, 0, '2023-05-15 10:25:37', '2023-05-15 10:25:37'), -(436, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:02', '2023-05-15 10:26:02'), -(437, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:07', '2023-05-15 10:26:07'), -(438, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:29', '2023-05-15 10:26:29'), -(439, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:29', '2023-05-15 10:26:29'), -(440, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:29', '2023-05-15 10:26:29'), -(441, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:29', '2023-05-15 10:26:29'), -(442, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:29', '2023-05-15 10:26:29'), -(443, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:31', '2023-05-15 10:26:31'), -(444, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:31', '2023-05-15 10:26:31'), -(445, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:31', '2023-05-15 10:26:31'), -(446, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 22, 2, NULL, 2, 0, 0, '2023-05-15 10:26:34', '2023-05-15 10:26:34'), -(447, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 22, 2, NULL, 2, 0, 0, '2023-05-15 10:26:35', '2023-05-15 10:26:35'), -(448, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 22, 2, NULL, 2, 0, 0, '2023-05-15 10:26:35', '2023-05-15 10:26:35'), -(449, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:26:54', '2023-05-15 10:26:54'), -(450, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:14', '2023-05-15 10:27:14'), -(451, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:14', '2023-05-15 10:27:14'), -(452, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:15', '2023-05-15 10:27:15'), -(453, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:15', '2023-05-15 10:27:15'), -(454, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:15', '2023-05-15 10:27:15'), -(455, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:17', '2023-05-15 10:27:17'), -(456, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:17', '2023-05-15 10:27:17'), -(457, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:27:17', '2023-05-15 10:27:17'), -(458, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 23, 2, NULL, 2, 0, 0, '2023-05-15 10:27:19', '2023-05-15 10:27:19'), -(459, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 23, 2, NULL, 2, 0, 0, '2023-05-15 10:27:20', '2023-05-15 10:27:20'), -(460, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 23, 2, NULL, 2, 0, 0, '2023-05-15 10:27:20', '2023-05-15 10:27:20'), -(461, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:04', '2023-05-15 10:28:04'), -(462, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:04', '2023-05-15 10:28:04'), -(463, 1, 0, 'Error - The following e-mail template is missing: de/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:04', '2023-05-15 10:28:04'), -(464, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:04', '2023-05-15 10:28:04'), -(465, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:05', '2023-05-15 10:28:05'), -(466, 1, 0, 'Error - The following e-mail template is missing: de/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:06', '2023-05-15 10:28:06'), -(467, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:06', '2023-05-15 10:28:06'), -(468, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:06', '2023-05-15 10:28:06'), -(469, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 24, 2, NULL, 2, 0, 0, '2023-05-15 10:28:08', '2023-05-15 10:28:08'), -(470, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 24, 2, NULL, 2, 0, 0, '2023-05-15 10:28:09', '2023-05-15 10:28:09'), -(471, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 24, 2, NULL, 2, 0, 0, '2023-05-15 10:28:09', '2023-05-15 10:28:09'), -(472, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:20', '2023-05-15 10:28:20'), -(473, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:28:32', '2023-05-15 10:28:32'), -(474, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:29:10', '2023-05-15 10:29:10'), -(475, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:29:11', '2023-05-15 10:29:11'), -(476, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:29:11', '2023-05-15 10:29:11'), -(477, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:29:11', '2023-05-15 10:29:11'), -(478, 1, 0, 'Error - The following e-mail template is missing: en/payment.txt', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:29:13', '2023-05-15 10:29:13'), -(479, 1, 0, 'Error - The following e-mail template is missing: payment', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:29:13', '2023-05-15 10:29:13'), -(480, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 25, 2, NULL, 1, 0, 0, '2023-05-15 10:29:16', '2023-05-15 10:29:16'), -(481, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 25, 2, NULL, 1, 0, 0, '2023-05-15 10:29:16', '2023-05-15 10:29:16'), -(482, 1, 0, 'Frontcontroller::init - Cart cannot be loaded or an order has already been placed using this cart', 'Cart', 25, 2, NULL, 1, 0, 0, '2023-05-15 10:29:16', '2023-05-15 10:29:16'), -(483, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:30:05', '2023-05-15 10:30:05'), -(484, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:30:09', '2023-05-15 10:30:09'), -(485, 1, 0, 'Exporting mail with theme modern for language Nederlands (Dutch)', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:05', '2023-05-15 10:31:05'), -(486, 1, 0, 'Core output folder: /var/www/html/mails', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:05', '2023-05-15 10:31:05'), -(487, 1, 0, 'Modules output folder: /var/www/html/modules/', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:05', '2023-05-15 10:31:05'), -(488, 1, 0, 'Generate html template account at /var/www/html/mails/nl/account.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(489, 1, 0, 'Generate txt template account at /var/www/html/mails/nl/account.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(490, 1, 0, 'Generate html template backoffice_order at /var/www/html/mails/nl/backoffice_order.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(491, 1, 0, 'Generate txt template backoffice_order at /var/www/html/mails/nl/backoffice_order.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(492, 1, 0, 'Generate html template bankwire at /var/www/html/mails/nl/bankwire.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(493, 1, 0, 'Generate txt template bankwire at /var/www/html/mails/nl/bankwire.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(494, 1, 0, 'Generate html template cheque at /var/www/html/mails/nl/cheque.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(495, 1, 0, 'Generate txt template cheque at /var/www/html/mails/nl/cheque.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(496, 1, 0, 'Generate html template contact at /var/www/html/mails/nl/contact.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(497, 1, 0, 'Generate txt template contact at /var/www/html/mails/nl/contact.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(498, 1, 0, 'Generate html template contact_form at /var/www/html/mails/nl/contact_form.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(499, 1, 0, 'Generate txt template contact_form at /var/www/html/mails/nl/contact_form.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(500, 1, 0, 'Generate html template credit_slip at /var/www/html/mails/nl/credit_slip.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(501, 1, 0, 'Generate txt template credit_slip at /var/www/html/mails/nl/credit_slip.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(502, 1, 0, 'Generate html template download_product at /var/www/html/mails/nl/download_product.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:06', '2023-05-15 10:31:06'), -(503, 1, 0, 'Generate txt template download_product at /var/www/html/mails/nl/download_product.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(504, 1, 0, 'Generate html template employee_password at /var/www/html/mails/nl/employee_password.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(505, 1, 0, 'Generate txt template employee_password at /var/www/html/mails/nl/employee_password.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(506, 1, 0, 'Generate html template forward_msg at /var/www/html/mails/nl/forward_msg.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(507, 1, 0, 'Generate txt template forward_msg at /var/www/html/mails/nl/forward_msg.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(508, 1, 0, 'Generate html template guest_to_customer at /var/www/html/mails/nl/guest_to_customer.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(509, 1, 0, 'Generate txt template guest_to_customer at /var/www/html/mails/nl/guest_to_customer.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(510, 1, 0, 'Generate html template import at /var/www/html/mails/nl/import.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(511, 1, 0, 'Generate txt template import at /var/www/html/mails/nl/import.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(512, 1, 0, 'Generate html template in_transit at /var/www/html/mails/nl/in_transit.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(513, 1, 0, 'Generate txt template in_transit at /var/www/html/mails/nl/in_transit.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(514, 1, 0, 'Generate html template log_alert at /var/www/html/mails/nl/log_alert.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(515, 1, 0, 'Generate txt template log_alert at /var/www/html/mails/nl/log_alert.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(516, 1, 0, 'Generate html template newsletter at /var/www/html/mails/nl/newsletter.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(517, 1, 0, 'Generate txt template newsletter at /var/www/html/mails/nl/newsletter.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(518, 1, 0, 'Generate html template order_canceled at /var/www/html/mails/nl/order_canceled.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(519, 1, 0, 'Generate txt template order_canceled at /var/www/html/mails/nl/order_canceled.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(520, 1, 0, 'Generate html template order_changed at /var/www/html/mails/nl/order_changed.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(521, 1, 0, 'Generate txt template order_changed at /var/www/html/mails/nl/order_changed.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(522, 1, 0, 'Generate html template order_conf at /var/www/html/mails/nl/order_conf.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(523, 1, 0, 'Generate txt template order_conf at /var/www/html/mails/nl/order_conf.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:07', '2023-05-15 10:31:07'), -(524, 1, 0, 'Generate html template order_customer_comment at /var/www/html/mails/nl/order_customer_comment.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(525, 1, 0, 'Generate txt template order_customer_comment at /var/www/html/mails/nl/order_customer_comment.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(526, 1, 0, 'Generate html template order_merchant_comment at /var/www/html/mails/nl/order_merchant_comment.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(527, 1, 0, 'Generate txt template order_merchant_comment at /var/www/html/mails/nl/order_merchant_comment.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(528, 1, 0, 'Generate html template order_return_state at /var/www/html/mails/nl/order_return_state.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(529, 1, 0, 'Generate txt template order_return_state at /var/www/html/mails/nl/order_return_state.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(530, 1, 0, 'Generate html template outofstock at /var/www/html/mails/nl/outofstock.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(531, 1, 0, 'Generate txt template outofstock at /var/www/html/mails/nl/outofstock.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(532, 1, 0, 'Generate html template password at /var/www/html/mails/nl/password.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(533, 1, 0, 'Generate txt template password at /var/www/html/mails/nl/password.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(534, 1, 0, 'Generate html template password_query at /var/www/html/mails/nl/password_query.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(535, 1, 0, 'Generate txt template password_query at /var/www/html/mails/nl/password_query.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(536, 1, 0, 'Generate html template payment at /var/www/html/mails/nl/payment.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(537, 1, 0, 'Generate txt template payment at /var/www/html/mails/nl/payment.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(538, 1, 0, 'Generate html template payment_error at /var/www/html/mails/nl/payment_error.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(539, 1, 0, 'Generate txt template payment_error at /var/www/html/mails/nl/payment_error.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(540, 1, 0, 'Generate html template preparation at /var/www/html/mails/nl/preparation.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(541, 1, 0, 'Generate txt template preparation at /var/www/html/mails/nl/preparation.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(542, 1, 0, 'Generate html template productoutofstock at /var/www/html/mails/nl/productoutofstock.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(543, 1, 0, 'Generate txt template productoutofstock at /var/www/html/mails/nl/productoutofstock.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(544, 1, 0, 'Generate html template refund at /var/www/html/mails/nl/refund.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:08', '2023-05-15 10:31:08'), -(545, 1, 0, 'Generate txt template refund at /var/www/html/mails/nl/refund.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(546, 1, 0, 'Generate html template reply_msg at /var/www/html/mails/nl/reply_msg.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(547, 1, 0, 'Generate txt template reply_msg at /var/www/html/mails/nl/reply_msg.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(548, 1, 0, 'Generate html template shipped at /var/www/html/mails/nl/shipped.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(549, 1, 0, 'Generate txt template shipped at /var/www/html/mails/nl/shipped.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(550, 1, 0, 'Generate html template test at /var/www/html/mails/nl/test.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(551, 1, 0, 'Generate txt template test at /var/www/html/mails/nl/test.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(552, 1, 0, 'Generate html template voucher at /var/www/html/mails/nl/voucher.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(553, 1, 0, 'Generate txt template voucher at /var/www/html/mails/nl/voucher.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(554, 1, 0, 'Generate html template voucher_new at /var/www/html/mails/nl/voucher_new.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(555, 1, 0, 'Generate txt template voucher_new at /var/www/html/mails/nl/voucher_new.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(556, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//ps_reminder/mails/nl/followup_1.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(557, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//ps_reminder/mails/nl/followup_1.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(558, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//ps_reminder/mails/nl/followup_2.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(559, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//ps_reminder/mails/nl/followup_2.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(560, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//ps_reminder/mails/nl/followup_3.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(561, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//ps_reminder/mails/nl/followup_3.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(562, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//ps_reminder/mails/nl/followup_4.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(563, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//ps_reminder/mails/nl/followup_4.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(564, 1, 0, 'Generate html template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/nl/referralprogram-congratulations.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(565, 1, 0, 'Generate txt template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/nl/referralprogram-congratulations.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:09', '2023-05-15 10:31:09'), -(566, 1, 0, 'Generate html template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/nl/referralprogram-invitation.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(567, 1, 0, 'Generate txt template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/nl/referralprogram-invitation.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(568, 1, 0, 'Generate html template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/nl/referralprogram-voucher.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(569, 1, 0, 'Generate txt template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/nl/referralprogram-voucher.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(570, 1, 0, 'Generate html template customer_qty at /var/www/html/modules//ps_emailalerts/mails/nl/customer_qty.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(571, 1, 0, 'Generate txt template customer_qty at /var/www/html/modules//ps_emailalerts/mails/nl/customer_qty.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(572, 1, 0, 'Generate html template new_order at /var/www/html/modules//ps_emailalerts/mails/nl/new_order.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(573, 1, 0, 'Generate txt template new_order at /var/www/html/modules//ps_emailalerts/mails/nl/new_order.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(574, 1, 0, 'Generate html template order_changed at /var/www/html/modules//ps_emailalerts/mails/nl/order_changed.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(575, 1, 0, 'Generate txt template order_changed at /var/www/html/modules//ps_emailalerts/mails/nl/order_changed.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(576, 1, 0, 'Generate html template productcoverage at /var/www/html/modules//ps_emailalerts/mails/nl/productcoverage.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(577, 1, 0, 'Generate txt template productcoverage at /var/www/html/modules//ps_emailalerts/mails/nl/productcoverage.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(578, 1, 0, 'Generate html template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/nl/productoutofstock.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(579, 1, 0, 'Generate txt template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/nl/productoutofstock.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(580, 1, 0, 'Generate html template return_slip at /var/www/html/modules//ps_emailalerts/mails/nl/return_slip.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(581, 1, 0, 'Generate txt template return_slip at /var/www/html/modules//ps_emailalerts/mails/nl/return_slip.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:10', '2023-05-15 10:31:10'), -(582, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//followup/mails/nl/followup_1.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(583, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//followup/mails/nl/followup_1.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(584, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//followup/mails/nl/followup_2.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(585, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//followup/mails/nl/followup_2.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(586, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//followup/mails/nl/followup_3.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(587, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//followup/mails/nl/followup_3.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(588, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//followup/mails/nl/followup_4.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(589, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//followup/mails/nl/followup_4.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(590, 1, 0, 'Generate html template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_conf.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(591, 1, 0, 'Generate txt template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_conf.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(592, 1, 0, 'Generate html template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_verif.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(593, 1, 0, 'Generate txt template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_verif.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(594, 1, 0, 'Generate html template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_voucher.html', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(595, 1, 0, 'Generate txt template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_voucher.txt', '', 0, NULL, NULL, 1, 1, 1, '2023-05-15 10:31:11', '2023-05-15 10:31:11'), -(596, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:36:51', '2023-05-15 10:36:51'), -(597, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:37:59', '2023-05-15 10:37:59'), -(598, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:38:26', '2023-05-15 10:38:26'), -(599, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 2, 0, 0, '2023-05-15 10:39:34', '2023-05-15 10:39:34'), -(600, 1, 0, 'Mollie\\Service\\TransactionService::processTransaction said: Starting to process ORDER transaction.', '', 0, 2, NULL, 1, 0, 0, '2023-05-15 10:40:34', '2023-05-15 10:40:34'), -(601, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:26', '2023-08-28 10:50:26'), -(602, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:41', '2023-08-28 10:50:41'), -(603, 1, 0, 'Protect vendor folder in module mollie', '', 0, 2, NULL, 1, 0, 0, '2023-08-28 10:50:54', '2023-08-28 10:50:54'), -(604, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:56:38', '2023-08-28 10:56:38'), -(605, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 10:57:58', '2023-08-28 10:57:58'), -(606, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:47:47', '2023-08-28 11:47:47'), -(607, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:48:04', '2023-08-28 11:48:04'), -(608, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:48:18', '2023-08-28 11:48:18'), -(609, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 11:49:41', '2023-08-28 11:49:41'), -(610, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 11:50:13', '2023-08-28 11:50:13'), -(611, 1, 0, 'Back office connection from 83.187.117.14', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 11:50:48', '2023-08-28 11:50:48'), -(612, 1, 0, 'Error - The following e-mail template is missing: en/account.txt', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:54:29', '2023-08-28 11:54:29'), -(613, 1, 0, 'Error - The following e-mail template is missing: account', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:54:29', '2023-08-28 11:54:29'), -(614, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), -(615, 1, 0, 'Error - The following e-mail template is missing: en/bankwire.txt', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), -(616, 1, 0, 'Error - The following e-mail template is missing: bankwire', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), -(617, 1, 0, 'Error - The following e-mail template is missing: en/order_conf.txt', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'), -(618, 1, 0, 'Error - The following e-mail template is missing: order_conf', '', 0, 1, NULL, 1, 0, 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57'); +(1, 1, 0, 'Exporting mail with theme modern for language English (English)', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:12', '2023-08-28 13:26:12'), +(2, 1, 0, 'Core output folder: /var/www/html/mails', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:12', '2023-08-28 13:26:12'), +(3, 1, 0, 'Modules output folder: /var/www/html/modules/', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:12', '2023-08-28 13:26:12'), +(4, 1, 0, 'Generate html template account at /var/www/html/mails/en/account.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(5, 1, 0, 'Generate txt template account at /var/www/html/mails/en/account.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(6, 1, 0, 'Generate html template backoffice_order at /var/www/html/mails/en/backoffice_order.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(7, 1, 0, 'Generate txt template backoffice_order at /var/www/html/mails/en/backoffice_order.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(8, 1, 0, 'Generate html template bankwire at /var/www/html/mails/en/bankwire.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(9, 1, 0, 'Generate txt template bankwire at /var/www/html/mails/en/bankwire.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(10, 1, 0, 'Generate html template cheque at /var/www/html/mails/en/cheque.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(11, 1, 0, 'Generate txt template cheque at /var/www/html/mails/en/cheque.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(12, 1, 0, 'Generate html template contact at /var/www/html/mails/en/contact.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(13, 1, 0, 'Generate txt template contact at /var/www/html/mails/en/contact.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(14, 1, 0, 'Generate html template contact_form at /var/www/html/mails/en/contact_form.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(15, 1, 0, 'Generate txt template contact_form at /var/www/html/mails/en/contact_form.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(16, 1, 0, 'Generate html template credit_slip at /var/www/html/mails/en/credit_slip.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(17, 1, 0, 'Generate txt template credit_slip at /var/www/html/mails/en/credit_slip.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(18, 1, 0, 'Generate html template download_product at /var/www/html/mails/en/download_product.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(19, 1, 0, 'Generate txt template download_product at /var/www/html/mails/en/download_product.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(20, 1, 0, 'Generate html template employee_password at /var/www/html/mails/en/employee_password.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(21, 1, 0, 'Generate txt template employee_password at /var/www/html/mails/en/employee_password.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(22, 1, 0, 'Generate html template forward_msg at /var/www/html/mails/en/forward_msg.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(23, 1, 0, 'Generate txt template forward_msg at /var/www/html/mails/en/forward_msg.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(24, 1, 0, 'Generate html template guest_to_customer at /var/www/html/mails/en/guest_to_customer.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(25, 1, 0, 'Generate txt template guest_to_customer at /var/www/html/mails/en/guest_to_customer.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(26, 1, 0, 'Generate html template import at /var/www/html/mails/en/import.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(27, 1, 0, 'Generate txt template import at /var/www/html/mails/en/import.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:13', '2023-08-28 13:26:13'), +(28, 1, 0, 'Generate html template in_transit at /var/www/html/mails/en/in_transit.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(29, 1, 0, 'Generate txt template in_transit at /var/www/html/mails/en/in_transit.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(30, 1, 0, 'Generate html template log_alert at /var/www/html/mails/en/log_alert.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(31, 1, 0, 'Generate txt template log_alert at /var/www/html/mails/en/log_alert.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(32, 1, 0, 'Generate html template newsletter at /var/www/html/mails/en/newsletter.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(33, 1, 0, 'Generate txt template newsletter at /var/www/html/mails/en/newsletter.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(34, 1, 0, 'Generate html template order_canceled at /var/www/html/mails/en/order_canceled.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(35, 1, 0, 'Generate txt template order_canceled at /var/www/html/mails/en/order_canceled.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(36, 1, 0, 'Generate html template order_changed at /var/www/html/mails/en/order_changed.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(37, 1, 0, 'Generate txt template order_changed at /var/www/html/mails/en/order_changed.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(38, 1, 0, 'Generate html template order_conf at /var/www/html/mails/en/order_conf.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(39, 1, 0, 'Generate txt template order_conf at /var/www/html/mails/en/order_conf.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(40, 1, 0, 'Generate html template order_customer_comment at /var/www/html/mails/en/order_customer_comment.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(41, 1, 0, 'Generate txt template order_customer_comment at /var/www/html/mails/en/order_customer_comment.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(42, 1, 0, 'Generate html template order_merchant_comment at /var/www/html/mails/en/order_merchant_comment.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(43, 1, 0, 'Generate txt template order_merchant_comment at /var/www/html/mails/en/order_merchant_comment.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(44, 1, 0, 'Generate html template order_return_state at /var/www/html/mails/en/order_return_state.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(45, 1, 0, 'Generate txt template order_return_state at /var/www/html/mails/en/order_return_state.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(46, 1, 0, 'Generate html template outofstock at /var/www/html/mails/en/outofstock.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(47, 1, 0, 'Generate txt template outofstock at /var/www/html/mails/en/outofstock.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(48, 1, 0, 'Generate html template password at /var/www/html/mails/en/password.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(49, 1, 0, 'Generate txt template password at /var/www/html/mails/en/password.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(50, 1, 0, 'Generate html template password_query at /var/www/html/mails/en/password_query.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(51, 1, 0, 'Generate txt template password_query at /var/www/html/mails/en/password_query.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(52, 1, 0, 'Generate html template payment at /var/www/html/mails/en/payment.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(53, 1, 0, 'Generate txt template payment at /var/www/html/mails/en/payment.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:14', '2023-08-28 13:26:14'), +(54, 1, 0, 'Generate html template payment_error at /var/www/html/mails/en/payment_error.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(55, 1, 0, 'Generate txt template payment_error at /var/www/html/mails/en/payment_error.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(56, 1, 0, 'Generate html template preparation at /var/www/html/mails/en/preparation.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(57, 1, 0, 'Generate txt template preparation at /var/www/html/mails/en/preparation.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(58, 1, 0, 'Generate html template productoutofstock at /var/www/html/mails/en/productoutofstock.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(59, 1, 0, 'Generate txt template productoutofstock at /var/www/html/mails/en/productoutofstock.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(60, 1, 0, 'Generate html template refund at /var/www/html/mails/en/refund.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(61, 1, 0, 'Generate txt template refund at /var/www/html/mails/en/refund.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(62, 1, 0, 'Generate html template reply_msg at /var/www/html/mails/en/reply_msg.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(63, 1, 0, 'Generate txt template reply_msg at /var/www/html/mails/en/reply_msg.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(64, 1, 0, 'Generate html template shipped at /var/www/html/mails/en/shipped.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(65, 1, 0, 'Generate txt template shipped at /var/www/html/mails/en/shipped.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(66, 1, 0, 'Generate html template test at /var/www/html/mails/en/test.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(67, 1, 0, 'Generate txt template test at /var/www/html/mails/en/test.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(68, 1, 0, 'Generate html template voucher at /var/www/html/mails/en/voucher.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(69, 1, 0, 'Generate txt template voucher at /var/www/html/mails/en/voucher.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(70, 1, 0, 'Generate html template voucher_new at /var/www/html/mails/en/voucher_new.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(71, 1, 0, 'Generate txt template voucher_new at /var/www/html/mails/en/voucher_new.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(72, 1, 0, 'Generate html template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/en/referralprogram-congratulations.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(73, 1, 0, 'Generate txt template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/en/referralprogram-congratulations.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(74, 1, 0, 'Generate html template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/en/referralprogram-invitation.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(75, 1, 0, 'Generate txt template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/en/referralprogram-invitation.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(76, 1, 0, 'Generate html template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/en/referralprogram-voucher.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(77, 1, 0, 'Generate txt template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/en/referralprogram-voucher.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(78, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//ps_reminder/mails/en/followup_1.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(79, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//ps_reminder/mails/en/followup_1.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(80, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//ps_reminder/mails/en/followup_2.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:15', '2023-08-28 13:26:15'), +(81, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//ps_reminder/mails/en/followup_2.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(82, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//ps_reminder/mails/en/followup_3.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(83, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//ps_reminder/mails/en/followup_3.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(84, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//ps_reminder/mails/en/followup_4.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(85, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//ps_reminder/mails/en/followup_4.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(86, 1, 0, 'Generate html template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_conf.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(87, 1, 0, 'Generate txt template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_conf.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(88, 1, 0, 'Generate html template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_verif.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(89, 1, 0, 'Generate txt template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_verif.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(90, 1, 0, 'Generate html template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_voucher.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(91, 1, 0, 'Generate txt template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/en/newsletter_voucher.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(92, 1, 0, 'Generate html template customer_qty at /var/www/html/modules//ps_emailalerts/mails/en/customer_qty.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(93, 1, 0, 'Generate txt template customer_qty at /var/www/html/modules//ps_emailalerts/mails/en/customer_qty.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(94, 1, 0, 'Generate html template new_order at /var/www/html/modules//ps_emailalerts/mails/en/new_order.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(95, 1, 0, 'Generate txt template new_order at /var/www/html/modules//ps_emailalerts/mails/en/new_order.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(96, 1, 0, 'Generate html template order_changed at /var/www/html/modules//ps_emailalerts/mails/en/order_changed.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(97, 1, 0, 'Generate txt template order_changed at /var/www/html/modules//ps_emailalerts/mails/en/order_changed.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(98, 1, 0, 'Generate html template productcoverage at /var/www/html/modules//ps_emailalerts/mails/en/productcoverage.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(99, 1, 0, 'Generate txt template productcoverage at /var/www/html/modules//ps_emailalerts/mails/en/productcoverage.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(100, 1, 0, 'Generate html template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/en/productoutofstock.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(101, 1, 0, 'Generate txt template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/en/productoutofstock.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(102, 1, 0, 'Generate html template return_slip at /var/www/html/modules//ps_emailalerts/mails/en/return_slip.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(103, 1, 0, 'Generate txt template return_slip at /var/www/html/modules//ps_emailalerts/mails/en/return_slip.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(104, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//followup/mails/en/followup_1.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(105, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//followup/mails/en/followup_1.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(106, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//followup/mails/en/followup_2.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:16', '2023-08-28 13:26:16'), +(107, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//followup/mails/en/followup_2.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(108, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//followup/mails/en/followup_3.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(109, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//followup/mails/en/followup_3.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(110, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//followup/mails/en/followup_4.html', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(111, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//followup/mails/en/followup_4.txt', '', 0, 1, NULL, 0, 0, 0, '2023-08-28 13:26:17', '2023-08-28 13:26:17'), +(112, 1, 0, 'Protect vendor folder in module ps_linklist', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(113, 1, 0, 'Module ps_linklist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(114, 1, 0, 'Protect vendor folder in module blockreassurance', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(115, 1, 0, 'Module blockreassurance has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:21', '2023-08-28 13:26:21'), +(116, 1, 0, 'Protect vendor folder in module blockwishlist', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(117, 1, 0, 'Module blockwishlist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(118, 1, 0, 'Protect vendor folder in module psgdpr', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(119, 1, 0, 'Module psgdpr has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(120, 1, 0, 'Protect vendor folder in module ps_contactinfo', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(121, 1, 0, 'Module ps_contactinfo has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(122, 1, 0, 'Protect vendor folder in module ps_languageselector', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(123, 1, 0, 'Module ps_languageselector has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(124, 1, 0, 'Protect vendor folder in module ps_currencyselector', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(125, 1, 0, 'Module ps_currencyselector has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(126, 1, 0, 'Protect vendor folder in module ps_customersignin', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(127, 1, 0, 'Module ps_customersignin has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(128, 1, 0, 'Protect vendor folder in module ps_shoppingcart', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(129, 1, 0, 'Module ps_shoppingcart has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:22', '2023-08-28 13:26:22'), +(130, 1, 0, 'Protect vendor folder in module ps_mainmenu', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(131, 1, 0, 'Module ps_mainmenu has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(132, 1, 0, 'Protect vendor folder in module ps_searchbar', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(133, 1, 0, 'Module ps_searchbar has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(134, 1, 0, 'Protect vendor folder in module ps_imageslider', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(135, 1, 0, 'Module ps_imageslider has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(136, 1, 0, 'Protect vendor folder in module ps_featuredproducts', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(137, 1, 0, 'Module ps_featuredproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(138, 1, 0, 'Protect vendor folder in module ps_banner', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(139, 1, 0, 'Module ps_banner has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(140, 1, 0, 'Protect vendor folder in module ps_customtext', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(141, 1, 0, 'Module ps_customtext has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(142, 1, 0, 'Protect vendor folder in module ps_specials', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(143, 1, 0, 'Module ps_specials has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(144, 1, 0, 'Protect vendor folder in module ps_newproducts', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(145, 1, 0, 'Module ps_newproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(146, 1, 0, 'Protect vendor folder in module ps_bestsellers', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:23', '2023-08-28 13:26:23'), +(147, 1, 0, 'Module ps_bestsellers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(148, 1, 0, 'Protect vendor folder in module ps_emailsubscription', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(149, 1, 0, 'Module ps_emailsubscription has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(150, 1, 0, 'Protect vendor folder in module ps_socialfollow', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(151, 1, 0, 'Module ps_socialfollow has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(152, 1, 0, 'Protect vendor folder in module ps_customeraccountlinks', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(153, 1, 0, 'Module ps_customeraccountlinks has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(154, 1, 0, 'Protect vendor folder in module productcomments', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(155, 1, 0, 'Module productcomments has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(156, 1, 0, 'Protect vendor folder in module ps_categorytree', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(157, 1, 0, 'Module ps_categorytree has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:24', '2023-08-28 13:26:24'), +(158, 1, 0, 'Protect vendor folder in module ps_facetedsearch', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(159, 1, 0, 'Module ps_facetedsearch has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(160, 1, 0, 'Protect vendor folder in module contactform', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(161, 1, 0, 'Module contactform has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(162, 1, 0, 'Protect vendor folder in module ps_sharebuttons', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(163, 1, 0, 'Module ps_sharebuttons has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:26:25', '2023-08-28 13:26:25'), +(164, 1, 0, 'Protect vendor folder in module statscarrier', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(165, 1, 0, 'Module statscarrier has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(166, 1, 0, 'Protect vendor folder in module ps_brandlist', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(167, 1, 0, 'Module ps_brandlist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(168, 1, 0, 'Protect vendor folder in module statsbestcategories', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(169, 1, 0, 'Module statsbestcategories has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(170, 1, 0, 'Protect vendor folder in module statssales', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(171, 1, 0, 'Module statssales has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(172, 1, 0, 'Protect vendor folder in module dashproducts', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(173, 1, 0, 'Module dashproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(174, 1, 0, 'Protect vendor folder in module ps_checkpayment', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(175, 1, 0, 'Module ps_checkpayment has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(176, 1, 0, 'Protect vendor folder in module statssearch', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(177, 1, 0, 'Module statssearch has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(178, 1, 0, 'Protect vendor folder in module statscatalog', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(179, 1, 0, 'Module statscatalog has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(180, 1, 0, 'Protect vendor folder in module ps_categoryproducts', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:56', '2023-08-28 13:27:56'), +(181, 1, 0, 'Module ps_categoryproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(182, 1, 0, 'Protect vendor folder in module statspersonalinfos', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(183, 1, 0, 'Module statspersonalinfos has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(184, 1, 0, 'Protect vendor folder in module statsforecast', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(185, 1, 0, 'Module statsforecast has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(186, 1, 0, 'Protect vendor folder in module ps_distributionapiclient', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(187, 1, 0, 'Module ps_distributionapiclient has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(188, 1, 0, 'Protect vendor folder in module statsbestvouchers', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(189, 1, 0, 'Module statsbestvouchers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(190, 1, 0, 'Protect vendor folder in module ps_viewedproduct', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(191, 1, 0, 'Module ps_viewedproduct has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(192, 1, 0, 'Protect vendor folder in module statsbestproducts', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(193, 1, 0, 'Module statsbestproducts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(194, 1, 0, 'Protect vendor folder in module statsregistrations', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(195, 1, 0, 'Module statsregistrations has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(196, 1, 0, 'Protect vendor folder in module ps_supplierlist', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(197, 1, 0, 'Module ps_supplierlist has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(198, 1, 0, 'Protect vendor folder in module statscheckup', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(199, 1, 0, 'Module statscheckup has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(200, 1, 0, 'Protect vendor folder in module ps_googleanalytics', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(201, 1, 0, 'Module ps_googleanalytics has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(202, 1, 0, 'Protect vendor folder in module dashactivity', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(203, 1, 0, 'Module dashactivity has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:57', '2023-08-28 13:27:57'), +(204, 1, 0, 'Protect vendor folder in module gsitemap', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(205, 1, 0, 'Module gsitemap has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(206, 1, 0, 'Protect vendor folder in module pagesnotfound', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(207, 1, 0, 'Module pagesnotfound has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(208, 1, 0, 'Protect vendor folder in module ps_dataprivacy', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(209, 1, 0, 'Module ps_dataprivacy has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(210, 1, 0, 'Protect vendor folder in module graphnvd3', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(211, 1, 0, 'Module graphnvd3 has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(212, 1, 0, 'Protect vendor folder in module ps_themecusto', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(213, 1, 0, 'Module ps_themecusto has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(214, 1, 0, 'Protect vendor folder in module ps_emailalerts', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(215, 1, 0, 'Module ps_emailalerts has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(216, 1, 0, 'Protect vendor folder in module ps_wirepayment', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(217, 1, 0, 'Module ps_wirepayment has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(218, 1, 0, 'Protect vendor folder in module statsnewsletter', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(219, 1, 0, 'Module statsnewsletter has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(220, 1, 0, 'Protect vendor folder in module statsbestmanufacturers', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(221, 1, 0, 'Module statsbestmanufacturers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(222, 1, 0, 'Protect vendor folder in module statsproduct', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(223, 1, 0, 'Module statsproduct has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:58', '2023-08-28 13:27:58'), +(224, 1, 0, 'Protect vendor folder in module ps_crossselling', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(225, 1, 0, 'Module ps_crossselling has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(226, 1, 0, 'Protect vendor folder in module dashtrends', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(227, 1, 0, 'Module dashtrends has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(228, 1, 0, 'Protect vendor folder in module statsstock', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(229, 1, 0, 'Module statsstock has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(230, 1, 0, 'Protect vendor folder in module gridhtml', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(231, 1, 0, 'Module gridhtml has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(232, 1, 0, 'Protect vendor folder in module statsbestsuppliers', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(233, 1, 0, 'Module statsbestsuppliers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(234, 1, 0, 'Protect vendor folder in module dashgoals', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(235, 1, 0, 'Module dashgoals has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(236, 1, 0, 'Protect vendor folder in module statsdata', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(237, 1, 0, 'Module statsdata has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(238, 1, 0, 'Protect vendor folder in module ps_cashondelivery', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(239, 1, 0, 'Module ps_cashondelivery has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(240, 1, 0, 'Protect vendor folder in module statsbestcustomers', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(241, 1, 0, 'Module statsbestcustomers has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:27:59', '2023-08-28 13:27:59'), +(242, 1, 0, 'Protect vendor folder in module mollie', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:28:02', '2023-08-28 13:28:02'), +(243, 1, 0, 'Protect vendor folder in module ps_facetedsearch', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(244, 1, 0, 'Module ps_facetedsearch has no vendor folder', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:28:06', '2023-08-28 13:28:06'), +(245, 1, 0, 'Back office connection from 172.18.0.1', '', 0, NULL, NULL, 1, 1, 1, '2023-08-28 13:42:08', '2023-08-28 13:42:08'), +(246, 1, 0, 'Exporting mail with theme modern for language Nederlands (Dutch)', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(247, 1, 0, 'Core output folder: /var/www/html/mails', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(248, 1, 0, 'Modules output folder: /var/www/html/modules/', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(249, 1, 0, 'Generate html template account at /var/www/html/mails/nl/account.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(250, 1, 0, 'Generate txt template account at /var/www/html/mails/nl/account.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(251, 1, 0, 'Generate html template backoffice_order at /var/www/html/mails/nl/backoffice_order.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(252, 1, 0, 'Generate txt template backoffice_order at /var/www/html/mails/nl/backoffice_order.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(253, 1, 0, 'Generate html template bankwire at /var/www/html/mails/nl/bankwire.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(254, 1, 0, 'Generate txt template bankwire at /var/www/html/mails/nl/bankwire.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:03', '2023-08-28 13:47:03'), +(255, 1, 0, 'Generate html template cheque at /var/www/html/mails/nl/cheque.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(256, 1, 0, 'Generate txt template cheque at /var/www/html/mails/nl/cheque.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(257, 1, 0, 'Generate html template contact at /var/www/html/mails/nl/contact.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(258, 1, 0, 'Generate txt template contact at /var/www/html/mails/nl/contact.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(259, 1, 0, 'Generate html template contact_form at /var/www/html/mails/nl/contact_form.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(260, 1, 0, 'Generate txt template contact_form at /var/www/html/mails/nl/contact_form.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(261, 1, 0, 'Generate html template credit_slip at /var/www/html/mails/nl/credit_slip.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(262, 1, 0, 'Generate txt template credit_slip at /var/www/html/mails/nl/credit_slip.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(263, 1, 0, 'Generate html template download_product at /var/www/html/mails/nl/download_product.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(264, 1, 0, 'Generate txt template download_product at /var/www/html/mails/nl/download_product.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(265, 1, 0, 'Generate html template employee_password at /var/www/html/mails/nl/employee_password.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(266, 1, 0, 'Generate txt template employee_password at /var/www/html/mails/nl/employee_password.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(267, 1, 0, 'Generate html template forward_msg at /var/www/html/mails/nl/forward_msg.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(268, 1, 0, 'Generate txt template forward_msg at /var/www/html/mails/nl/forward_msg.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(269, 1, 0, 'Generate html template guest_to_customer at /var/www/html/mails/nl/guest_to_customer.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(270, 1, 0, 'Generate txt template guest_to_customer at /var/www/html/mails/nl/guest_to_customer.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(271, 1, 0, 'Generate html template import at /var/www/html/mails/nl/import.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(272, 1, 0, 'Generate txt template import at /var/www/html/mails/nl/import.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(273, 1, 0, 'Generate html template in_transit at /var/www/html/mails/nl/in_transit.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(274, 1, 0, 'Generate txt template in_transit at /var/www/html/mails/nl/in_transit.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(275, 1, 0, 'Generate html template log_alert at /var/www/html/mails/nl/log_alert.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(276, 1, 0, 'Generate txt template log_alert at /var/www/html/mails/nl/log_alert.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(277, 1, 0, 'Generate html template newsletter at /var/www/html/mails/nl/newsletter.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(278, 1, 0, 'Generate txt template newsletter at /var/www/html/mails/nl/newsletter.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(279, 1, 0, 'Generate html template order_canceled at /var/www/html/mails/nl/order_canceled.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(280, 1, 0, 'Generate txt template order_canceled at /var/www/html/mails/nl/order_canceled.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:04', '2023-08-28 13:47:04'), +(281, 1, 0, 'Generate html template order_changed at /var/www/html/mails/nl/order_changed.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(282, 1, 0, 'Generate txt template order_changed at /var/www/html/mails/nl/order_changed.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(283, 1, 0, 'Generate html template order_conf at /var/www/html/mails/nl/order_conf.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(284, 1, 0, 'Generate txt template order_conf at /var/www/html/mails/nl/order_conf.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(285, 1, 0, 'Generate html template order_customer_comment at /var/www/html/mails/nl/order_customer_comment.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(286, 1, 0, 'Generate txt template order_customer_comment at /var/www/html/mails/nl/order_customer_comment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(287, 1, 0, 'Generate html template order_merchant_comment at /var/www/html/mails/nl/order_merchant_comment.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(288, 1, 0, 'Generate txt template order_merchant_comment at /var/www/html/mails/nl/order_merchant_comment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(289, 1, 0, 'Generate html template order_return_state at /var/www/html/mails/nl/order_return_state.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(290, 1, 0, 'Generate txt template order_return_state at /var/www/html/mails/nl/order_return_state.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(291, 1, 0, 'Generate html template outofstock at /var/www/html/mails/nl/outofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(292, 1, 0, 'Generate txt template outofstock at /var/www/html/mails/nl/outofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(293, 1, 0, 'Generate html template password at /var/www/html/mails/nl/password.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(294, 1, 0, 'Generate txt template password at /var/www/html/mails/nl/password.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(295, 1, 0, 'Generate html template password_query at /var/www/html/mails/nl/password_query.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(296, 1, 0, 'Generate txt template password_query at /var/www/html/mails/nl/password_query.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(297, 1, 0, 'Generate html template payment at /var/www/html/mails/nl/payment.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(298, 1, 0, 'Generate txt template payment at /var/www/html/mails/nl/payment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(299, 1, 0, 'Generate html template payment_error at /var/www/html/mails/nl/payment_error.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(300, 1, 0, 'Generate txt template payment_error at /var/www/html/mails/nl/payment_error.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(301, 1, 0, 'Generate html template preparation at /var/www/html/mails/nl/preparation.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(302, 1, 0, 'Generate txt template preparation at /var/www/html/mails/nl/preparation.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:05', '2023-08-28 13:47:05'), +(303, 1, 0, 'Generate html template productoutofstock at /var/www/html/mails/nl/productoutofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(304, 1, 0, 'Generate txt template productoutofstock at /var/www/html/mails/nl/productoutofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(305, 1, 0, 'Generate html template refund at /var/www/html/mails/nl/refund.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(306, 1, 0, 'Generate txt template refund at /var/www/html/mails/nl/refund.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(307, 1, 0, 'Generate html template reply_msg at /var/www/html/mails/nl/reply_msg.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(308, 1, 0, 'Generate txt template reply_msg at /var/www/html/mails/nl/reply_msg.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(309, 1, 0, 'Generate html template shipped at /var/www/html/mails/nl/shipped.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(310, 1, 0, 'Generate txt template shipped at /var/www/html/mails/nl/shipped.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(311, 1, 0, 'Generate html template test at /var/www/html/mails/nl/test.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(312, 1, 0, 'Generate txt template test at /var/www/html/mails/nl/test.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(313, 1, 0, 'Generate html template voucher at /var/www/html/mails/nl/voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(314, 1, 0, 'Generate txt template voucher at /var/www/html/mails/nl/voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(315, 1, 0, 'Generate html template voucher_new at /var/www/html/mails/nl/voucher_new.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(316, 1, 0, 'Generate txt template voucher_new at /var/www/html/mails/nl/voucher_new.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(317, 1, 0, 'Generate html template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/nl/referralprogram-congratulations.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(318, 1, 0, 'Generate txt template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/nl/referralprogram-congratulations.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(319, 1, 0, 'Generate html template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/nl/referralprogram-invitation.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(320, 1, 0, 'Generate txt template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/nl/referralprogram-invitation.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(321, 1, 0, 'Generate html template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/nl/referralprogram-voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(322, 1, 0, 'Generate txt template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/nl/referralprogram-voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(323, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//ps_reminder/mails/nl/followup_1.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(324, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//ps_reminder/mails/nl/followup_1.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(325, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//ps_reminder/mails/nl/followup_2.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(326, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//ps_reminder/mails/nl/followup_2.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(327, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//ps_reminder/mails/nl/followup_3.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(328, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//ps_reminder/mails/nl/followup_3.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(329, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//ps_reminder/mails/nl/followup_4.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:06', '2023-08-28 13:47:06'), +(330, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//ps_reminder/mails/nl/followup_4.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(331, 1, 0, 'Generate html template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_conf.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(332, 1, 0, 'Generate txt template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_conf.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(333, 1, 0, 'Generate html template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_verif.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(334, 1, 0, 'Generate txt template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_verif.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(335, 1, 0, 'Generate html template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(336, 1, 0, 'Generate txt template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/nl/newsletter_voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(337, 1, 0, 'Generate html template customer_qty at /var/www/html/modules//ps_emailalerts/mails/nl/customer_qty.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(338, 1, 0, 'Generate txt template customer_qty at /var/www/html/modules//ps_emailalerts/mails/nl/customer_qty.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(339, 1, 0, 'Generate html template new_order at /var/www/html/modules//ps_emailalerts/mails/nl/new_order.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(340, 1, 0, 'Generate txt template new_order at /var/www/html/modules//ps_emailalerts/mails/nl/new_order.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(341, 1, 0, 'Generate html template order_changed at /var/www/html/modules//ps_emailalerts/mails/nl/order_changed.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(342, 1, 0, 'Generate txt template order_changed at /var/www/html/modules//ps_emailalerts/mails/nl/order_changed.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(343, 1, 0, 'Generate html template productcoverage at /var/www/html/modules//ps_emailalerts/mails/nl/productcoverage.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(344, 1, 0, 'Generate txt template productcoverage at /var/www/html/modules//ps_emailalerts/mails/nl/productcoverage.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(345, 1, 0, 'Generate html template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/nl/productoutofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(346, 1, 0, 'Generate txt template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/nl/productoutofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(347, 1, 0, 'Generate html template return_slip at /var/www/html/modules//ps_emailalerts/mails/nl/return_slip.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(348, 1, 0, 'Generate txt template return_slip at /var/www/html/modules//ps_emailalerts/mails/nl/return_slip.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(349, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//followup/mails/nl/followup_1.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(350, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//followup/mails/nl/followup_1.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(351, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//followup/mails/nl/followup_2.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(352, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//followup/mails/nl/followup_2.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(353, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//followup/mails/nl/followup_3.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(354, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//followup/mails/nl/followup_3.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:07', '2023-08-28 13:47:07'), +(355, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//followup/mails/nl/followup_4.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:08', '2023-08-28 13:47:08'), +(356, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//followup/mails/nl/followup_4.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:08', '2023-08-28 13:47:08'), +(357, 1, 0, 'Exporting mail with theme modern for language Deutsch (German)', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(358, 1, 0, 'Core output folder: /var/www/html/mails', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(359, 1, 0, 'Modules output folder: /var/www/html/modules/', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(360, 1, 0, 'Generate html template account at /var/www/html/mails/de/account.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(361, 1, 0, 'Generate txt template account at /var/www/html/mails/de/account.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(362, 1, 0, 'Generate html template backoffice_order at /var/www/html/mails/de/backoffice_order.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(363, 1, 0, 'Generate txt template backoffice_order at /var/www/html/mails/de/backoffice_order.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(364, 1, 0, 'Generate html template bankwire at /var/www/html/mails/de/bankwire.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(365, 1, 0, 'Generate txt template bankwire at /var/www/html/mails/de/bankwire.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(366, 1, 0, 'Generate html template cheque at /var/www/html/mails/de/cheque.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(367, 1, 0, 'Generate txt template cheque at /var/www/html/mails/de/cheque.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(368, 1, 0, 'Generate html template contact at /var/www/html/mails/de/contact.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(369, 1, 0, 'Generate txt template contact at /var/www/html/mails/de/contact.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(370, 1, 0, 'Generate html template contact_form at /var/www/html/mails/de/contact_form.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:51', '2023-08-28 13:47:51'), +(371, 1, 0, 'Generate txt template contact_form at /var/www/html/mails/de/contact_form.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(372, 1, 0, 'Generate html template credit_slip at /var/www/html/mails/de/credit_slip.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(373, 1, 0, 'Generate txt template credit_slip at /var/www/html/mails/de/credit_slip.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(374, 1, 0, 'Generate html template download_product at /var/www/html/mails/de/download_product.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(375, 1, 0, 'Generate txt template download_product at /var/www/html/mails/de/download_product.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(376, 1, 0, 'Generate html template employee_password at /var/www/html/mails/de/employee_password.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(377, 1, 0, 'Generate txt template employee_password at /var/www/html/mails/de/employee_password.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(378, 1, 0, 'Generate html template forward_msg at /var/www/html/mails/de/forward_msg.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(379, 1, 0, 'Generate txt template forward_msg at /var/www/html/mails/de/forward_msg.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(380, 1, 0, 'Generate html template guest_to_customer at /var/www/html/mails/de/guest_to_customer.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(381, 1, 0, 'Generate txt template guest_to_customer at /var/www/html/mails/de/guest_to_customer.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(382, 1, 0, 'Generate html template import at /var/www/html/mails/de/import.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(383, 1, 0, 'Generate txt template import at /var/www/html/mails/de/import.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(384, 1, 0, 'Generate html template in_transit at /var/www/html/mails/de/in_transit.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(385, 1, 0, 'Generate txt template in_transit at /var/www/html/mails/de/in_transit.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(386, 1, 0, 'Generate html template log_alert at /var/www/html/mails/de/log_alert.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(387, 1, 0, 'Generate txt template log_alert at /var/www/html/mails/de/log_alert.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(388, 1, 0, 'Generate html template newsletter at /var/www/html/mails/de/newsletter.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(389, 1, 0, 'Generate txt template newsletter at /var/www/html/mails/de/newsletter.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(390, 1, 0, 'Generate html template order_canceled at /var/www/html/mails/de/order_canceled.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(391, 1, 0, 'Generate txt template order_canceled at /var/www/html/mails/de/order_canceled.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(392, 1, 0, 'Generate html template order_changed at /var/www/html/mails/de/order_changed.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(393, 1, 0, 'Generate txt template order_changed at /var/www/html/mails/de/order_changed.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(394, 1, 0, 'Generate html template order_conf at /var/www/html/mails/de/order_conf.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(395, 1, 0, 'Generate txt template order_conf at /var/www/html/mails/de/order_conf.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(396, 1, 0, 'Generate html template order_customer_comment at /var/www/html/mails/de/order_customer_comment.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(397, 1, 0, 'Generate txt template order_customer_comment at /var/www/html/mails/de/order_customer_comment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(398, 1, 0, 'Generate html template order_merchant_comment at /var/www/html/mails/de/order_merchant_comment.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(399, 1, 0, 'Generate txt template order_merchant_comment at /var/www/html/mails/de/order_merchant_comment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(400, 1, 0, 'Generate html template order_return_state at /var/www/html/mails/de/order_return_state.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(401, 1, 0, 'Generate txt template order_return_state at /var/www/html/mails/de/order_return_state.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:52', '2023-08-28 13:47:52'), +(402, 1, 0, 'Generate html template outofstock at /var/www/html/mails/de/outofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(403, 1, 0, 'Generate txt template outofstock at /var/www/html/mails/de/outofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(404, 1, 0, 'Generate html template password at /var/www/html/mails/de/password.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(405, 1, 0, 'Generate txt template password at /var/www/html/mails/de/password.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(406, 1, 0, 'Generate html template password_query at /var/www/html/mails/de/password_query.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(407, 1, 0, 'Generate txt template password_query at /var/www/html/mails/de/password_query.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(408, 1, 0, 'Generate html template payment at /var/www/html/mails/de/payment.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(409, 1, 0, 'Generate txt template payment at /var/www/html/mails/de/payment.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(410, 1, 0, 'Generate html template payment_error at /var/www/html/mails/de/payment_error.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(411, 1, 0, 'Generate txt template payment_error at /var/www/html/mails/de/payment_error.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(412, 1, 0, 'Generate html template preparation at /var/www/html/mails/de/preparation.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(413, 1, 0, 'Generate txt template preparation at /var/www/html/mails/de/preparation.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(414, 1, 0, 'Generate html template productoutofstock at /var/www/html/mails/de/productoutofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(415, 1, 0, 'Generate txt template productoutofstock at /var/www/html/mails/de/productoutofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(416, 1, 0, 'Generate html template refund at /var/www/html/mails/de/refund.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(417, 1, 0, 'Generate txt template refund at /var/www/html/mails/de/refund.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(418, 1, 0, 'Generate html template reply_msg at /var/www/html/mails/de/reply_msg.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(419, 1, 0, 'Generate txt template reply_msg at /var/www/html/mails/de/reply_msg.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(420, 1, 0, 'Generate html template shipped at /var/www/html/mails/de/shipped.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(421, 1, 0, 'Generate txt template shipped at /var/www/html/mails/de/shipped.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(422, 1, 0, 'Generate html template test at /var/www/html/mails/de/test.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(423, 1, 0, 'Generate txt template test at /var/www/html/mails/de/test.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(424, 1, 0, 'Generate html template voucher at /var/www/html/mails/de/voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(425, 1, 0, 'Generate txt template voucher at /var/www/html/mails/de/voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(426, 1, 0, 'Generate html template voucher_new at /var/www/html/mails/de/voucher_new.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(427, 1, 0, 'Generate txt template voucher_new at /var/www/html/mails/de/voucher_new.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(428, 1, 0, 'Generate html template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/de/referralprogram-congratulations.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(429, 1, 0, 'Generate txt template referralprogram-congratulations at /var/www/html/modules//referralprogram/mails/de/referralprogram-congratulations.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(430, 1, 0, 'Generate html template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/de/referralprogram-invitation.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(431, 1, 0, 'Generate txt template referralprogram-invitation at /var/www/html/modules//referralprogram/mails/de/referralprogram-invitation.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(432, 1, 0, 'Generate html template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/de/referralprogram-voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(433, 1, 0, 'Generate txt template referralprogram-voucher at /var/www/html/modules//referralprogram/mails/de/referralprogram-voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(434, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//ps_reminder/mails/de/followup_1.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(435, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//ps_reminder/mails/de/followup_1.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:53', '2023-08-28 13:47:53'), +(436, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//ps_reminder/mails/de/followup_2.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(437, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//ps_reminder/mails/de/followup_2.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(438, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//ps_reminder/mails/de/followup_3.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(439, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//ps_reminder/mails/de/followup_3.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(440, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//ps_reminder/mails/de/followup_4.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(441, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//ps_reminder/mails/de/followup_4.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(442, 1, 0, 'Generate html template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_conf.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(443, 1, 0, 'Generate txt template newsletter_conf at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_conf.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(444, 1, 0, 'Generate html template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_verif.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(445, 1, 0, 'Generate txt template newsletter_verif at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_verif.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(446, 1, 0, 'Generate html template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_voucher.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(447, 1, 0, 'Generate txt template newsletter_voucher at /var/www/html/modules//ps_emailsubscription/mails/de/newsletter_voucher.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(448, 1, 0, 'Generate html template customer_qty at /var/www/html/modules//ps_emailalerts/mails/de/customer_qty.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(449, 1, 0, 'Generate txt template customer_qty at /var/www/html/modules//ps_emailalerts/mails/de/customer_qty.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(450, 1, 0, 'Generate html template new_order at /var/www/html/modules//ps_emailalerts/mails/de/new_order.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(451, 1, 0, 'Generate txt template new_order at /var/www/html/modules//ps_emailalerts/mails/de/new_order.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(452, 1, 0, 'Generate html template order_changed at /var/www/html/modules//ps_emailalerts/mails/de/order_changed.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(453, 1, 0, 'Generate txt template order_changed at /var/www/html/modules//ps_emailalerts/mails/de/order_changed.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(454, 1, 0, 'Generate html template productcoverage at /var/www/html/modules//ps_emailalerts/mails/de/productcoverage.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(455, 1, 0, 'Generate txt template productcoverage at /var/www/html/modules//ps_emailalerts/mails/de/productcoverage.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(456, 1, 0, 'Generate html template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/de/productoutofstock.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(457, 1, 0, 'Generate txt template productoutofstock at /var/www/html/modules//ps_emailalerts/mails/de/productoutofstock.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(458, 1, 0, 'Generate html template return_slip at /var/www/html/modules//ps_emailalerts/mails/de/return_slip.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(459, 1, 0, 'Generate txt template return_slip at /var/www/html/modules//ps_emailalerts/mails/de/return_slip.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(460, 1, 0, 'Generate html template followup_1 at /var/www/html/modules//followup/mails/de/followup_1.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(461, 1, 0, 'Generate txt template followup_1 at /var/www/html/modules//followup/mails/de/followup_1.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(462, 1, 0, 'Generate html template followup_2 at /var/www/html/modules//followup/mails/de/followup_2.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(463, 1, 0, 'Generate txt template followup_2 at /var/www/html/modules//followup/mails/de/followup_2.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(464, 1, 0, 'Generate html template followup_3 at /var/www/html/modules//followup/mails/de/followup_3.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(465, 1, 0, 'Generate txt template followup_3 at /var/www/html/modules//followup/mails/de/followup_3.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(466, 1, 0, 'Generate html template followup_4 at /var/www/html/modules//followup/mails/de/followup_4.html', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(467, 1, 0, 'Generate txt template followup_4 at /var/www/html/modules//followup/mails/de/followup_4.txt', '', 0, 1, NULL, 1, 0, 1, '2023-08-28 13:47:54', '2023-08-28 13:47:54'), +(468, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 1, NULL, 1, 0, 0, '2023-08-28 13:48:29', '2023-08-28 13:48:29'), +(469, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 1, NULL, 1, 0, 0, '2023-08-28 13:51:23', '2023-08-28 13:51:23'), +(470, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 1, NULL, 1, 0, 0, '2023-08-28 13:51:23', '2023-08-28 13:51:23'), +(471, 3, 0, 'Swift Error: Expected response code 220 but got an empty response', 'SwiftMessage', 0, 1, NULL, 1, 0, 0, '2023-08-28 13:51:23', '2023-08-28 13:51:23'); DROP TABLE IF EXISTS `ps_mail`; CREATE TABLE `ps_mail` ( - `id_mail` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_mail` int(11) unsigned NOT NULL AUTO_INCREMENT, `recipient` varchar(126) NOT NULL, `template` varchar(62) NOT NULL, `subject` varchar(254) NOT NULL, - `id_lang` int(10) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, `date_add` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id_mail`), KEY `recipient` (`recipient`(10)) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_mailalert_customer_oos`; @@ -10288,11 +7988,11 @@ CREATE TABLE `ps_manufacturer` ( `date_upd` datetime NOT NULL, `active` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id_manufacturer`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_manufacturer` (`id_manufacturer`, `name`, `date_add`, `date_upd`, `active`) VALUES -(1, 'Studio Design', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1), -(2, 'Graphic Corner', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1); +(1, 'Studio Design', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1), +(2, 'Graphic Corner', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1); DROP TABLE IF EXISTS `ps_manufacturer_lang`; CREATE TABLE `ps_manufacturer_lang` ( @@ -10304,7 +8004,7 @@ CREATE TABLE `ps_manufacturer_lang` ( `meta_keywords` varchar(255) DEFAULT NULL, `meta_description` varchar(512) DEFAULT NULL, PRIMARY KEY (`id_manufacturer`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_manufacturer_lang` (`id_manufacturer`, `id_lang`, `description`, `short_description`, `meta_title`, `meta_keywords`, `meta_description`) VALUES (1, 1, '

Studio Design offers a range of items from ready-to-wear collections to contemporary objects. The brand has been presenting new ideas and trends since its creation in 2012.

', '', '', '', ''), @@ -10316,26 +8016,24 @@ INSERT INTO `ps_manufacturer_lang` (`id_manufacturer`, `id_lang`, `description`, DROP TABLE IF EXISTS `ps_manufacturer_shop`; CREATE TABLE `ps_manufacturer_shop` ( - `id_manufacturer` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_manufacturer` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_manufacturer`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_manufacturer_shop` (`id_manufacturer`, `id_shop`) VALUES (1, 1), -(2, 1), -(1, 2), -(2, 2); +(2, 1); DROP TABLE IF EXISTS `ps_memcached_servers`; CREATE TABLE `ps_memcached_servers` ( - `id_memcached_server` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_memcached_server` int(11) unsigned NOT NULL AUTO_INCREMENT, `ip` varchar(254) NOT NULL, - `port` int(10) unsigned NOT NULL, - `weight` int(10) unsigned NOT NULL, + `port` int(11) unsigned NOT NULL, + `weight` int(11) unsigned NOT NULL, PRIMARY KEY (`id_memcached_server`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_message`; @@ -10346,14 +8044,14 @@ CREATE TABLE `ps_message` ( `id_employee` int(10) unsigned DEFAULT NULL, `id_order` int(10) unsigned NOT NULL, `message` text NOT NULL, - `private` tinyint(3) unsigned NOT NULL DEFAULT '1', + `private` tinyint(1) unsigned NOT NULL DEFAULT '1', `date_add` datetime NOT NULL, PRIMARY KEY (`id_message`), KEY `message_order` (`id_order`), KEY `id_cart` (`id_cart`), KEY `id_customer` (`id_customer`), KEY `id_employee` (`id_employee`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_message_readed`; @@ -10362,17 +8060,17 @@ CREATE TABLE `ps_message_readed` ( `id_employee` int(10) unsigned NOT NULL, `date_add` datetime NOT NULL, PRIMARY KEY (`id_message`,`id_employee`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_meta`; CREATE TABLE `ps_meta` ( `id_meta` int(10) unsigned NOT NULL AUTO_INCREMENT, `page` varchar(64) NOT NULL, - `configurable` tinyint(3) unsigned NOT NULL DEFAULT '1', + `configurable` tinyint(1) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id_meta`), UNIQUE KEY `page` (`page`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_meta` (`id_meta`, `page`, `configurable`) VALUES (1, 'pagenotfound', 1), @@ -10412,17 +8110,17 @@ INSERT INTO `ps_meta` (`id_meta`, `page`, `configurable`) VALUES (35, 'module-ps_shoppingcart-ajax', 1), (36, 'module-ps_emailsubscription-verification', 1), (37, 'module-ps_emailsubscription-subscription', 1), -(38, 'module-ps_cashondelivery-validation', 1), -(39, 'module-ps_emailalerts-account', 1), -(40, 'module-ps_wirepayment-payment', 1), -(41, 'module-ps_wirepayment-validation', 1), -(42, 'module-ps_checkpayment-payment', 1), -(43, 'module-ps_checkpayment-validation', 1); +(38, 'module-ps_checkpayment-payment', 1), +(39, 'module-ps_checkpayment-validation', 1), +(40, 'module-ps_emailalerts-account', 1), +(41, 'module-ps_wirepayment-payment', 1), +(42, 'module-ps_wirepayment-validation', 1), +(43, 'module-ps_cashondelivery-validation', 1); DROP TABLE IF EXISTS `ps_meta_lang`; CREATE TABLE `ps_meta_lang` ( `id_meta` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, `title` varchar(128) DEFAULT NULL, `description` varchar(255) DEFAULT NULL, @@ -10431,230 +8129,125 @@ CREATE TABLE `ps_meta_lang` ( PRIMARY KEY (`id_meta`,`id_shop`,`id_lang`), KEY `id_shop` (`id_shop`), KEY `id_lang` (`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_meta_lang` (`id_meta`, `id_shop`, `id_lang`, `title`, `description`, `keywords`, `url_rewrite`) VALUES (1, 1, 1, '404 error', 'This page cannot be found', '', 'page-not-found'), -(1, 1, 2, 'Fehler 404', 'Seite wurde nicht gefunden', '', 'seite-nicht-gefunden'), -(1, 1, 3, '404 fout', 'We hebben de pagina niet gevonden', '', 'pagina-niet-gevonden'), -(1, 2, 1, '404 error', 'This page cannot be found', '', 'page-not-found'), -(1, 2, 2, 'Fehler 404', 'Seite wurde nicht gefunden', '', 'seite-nicht-gefunden'), -(1, 2, 3, '404 fout', 'We hebben de pagina niet gevonden', '', 'pagina-niet-gevonden'), +(1, 1, 2, '404 fout', 'We hebben de pagina niet gevonden', '', 'pagina-niet-gevonden'), +(1, 1, 3, 'Fehler 404', 'Seite wurde nicht gefunden', '', 'seite-nicht-gefunden'), (2, 1, 1, 'Best sales', 'Our best sales', '', 'best-sales'), -(2, 1, 2, 'Verkaufshits', 'Verkaufshits', '', 'verkaufshits'), -(2, 1, 3, 'Best verkochte artikelen', 'Onze best verkochte artikelen', '', 'best-verkochte-artikelen'), -(2, 2, 1, 'Best sales', 'Our best sales', '', 'best-sales'), -(2, 2, 2, 'Verkaufshits', 'Verkaufshits', '', 'verkaufshits'), -(2, 2, 3, 'Best verkochte artikelen', 'Onze best verkochte artikelen', '', 'best-verkochte-artikelen'), +(2, 1, 2, 'Best verkochte artikelen', 'Onze best verkochte artikelen', '', 'best-verkochte-artikelen'), +(2, 1, 3, 'Verkaufshits', 'Verkaufshits', '', 'verkaufshits'), (3, 1, 1, 'Contact us', 'Use our form to contact us', '', 'contact-us'), -(3, 1, 2, 'Kontaktieren Sie uns', 'Nutzen Sie unser Kontaktformular', '', 'kontakt'), -(3, 1, 3, 'Contacteer ons', 'Neem contact met ons op via ons formulier', '', 'contact-opnemen'), -(3, 2, 1, 'Contact us', 'Use our form to contact us', '', 'contact-us'), -(3, 2, 2, 'Kontaktieren Sie uns', 'Nutzen Sie unser Kontaktformular', '', 'kontakt'), -(3, 2, 3, 'Contacteer ons', 'Neem contact met ons op via ons formulier', '', 'contact-opnemen'), +(3, 1, 2, 'Contacteer ons', 'Neem contact met ons op via ons formulier', '', 'contact-opnemen'), +(3, 1, 3, 'Kontaktieren Sie uns', 'Nutzen Sie unser Kontaktformular', '', 'kontakt'), (4, 1, 1, '', 'Shop powered by PrestaShop', '', ''), -(4, 1, 2, '', 'Powered by PrestaShop', '', ''), -(4, 1, 3, '', 'Winkel gerund met behulp van PrestaShop', '', ''), -(4, 2, 1, '', 'Shop powered by PrestaShop', '', ''), -(4, 2, 2, '', 'Powered by PrestaShop', '', ''), -(4, 2, 3, '', 'Winkel gerund met behulp van PrestaShop', '', ''), +(4, 1, 2, '', 'Winkel gerund met behulp van PrestaShop', '', ''), +(4, 1, 3, '', 'Powered by PrestaShop', '', ''), (5, 1, 1, 'Brands', 'Brands list', '', 'brands'), -(5, 1, 2, 'Brands', 'Brands list', '', 'brands'), -(5, 1, 3, 'Merken', 'Brands list', '', 'merken'), -(5, 2, 1, 'Brands', 'Brands list', '', 'brands'), -(5, 2, 2, 'Brands', 'Brands list', '', 'brands'), -(5, 2, 3, 'Merken', 'Brands list', '', 'merken'), +(5, 1, 2, 'Merken', 'Merkenlijst', '', 'merken'), +(5, 1, 3, 'Marken', 'Brands list', '', 'Marken'), (6, 1, 1, 'New products', 'Our new products', '', 'new-products'), -(6, 1, 2, 'Neue Artikel', 'Neue Artikel', '', 'neue-artikel'), -(6, 1, 3, 'Nieuwe producten', 'Onze nieuwe producten', '', 'nieuwe-producten'), -(6, 2, 1, 'New products', 'Our new products', '', 'new-products'), -(6, 2, 2, 'Neue Artikel', 'Neue Artikel', '', 'neue-artikel'), -(6, 2, 3, 'Nieuwe producten', 'Onze nieuwe producten', '', 'nieuwe-producten'), +(6, 1, 2, 'Nieuwe producten', 'Onze nieuwe producten', '', 'nieuwe-producten'), +(6, 1, 3, 'Neue Artikel', 'Neue Artikel', '', 'neue-artikel'), (7, 1, 1, 'Forgot your password', 'Enter the e-mail address you use to sign in to receive an e-mail with a new password', '', 'password-recovery'), -(7, 1, 2, 'Passwort vergessen?', 'Geben Sie hier die E-Mail ein, unter der Sie sich angemeldet haben. Sie erhalten dann ein neues Passwort.', '', 'passwort-zuruecksetzen'), -(7, 1, 3, 'Uw wachtwoord vergeten', 'Voer het e-mailadres in dat u heeft gebruikt voor uw aanmelding om een e-mail met een nieuw wachtwoord te ontvangen', '', 'wachtwoord-opvragen'), -(7, 2, 1, 'Forgot your password', 'Enter the e-mail address you use to sign in to receive an e-mail with a new password', '', 'password-recovery'), -(7, 2, 2, 'Passwort vergessen?', 'Geben Sie hier die E-Mail ein, unter der Sie sich angemeldet haben. Sie erhalten dann ein neues Passwort.', '', 'passwort-zuruecksetzen'), -(7, 2, 3, 'Uw wachtwoord vergeten', 'Voer het e-mailadres in dat u heeft gebruikt voor uw aanmelding om een e-mail met een nieuw wachtwoord te ontvangen', '', 'wachtwoord-opvragen'), +(7, 1, 2, 'Uw wachtwoord vergeten', 'Voer het e-mailadres in dat u heeft gebruikt voor uw aanmelding om een e-mail met een nieuw wachtwoord te ontvangen', '', 'wachtwoord-opvragen'), +(7, 1, 3, 'Passwort vergessen?', 'Geben Sie hier die E-Mail ein, unter der Sie sich angemeldet haben. Sie erhalten dann ein neues Passwort.', '', 'passwort-zuruecksetzen'), (8, 1, 1, 'Prices drop', 'Our special products', '', 'prices-drop'), -(8, 1, 2, 'Angebote', 'Our special products', '', 'angebote'), -(8, 1, 3, 'Aanbiedingen', 'Our special products', '', 'aanbiedingen'), -(8, 2, 1, 'Prices drop', 'Our special products', '', 'prices-drop'), -(8, 2, 2, 'Angebote', 'Our special products', '', 'angebote'), -(8, 2, 3, 'Aanbiedingen', 'Our special products', '', 'aanbiedingen'), +(8, 1, 2, 'Aanbiedingen', 'Onze speciale producten', '', 'aanbiedingen'), +(8, 1, 3, 'Angebote', 'Our special products', '', 'angebote'), (9, 1, 1, 'Sitemap', 'Lost ? Find what your are looking for', '', 'sitemap'), -(9, 1, 2, 'Sitemap', 'Wissen Sie nicht weiter? Vielleicht finden Sie es hier', '', 'Sitemap'), -(9, 1, 3, 'Sitemap', 'De weg kwijt? Vinden wat u zoekt', '', 'sitemap'), -(9, 2, 1, 'Sitemap', 'Lost ? Find what your are looking for', '', 'sitemap'), -(9, 2, 2, 'Sitemap', 'Wissen Sie nicht weiter? Vielleicht finden Sie es hier', '', 'Sitemap'), -(9, 2, 3, 'Sitemap', 'De weg kwijt? Vinden wat u zoekt', '', 'sitemap'), +(9, 1, 2, 'Sitemap', 'De weg kwijt? Vinden wat u zoekt', '', 'sitemap'), +(9, 1, 3, 'Sitemap', 'Wissen Sie nicht weiter? Vielleicht finden Sie es hier', '', 'Sitemap'), (10, 1, 1, 'Suppliers', 'Suppliers list', '', 'supplier'), -(10, 1, 2, 'Lieferanten', 'Lieferanten-Liste', '', 'lieferant'), -(10, 1, 3, 'Leveranciers', 'Lijst met leveranciers', '', 'leverancier'), -(10, 2, 1, 'Suppliers', 'Suppliers list', '', 'supplier'), -(10, 2, 2, 'Lieferanten', 'Lieferanten-Liste', '', 'lieferant'), -(10, 2, 3, 'Leveranciers', 'Lijst met leveranciers', '', 'leverancier'), +(10, 1, 2, 'Leveranciers', 'Lijst met leveranciers', '', 'leverancier'), +(10, 1, 3, 'Lieferanten', 'Lieferanten-Liste', '', 'lieferant'), (11, 1, 1, 'Address', '', '', 'address'), -(11, 1, 2, 'Straße', '', '', 'adresse'), -(11, 1, 3, 'Adres', '', '', 'adres'), -(11, 2, 1, 'Address', '', '', 'address'), -(11, 2, 2, 'Straße', '', '', 'adresse'), -(11, 2, 3, 'Adres', '', '', 'adres'), +(11, 1, 2, 'Adres', '', '', 'adres'), +(11, 1, 3, 'Straße', '', '', 'adresse'), (12, 1, 1, 'Addresses', '', '', 'addresses'), (12, 1, 2, 'Adressen', '', '', 'adressen'), (12, 1, 3, 'Adressen', '', '', 'adressen'), -(12, 2, 1, 'Addresses', '', '', 'addresses'), -(12, 2, 2, 'Adressen', '', '', 'adressen'), -(12, 2, 3, 'Adressen', '', '', 'adressen'), (13, 1, 1, 'Login', '', '', 'login'), -(13, 1, 2, 'Anmelden', '', '', 'anmeldung'), -(13, 1, 3, 'Inloggen', '', '', 'aanmelden'), -(13, 2, 1, 'Login', '', '', 'login'), -(13, 2, 2, 'Anmelden', '', '', 'anmeldung'), -(13, 2, 3, 'Inloggen', '', '', 'aanmelden'), +(13, 1, 2, 'Inloggen', '', '', 'aanmelden'), +(13, 1, 3, 'Anmelden', '', '', 'anmeldung'), (14, 1, 1, 'Registration', '', '', 'registration'), -(14, 1, 2, 'Anmeldung', '', '', 'registration'), -(14, 1, 3, 'Registratie', '', '', 'registratie'), -(14, 2, 1, 'Registration', '', '', 'registration'), -(14, 2, 2, 'Anmeldung', '', '', 'registration'), -(14, 2, 3, 'Registratie', '', '', 'registratie'), +(14, 1, 2, 'Registratie', '', '', 'registratie'), +(14, 1, 3, 'Anmeldung', '', '', 'registration'), (15, 1, 1, 'Cart', '', '', 'cart'), -(15, 1, 2, 'Warenkorb', '', '', 'warenkorb'), -(15, 1, 3, 'Winkelwagen', '', '', 'winkelmandje'), -(15, 2, 1, 'Cart', '', '', 'cart'), -(15, 2, 2, 'Warenkorb', '', '', 'warenkorb'), -(15, 2, 3, 'Winkelwagen', '', '', 'winkelmandje'), +(15, 1, 2, 'Winkelwagen', '', '', 'winkelmandje'), +(15, 1, 3, 'Warenkorb', '', '', 'warenkorb'), (16, 1, 1, 'Discount', '', '', 'discount'), -(16, 1, 2, 'Rabatt', '', '', 'Rabatt'), -(16, 1, 3, 'Korting', '', '', 'korting'), -(16, 2, 1, 'Discount', '', '', 'discount'), -(16, 2, 2, 'Rabatt', '', '', 'Rabatt'), -(16, 2, 3, 'Korting', '', '', 'korting'), +(16, 1, 2, 'Korting', '', '', 'korting'), +(16, 1, 3, 'Rabatt', '', '', 'Rabatt'), (17, 1, 1, 'Order history', '', '', 'order-history'), -(17, 1, 2, 'Bestellverlauf', '', '', 'bestellungsverlauf'), -(17, 1, 3, 'Bestelgeschiedenis', '', '', 'besteloverzicht'), -(17, 2, 1, 'Order history', '', '', 'order-history'), -(17, 2, 2, 'Bestellverlauf', '', '', 'bestellungsverlauf'), -(17, 2, 3, 'Bestelgeschiedenis', '', '', 'besteloverzicht'), +(17, 1, 2, 'Bestelgeschiedenis', '', '', 'besteloverzicht'), +(17, 1, 3, 'Bestellverlauf', '', '', 'bestellungsverlauf'), (18, 1, 1, 'Identity', '', '', 'identity'), -(18, 1, 2, 'Profil', '', '', 'profil'), -(18, 1, 3, 'Identiteit', '', '', 'identiteit'), -(18, 2, 1, 'Identity', '', '', 'identity'), -(18, 2, 2, 'Profil', '', '', 'profil'), -(18, 2, 3, 'Identiteit', '', '', 'identiteit'), +(18, 1, 2, 'Identiteit', '', '', 'identiteit'), +(18, 1, 3, 'Profil', '', '', 'profil'), (19, 1, 1, 'My account', '', '', 'my-account'), -(19, 1, 2, 'Ihr Kundenbereich', '', '', 'mein-Konto'), -(19, 1, 3, 'Mijn account', '', '', 'mijn-account'), -(19, 2, 1, 'My account', '', '', 'my-account'), -(19, 2, 2, 'Ihr Kundenbereich', '', '', 'mein-Konto'), -(19, 2, 3, 'Mijn account', '', '', 'mijn-account'), +(19, 1, 2, 'Mijn account', '', '', 'mijn-account'), +(19, 1, 3, 'Ihr Kundenbereich', '', '', 'mein-Konto'), (20, 1, 1, 'Order follow', '', '', 'order-follow'), -(20, 1, 2, 'Bestellung verfolgen', '', '', 'bestellverfolgung'), -(20, 1, 3, 'Bestelling volgen', '', '', 'bestelling-volgen'), -(20, 2, 1, 'Order follow', '', '', 'order-follow'), -(20, 2, 2, 'Bestellung verfolgen', '', '', 'bestellverfolgung'), -(20, 2, 3, 'Bestelling volgen', '', '', 'bestelling-volgen'), +(20, 1, 2, 'Bestelling volgen', '', '', 'bestelling-volgen'), +(20, 1, 3, 'Bestellung verfolgen', '', '', 'bestellverfolgung'), (21, 1, 1, 'Credit slip', '', '', 'credit-slip'), -(21, 1, 2, 'Rechnungskorrektur', '', '', 'bestellschein'), -(21, 1, 3, 'Creditnota', '', '', 'bestel-bon'), -(21, 2, 1, 'Credit slip', '', '', 'credit-slip'), -(21, 2, 2, 'Rechnungskorrektur', '', '', 'bestellschein'), -(21, 2, 3, 'Creditnota', '', '', 'bestel-bon'), +(21, 1, 2, 'Creditnota', '', '', 'bestel-bon'), +(21, 1, 3, 'Rechnungskorrektur', '', '', 'bestellschein'), (22, 1, 1, 'Order', '', '', 'order'), -(22, 1, 2, 'Bestellung', '', '', 'Bestellung'), -(22, 1, 3, 'Bestelling', '', '', 'bestelling'), -(22, 2, 1, 'Order', '', '', 'order'), -(22, 2, 2, 'Bestellung', '', '', 'Bestellung'), -(22, 2, 3, 'Bestelling', '', '', 'bestelling'), +(22, 1, 2, 'Bestelling', '', '', 'bestelling'), +(22, 1, 3, 'Bestellung', '', '', 'Bestellung'), (23, 1, 1, 'Search', '', '', 'search'), -(23, 1, 2, 'Suche', '', '', 'suche'), -(23, 1, 3, 'Zoeken', '', '', 'zoeken'), -(23, 2, 1, 'Search', '', '', 'search'), -(23, 2, 2, 'Suche', '', '', 'suche'), -(23, 2, 3, 'Zoeken', '', '', 'zoeken'), +(23, 1, 2, 'Zoeken', '', '', 'zoeken'), +(23, 1, 3, 'Suche', '', '', 'suche'), (24, 1, 1, 'Stores', '', '', 'stores'), -(24, 1, 2, 'Shops', '', '', 'shops'), -(24, 1, 3, 'Winkels', '', '', 'winkels'), -(24, 2, 1, 'Stores', '', '', 'stores'), -(24, 2, 2, 'Shops', '', '', 'shops'), -(24, 2, 3, 'Winkels', '', '', 'winkels'), +(24, 1, 2, 'Winkels', '', '', 'winkels'), +(24, 1, 3, 'Shops', '', '', 'shops'), (25, 1, 1, 'Guest tracking', '', '', 'guest-tracking'), -(25, 1, 2, 'Auftragsverfolgung Gast', '', '', 'auftragsverfolgung-gast'), -(25, 1, 3, 'Bestelling volgen als gast', '', '', 'bestelling-volgen-als-gast'), -(25, 2, 1, 'Guest tracking', '', '', 'guest-tracking'), -(25, 2, 2, 'Auftragsverfolgung Gast', '', '', 'auftragsverfolgung-gast'), -(25, 2, 3, 'Bestelling volgen als gast', '', '', 'bestelling-volgen-als-gast'), +(25, 1, 2, 'Bestelling volgen als gast', '', '', 'bestelling-volgen-als-gast'), +(25, 1, 3, 'Auftragsverfolgung Gast', '', '', 'auftragsverfolgung-gast'), (26, 1, 1, 'Order confirmation', '', '', 'order-confirmation'), -(26, 1, 2, 'Bestätigung der Bestellung', '', '', 'bestellbestatigung'), -(26, 1, 3, 'Bestelling bevestigd', '', '', 'order-bevestiging'), -(26, 2, 1, 'Order confirmation', '', '', 'order-confirmation'), -(26, 2, 2, 'Bestätigung der Bestellung', '', '', 'bestellbestatigung'), -(26, 2, 3, 'Bestelling bevestigd', '', '', 'order-bevestiging'), +(26, 1, 2, 'Bestelling bevestigd', '', '', 'order-bevestiging'), +(26, 1, 3, 'Bestellbestätigung', '', '', 'bestellbestaetigung'), (35, 1, 1, '', '', '', ''), (35, 1, 2, '', '', '', ''), (35, 1, 3, '', '', '', ''), -(35, 2, 1, '', '', '', ''), -(35, 2, 2, '', '', '', ''), -(35, 2, 3, '', '', '', ''), (36, 1, 1, '', '', '', ''), (36, 1, 2, '', '', '', ''), (36, 1, 3, '', '', '', ''), -(36, 2, 1, '', '', '', ''), -(36, 2, 2, '', '', '', ''), -(36, 2, 3, '', '', '', ''), (37, 1, 1, '', '', '', ''), (37, 1, 2, '', '', '', ''), (37, 1, 3, '', '', '', ''), -(37, 2, 1, '', '', '', ''), -(37, 2, 2, '', '', '', ''), -(37, 2, 3, '', '', '', ''), (38, 1, 1, '', '', '', ''), (38, 1, 2, '', '', '', ''), (38, 1, 3, '', '', '', ''), -(38, 2, 1, '', '', '', ''), -(38, 2, 2, '', '', '', ''), -(38, 2, 3, '', '', '', ''), (39, 1, 1, '', '', '', ''), (39, 1, 2, '', '', '', ''), (39, 1, 3, '', '', '', ''), -(39, 2, 1, '', '', '', ''), -(39, 2, 2, '', '', '', ''), -(39, 2, 3, '', '', '', ''), (40, 1, 1, '', '', '', ''), (40, 1, 2, '', '', '', ''), (40, 1, 3, '', '', '', ''), -(40, 2, 1, '', '', '', ''), -(40, 2, 2, '', '', '', ''), -(40, 2, 3, '', '', '', ''), (41, 1, 1, '', '', '', ''), (41, 1, 2, '', '', '', ''), (41, 1, 3, '', '', '', ''), -(41, 2, 1, '', '', '', ''), -(41, 2, 2, '', '', '', ''), -(41, 2, 3, '', '', '', ''), (42, 1, 1, '', '', '', ''), (42, 1, 2, '', '', '', ''), (42, 1, 3, '', '', '', ''), -(42, 2, 1, '', '', '', ''), -(42, 2, 2, '', '', '', ''), -(42, 2, 3, '', '', '', ''), (43, 1, 1, '', '', '', ''), (43, 1, 2, '', '', '', ''), -(43, 1, 3, '', '', '', ''), -(43, 2, 1, '', '', '', ''), -(43, 2, 2, '', '', '', ''), -(43, 2, 3, '', '', '', ''); +(43, 1, 3, '', '', '', ''); DROP TABLE IF EXISTS `ps_module`; CREATE TABLE `ps_module` ( `id_module` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) NOT NULL, - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `version` varchar(8) NOT NULL, PRIMARY KEY (`id_module`), UNIQUE KEY `name_UNIQUE` (`name`), KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module` (`id_module`, `name`, `active`, `version`) VALUES (1, 'ps_linklist', 1, '5.0.5'), @@ -10682,53 +8275,53 @@ INSERT INTO `ps_module` (`id_module`, `name`, `active`, `version`) VALUES (23, 'ps_categorytree', 1, '2.0.2'), (25, 'contactform', 1, '4.3.0'), (26, 'ps_sharebuttons', 1, '2.1.1'), -(27, 'statssales', 1, '2.1.0'), -(28, 'dashtrends', 1, '2.0.3'), -(29, 'graphnvd3', 1, '2.0.2'), -(30, 'dashproducts', 1, '2.1.1'), -(31, 'statsbestvouchers', 1, '2.0.1'), -(32, 'ps_cashondelivery', 1, '2.0.1'), -(33, 'statsbestproducts', 1, '2.0.1'), -(34, 'statsstock', 1, '2.0.0'), -(35, 'ps_googleanalytics', 1, '4.1.2'), -(36, 'ps_distributionapiclient', 1, '1.0.2'), -(37, 'statsdata', 1, '2.1.0'), -(38, 'statsforecast', 1, '2.0.4'), -(39, 'pagesnotfound', 1, '2.0.2'), -(40, 'dashgoals', 1, '2.0.2'), -(41, 'statsproduct', 1, '2.1.1'), -(42, 'ps_dataprivacy', 1, '2.1.0'), -(43, 'statssearch', 1, '2.0.2'), -(44, 'statscatalog', 1, '2.0.2'), -(45, 'ps_emailalerts', 1, '2.3.3'), -(46, 'statsbestsuppliers', 1, '2.0.0'), -(47, 'gridhtml', 1, '2.0.2'), -(48, 'gsitemap', 1, '4.2.0'), -(49, 'ps_categoryproducts', 1, '1.0.4'), -(50, 'ps_wirepayment', 1, '2.1.3'), -(51, 'statspersonalinfos', 1, '2.0.4'), -(52, 'statscheckup', 1, '2.0.2'), -(53, 'statsbestcategories', 1, '2.0.1'), -(54, 'ps_supplierlist', 1, '1.0.4'), -(55, 'ps_checkpayment', 1, '2.0.5'), -(56, 'ps_crossselling', 1, '2.0.1'), -(57, 'ps_brandlist', 1, '1.0.3'), -(58, 'statscarrier', 1, '2.0.1'), -(59, 'statsnewsletter', 1, '2.0.3'), -(60, 'dashactivity', 1, '2.0.2'), -(61, 'statsbestcustomers', 1, '2.0.3'), -(62, 'ps_viewedproduct', 1, '1.2.2'), -(63, 'statsbestmanufacturers', 1, '2.0.0'), -(64, 'ps_themecusto', 1, '1.2.1'), -(65, 'statsregistrations', 1, '2.0.1'), -(66, 'ps_facetedsearch', 1, '3.8.0'); +(27, 'statscarrier', 1, '2.0.1'), +(28, 'ps_brandlist', 1, '1.0.3'), +(29, 'statsbestcategories', 1, '2.0.1'), +(30, 'statssales', 1, '2.1.0'), +(31, 'dashproducts', 1, '2.1.1'), +(32, 'ps_checkpayment', 1, '2.0.5'), +(33, 'statssearch', 1, '2.0.2'), +(34, 'statscatalog', 1, '2.0.2'), +(35, 'ps_categoryproducts', 1, '1.0.4'), +(36, 'statspersonalinfos', 1, '2.0.4'), +(37, 'statsforecast', 1, '2.0.4'), +(38, 'ps_distributionapiclient', 1, '1.0.2'), +(39, 'statsbestvouchers', 1, '2.0.1'), +(40, 'ps_viewedproduct', 1, '1.2.2'), +(41, 'statsbestproducts', 1, '2.0.1'), +(42, 'statsregistrations', 1, '2.0.1'), +(43, 'ps_supplierlist', 1, '1.0.4'), +(44, 'statscheckup', 1, '2.0.2'), +(45, 'ps_googleanalytics', 1, '4.1.2'), +(46, 'dashactivity', 1, '2.0.2'), +(47, 'gsitemap', 1, '4.2.0'), +(48, 'pagesnotfound', 1, '2.0.2'), +(49, 'ps_dataprivacy', 1, '2.1.0'), +(50, 'graphnvd3', 1, '2.0.2'), +(51, 'ps_themecusto', 1, '1.2.1'), +(52, 'ps_emailalerts', 1, '2.3.3'), +(53, 'ps_wirepayment', 1, '2.1.3'), +(54, 'statsnewsletter', 1, '2.0.3'), +(55, 'statsbestmanufacturers', 1, '2.0.0'), +(56, 'statsproduct', 1, '2.1.1'), +(57, 'ps_crossselling', 1, '2.0.1'), +(58, 'dashtrends', 1, '2.0.3'), +(59, 'statsstock', 1, '2.0.0'), +(60, 'gridhtml', 1, '2.0.2'), +(61, 'statsbestsuppliers', 1, '2.0.0'), +(62, 'dashgoals', 1, '2.0.2'), +(63, 'statsdata', 1, '2.1.0'), +(64, 'ps_cashondelivery', 1, '2.0.1'), +(65, 'statsbestcustomers', 1, '2.0.3'), +(67, 'ps_facetedsearch', 1, '3.8.0'); DROP TABLE IF EXISTS `ps_module_access`; CREATE TABLE `ps_module_access` ( `id_profile` int(10) unsigned NOT NULL, `id_authorization_role` int(10) unsigned NOT NULL, PRIMARY KEY (`id_profile`,`id_authorization_role`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module_access` (`id_profile`, `id_authorization_role`) VALUES (1, 461), @@ -10883,6 +8476,10 @@ INSERT INTO `ps_module_access` (`id_profile`, `id_authorization_role`) VALUES (1, 638), (1, 639), (1, 640), +(1, 641), +(1, 642), +(1, 643), +(1, 644), (1, 645), (1, 646), (1, 647), @@ -10927,18 +8524,6 @@ INSERT INTO `ps_module_access` (`id_profile`, `id_authorization_role`) VALUES (1, 686), (1, 687), (1, 688), -(1, 689), -(1, 690), -(1, 691), -(1, 692), -(1, 693), -(1, 694), -(1, 695), -(1, 696), -(1, 697), -(1, 698), -(1, 699), -(1, 700), (1, 701), (1, 702), (1, 703), @@ -10979,56 +8564,56 @@ INSERT INTO `ps_module_access` (`id_profile`, `id_authorization_role`) VALUES (1, 738), (1, 739), (1, 740), -(1, 741), -(1, 742), -(1, 743), -(1, 744), +(1, 745), +(1, 746), +(1, 747), +(1, 748), +(1, 749), +(1, 750), +(1, 751), +(1, 752), +(1, 753), +(1, 754), +(1, 755), +(1, 756), (1, 757), (1, 758), (1, 759), (1, 760), -(1, 761), -(1, 762), -(1, 763), -(1, 764); +(1, 805), +(1, 806), +(1, 807), +(1, 808); DROP TABLE IF EXISTS `ps_module_carrier`; CREATE TABLE `ps_module_carrier` ( `id_module` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_reference` int(11) NOT NULL, PRIMARY KEY (`id_module`,`id_shop`,`id_reference`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module_carrier` (`id_module`, `id_shop`, `id_reference`) VALUES (32, 1, 1), (32, 1, 2), (32, 1, 3), (32, 1, 4), -(50, 1, 1), -(50, 1, 2), -(50, 1, 3), -(50, 1, 4), -(50, 2, 1), -(50, 2, 2), -(50, 2, 3), -(50, 2, 4), -(55, 1, 1), -(55, 1, 2), -(55, 1, 3), -(55, 1, 4), -(55, 2, 1), -(55, 2, 2), -(55, 2, 3), -(55, 2, 4); +(53, 1, 1), +(53, 1, 2), +(53, 1, 3), +(53, 1, 4), +(64, 1, 1), +(64, 1, 2), +(64, 1, 3), +(64, 1, 4); DROP TABLE IF EXISTS `ps_module_country`; CREATE TABLE `ps_module_country` ( `id_module` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_country` int(10) unsigned NOT NULL, PRIMARY KEY (`id_module`,`id_shop`,`id_country`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module_country` (`id_module`, `id_shop`, `id_country`) VALUES (32, 1, 1), @@ -11272,1634 +8857,710 @@ INSERT INTO `ps_module_country` (`id_module`, `id_shop`, `id_country`) VALUES (32, 1, 239), (32, 1, 240), (32, 1, 241), -(32, 2, 1), -(32, 2, 2), -(32, 2, 3), -(32, 2, 4), -(32, 2, 5), -(32, 2, 6), -(32, 2, 7), -(32, 2, 8), -(32, 2, 9), -(32, 2, 10), -(32, 2, 11), -(32, 2, 12), -(32, 2, 13), -(32, 2, 14), -(32, 2, 15), -(32, 2, 16), -(32, 2, 17), -(32, 2, 18), -(32, 2, 19), -(32, 2, 20), -(32, 2, 21), -(32, 2, 22), -(32, 2, 23), -(32, 2, 24), -(32, 2, 25), -(32, 2, 26), -(32, 2, 27), -(32, 2, 28), -(32, 2, 29), -(32, 2, 30), -(32, 2, 31), -(32, 2, 32), -(32, 2, 33), -(32, 2, 34), -(32, 2, 35), -(32, 2, 36), -(32, 2, 37), -(32, 2, 38), -(32, 2, 39), -(32, 2, 40), -(32, 2, 41), -(32, 2, 42), -(32, 2, 43), -(32, 2, 44), -(32, 2, 45), -(32, 2, 46), -(32, 2, 47), -(32, 2, 48), -(32, 2, 49), -(32, 2, 50), -(32, 2, 51), -(32, 2, 52), -(32, 2, 53), -(32, 2, 54), -(32, 2, 55), -(32, 2, 56), -(32, 2, 57), -(32, 2, 58), -(32, 2, 59), -(32, 2, 60), -(32, 2, 61), -(32, 2, 62), -(32, 2, 63), -(32, 2, 64), -(32, 2, 65), -(32, 2, 66), -(32, 2, 67), -(32, 2, 68), -(32, 2, 69), -(32, 2, 70), -(32, 2, 71), -(32, 2, 72), -(32, 2, 73), -(32, 2, 74), -(32, 2, 75), -(32, 2, 76), -(32, 2, 77), -(32, 2, 78), -(32, 2, 79), -(32, 2, 80), -(32, 2, 81), -(32, 2, 82), -(32, 2, 83), -(32, 2, 84), -(32, 2, 85), -(32, 2, 86), -(32, 2, 87), -(32, 2, 88), -(32, 2, 89), -(32, 2, 90), -(32, 2, 91), -(32, 2, 92), -(32, 2, 93), -(32, 2, 94), -(32, 2, 95), -(32, 2, 96), -(32, 2, 97), -(32, 2, 98), -(32, 2, 99), -(32, 2, 100), -(32, 2, 101), -(32, 2, 102), -(32, 2, 103), -(32, 2, 104), -(32, 2, 105), -(32, 2, 106), -(32, 2, 107), -(32, 2, 108), -(32, 2, 109), -(32, 2, 110), -(32, 2, 111), -(32, 2, 112), -(32, 2, 113), -(32, 2, 114), -(32, 2, 115), -(32, 2, 116), -(32, 2, 117), -(32, 2, 118), -(32, 2, 119), -(32, 2, 120), -(32, 2, 121), -(32, 2, 122), -(32, 2, 123), -(32, 2, 124), -(32, 2, 125), -(32, 2, 126), -(32, 2, 127), -(32, 2, 128), -(32, 2, 129), -(32, 2, 130), -(32, 2, 131), -(32, 2, 132), -(32, 2, 133), -(32, 2, 134), -(32, 2, 135), -(32, 2, 136), -(32, 2, 137), -(32, 2, 138), -(32, 2, 139), -(32, 2, 140), -(32, 2, 141), -(32, 2, 142), -(32, 2, 143), -(32, 2, 144), -(32, 2, 145), -(32, 2, 146), -(32, 2, 147), -(32, 2, 148), -(32, 2, 149), -(32, 2, 150), -(32, 2, 151), -(32, 2, 152), -(32, 2, 153), -(32, 2, 154), -(32, 2, 155), -(32, 2, 156), -(32, 2, 157), -(32, 2, 158), -(32, 2, 159), -(32, 2, 160), -(32, 2, 161), -(32, 2, 162), -(32, 2, 163), -(32, 2, 164), -(32, 2, 165), -(32, 2, 166), -(32, 2, 167), -(32, 2, 168), -(32, 2, 169), -(32, 2, 170), -(32, 2, 171), -(32, 2, 172), -(32, 2, 173), -(32, 2, 174), -(32, 2, 175), -(32, 2, 176), -(32, 2, 177), -(32, 2, 178), -(32, 2, 179), -(32, 2, 180), -(32, 2, 181), -(32, 2, 182), -(32, 2, 183), -(32, 2, 184), -(32, 2, 185), -(32, 2, 186), -(32, 2, 187), -(32, 2, 188), -(32, 2, 189), -(32, 2, 190), -(32, 2, 191), -(32, 2, 192), -(32, 2, 193), -(32, 2, 194), -(32, 2, 195), -(32, 2, 196), -(32, 2, 197), -(32, 2, 198), -(32, 2, 199), -(32, 2, 200), -(32, 2, 201), -(32, 2, 202), -(32, 2, 203), -(32, 2, 204), -(32, 2, 205), -(32, 2, 206), -(32, 2, 207), -(32, 2, 208), -(32, 2, 209), -(32, 2, 210), -(32, 2, 211), -(32, 2, 212), -(32, 2, 213), -(32, 2, 214), -(32, 2, 215), -(32, 2, 216), -(32, 2, 217), -(32, 2, 218), -(32, 2, 219), -(32, 2, 220), -(32, 2, 221), -(32, 2, 222), -(32, 2, 223), -(32, 2, 224), -(32, 2, 225), -(32, 2, 226), -(32, 2, 227), -(32, 2, 228), -(32, 2, 229), -(32, 2, 230), -(32, 2, 231), -(32, 2, 232), -(32, 2, 233), -(32, 2, 234), -(32, 2, 235), -(32, 2, 236), -(32, 2, 237), -(32, 2, 238), -(32, 2, 239), -(32, 2, 240), -(32, 2, 241), -(50, 1, 1), -(50, 1, 2), -(50, 1, 3), -(50, 1, 4), -(50, 1, 5), -(50, 1, 6), -(50, 1, 7), -(50, 1, 8), -(50, 1, 9), -(50, 1, 10), -(50, 1, 11), -(50, 1, 12), -(50, 1, 13), -(50, 1, 14), -(50, 1, 15), -(50, 1, 16), -(50, 1, 17), -(50, 1, 18), -(50, 1, 19), -(50, 1, 20), -(50, 1, 21), -(50, 1, 22), -(50, 1, 23), -(50, 1, 24), -(50, 1, 25), -(50, 1, 26), -(50, 1, 27), -(50, 1, 28), -(50, 1, 29), -(50, 1, 30), -(50, 1, 31), -(50, 1, 32), -(50, 1, 33), -(50, 1, 34), -(50, 1, 35), -(50, 1, 36), -(50, 1, 37), -(50, 1, 38), -(50, 1, 39), -(50, 1, 40), -(50, 1, 41), -(50, 1, 42), -(50, 1, 43), -(50, 1, 44), -(50, 1, 45), -(50, 1, 46), -(50, 1, 47), -(50, 1, 48), -(50, 1, 49), -(50, 1, 50), -(50, 1, 51), -(50, 1, 52), -(50, 1, 53), -(50, 1, 54), -(50, 1, 55), -(50, 1, 56), -(50, 1, 57), -(50, 1, 58), -(50, 1, 59), -(50, 1, 60), -(50, 1, 61), -(50, 1, 62), -(50, 1, 63), -(50, 1, 64), -(50, 1, 65), -(50, 1, 66), -(50, 1, 67), -(50, 1, 68), -(50, 1, 69), -(50, 1, 70), -(50, 1, 71), -(50, 1, 72), -(50, 1, 73), -(50, 1, 74), -(50, 1, 75), -(50, 1, 76), -(50, 1, 77), -(50, 1, 78), -(50, 1, 79), -(50, 1, 80), -(50, 1, 81), -(50, 1, 82), -(50, 1, 83), -(50, 1, 84), -(50, 1, 85), -(50, 1, 86), -(50, 1, 87), -(50, 1, 88), -(50, 1, 89), -(50, 1, 90), -(50, 1, 91), -(50, 1, 92), -(50, 1, 93), -(50, 1, 94), -(50, 1, 95), -(50, 1, 96), -(50, 1, 97), -(50, 1, 98), -(50, 1, 99), -(50, 1, 100), -(50, 1, 101), -(50, 1, 102), -(50, 1, 103), -(50, 1, 104), -(50, 1, 105), -(50, 1, 106), -(50, 1, 107), -(50, 1, 108), -(50, 1, 109), -(50, 1, 110), -(50, 1, 111), -(50, 1, 112), -(50, 1, 113), -(50, 1, 114), -(50, 1, 115), -(50, 1, 116), -(50, 1, 117), -(50, 1, 118), -(50, 1, 119), -(50, 1, 120), -(50, 1, 121), -(50, 1, 122), -(50, 1, 123), -(50, 1, 124), -(50, 1, 125), -(50, 1, 126), -(50, 1, 127), -(50, 1, 128), -(50, 1, 129), -(50, 1, 130), -(50, 1, 131), -(50, 1, 132), -(50, 1, 133), -(50, 1, 134), -(50, 1, 135), -(50, 1, 136), -(50, 1, 137), -(50, 1, 138), -(50, 1, 139), -(50, 1, 140), -(50, 1, 141), -(50, 1, 142), -(50, 1, 143), -(50, 1, 144), -(50, 1, 145), -(50, 1, 146), -(50, 1, 147), -(50, 1, 148), -(50, 1, 149), -(50, 1, 150), -(50, 1, 151), -(50, 1, 152), -(50, 1, 153), -(50, 1, 154), -(50, 1, 155), -(50, 1, 156), -(50, 1, 157), -(50, 1, 158), -(50, 1, 159), -(50, 1, 160), -(50, 1, 161), -(50, 1, 162), -(50, 1, 163), -(50, 1, 164), -(50, 1, 165), -(50, 1, 166), -(50, 1, 167), -(50, 1, 168), -(50, 1, 169), -(50, 1, 170), -(50, 1, 171), -(50, 1, 172), -(50, 1, 173), -(50, 1, 174), -(50, 1, 175), -(50, 1, 176), -(50, 1, 177), -(50, 1, 178), -(50, 1, 179), -(50, 1, 180), -(50, 1, 181), -(50, 1, 182), -(50, 1, 183), -(50, 1, 184), -(50, 1, 185), -(50, 1, 186), -(50, 1, 187), -(50, 1, 188), -(50, 1, 189), -(50, 1, 190), -(50, 1, 191), -(50, 1, 192), -(50, 1, 193), -(50, 1, 194), -(50, 1, 195), -(50, 1, 196), -(50, 1, 197), -(50, 1, 198), -(50, 1, 199), -(50, 1, 200), -(50, 1, 201), -(50, 1, 202), -(50, 1, 203), -(50, 1, 204), -(50, 1, 205), -(50, 1, 206), -(50, 1, 207), -(50, 1, 208), -(50, 1, 209), -(50, 1, 210), -(50, 1, 211), -(50, 1, 212), -(50, 1, 213), -(50, 1, 214), -(50, 1, 215), -(50, 1, 216), -(50, 1, 217), -(50, 1, 218), -(50, 1, 219), -(50, 1, 220), -(50, 1, 221), -(50, 1, 222), -(50, 1, 223), -(50, 1, 224), -(50, 1, 225), -(50, 1, 226), -(50, 1, 227), -(50, 1, 228), -(50, 1, 229), -(50, 1, 230), -(50, 1, 231), -(50, 1, 232), -(50, 1, 233), -(50, 1, 234), -(50, 1, 235), -(50, 1, 236), -(50, 1, 237), -(50, 1, 238), -(50, 1, 239), -(50, 1, 240), -(50, 1, 241), -(50, 2, 1), -(50, 2, 2), -(50, 2, 3), -(50, 2, 4), -(50, 2, 5), -(50, 2, 6), -(50, 2, 7), -(50, 2, 8), -(50, 2, 9), -(50, 2, 10), -(50, 2, 11), -(50, 2, 12), -(50, 2, 13), -(50, 2, 14), -(50, 2, 15), -(50, 2, 16), -(50, 2, 17), -(50, 2, 18), -(50, 2, 19), -(50, 2, 20), -(50, 2, 21), -(50, 2, 22), -(50, 2, 23), -(50, 2, 24), -(50, 2, 25), -(50, 2, 26), -(50, 2, 27), -(50, 2, 28), -(50, 2, 29), -(50, 2, 30), -(50, 2, 31), -(50, 2, 32), -(50, 2, 33), -(50, 2, 34), -(50, 2, 35), -(50, 2, 36), -(50, 2, 37), -(50, 2, 38), -(50, 2, 39), -(50, 2, 40), -(50, 2, 41), -(50, 2, 42), -(50, 2, 43), -(50, 2, 44), -(50, 2, 45), -(50, 2, 46), -(50, 2, 47), -(50, 2, 48), -(50, 2, 49), -(50, 2, 50), -(50, 2, 51), -(50, 2, 52), -(50, 2, 53), -(50, 2, 54), -(50, 2, 55), -(50, 2, 56), -(50, 2, 57), -(50, 2, 58), -(50, 2, 59), -(50, 2, 60), -(50, 2, 61), -(50, 2, 62), -(50, 2, 63), -(50, 2, 64), -(50, 2, 65), -(50, 2, 66), -(50, 2, 67), -(50, 2, 68), -(50, 2, 69), -(50, 2, 70), -(50, 2, 71), -(50, 2, 72), -(50, 2, 73), -(50, 2, 74), -(50, 2, 75), -(50, 2, 76), -(50, 2, 77), -(50, 2, 78), -(50, 2, 79), -(50, 2, 80), -(50, 2, 81), -(50, 2, 82), -(50, 2, 83), -(50, 2, 84), -(50, 2, 85), -(50, 2, 86), -(50, 2, 87), -(50, 2, 88), -(50, 2, 89), -(50, 2, 90), -(50, 2, 91), -(50, 2, 92), -(50, 2, 93), -(50, 2, 94), -(50, 2, 95), -(50, 2, 96), -(50, 2, 97), -(50, 2, 98), -(50, 2, 99), -(50, 2, 100), -(50, 2, 101), -(50, 2, 102), -(50, 2, 103), -(50, 2, 104), -(50, 2, 105), -(50, 2, 106), -(50, 2, 107), -(50, 2, 108), -(50, 2, 109), -(50, 2, 110), -(50, 2, 111), -(50, 2, 112), -(50, 2, 113), -(50, 2, 114), -(50, 2, 115), -(50, 2, 116), -(50, 2, 117), -(50, 2, 118), -(50, 2, 119), -(50, 2, 120), -(50, 2, 121), -(50, 2, 122), -(50, 2, 123), -(50, 2, 124), -(50, 2, 125), -(50, 2, 126), -(50, 2, 127), -(50, 2, 128), -(50, 2, 129), -(50, 2, 130), -(50, 2, 131), -(50, 2, 132), -(50, 2, 133), -(50, 2, 134), -(50, 2, 135), -(50, 2, 136), -(50, 2, 137), -(50, 2, 138), -(50, 2, 139), -(50, 2, 140), -(50, 2, 141), -(50, 2, 142), -(50, 2, 143), -(50, 2, 144), -(50, 2, 145), -(50, 2, 146), -(50, 2, 147), -(50, 2, 148), -(50, 2, 149), -(50, 2, 150), -(50, 2, 151), -(50, 2, 152), -(50, 2, 153), -(50, 2, 154), -(50, 2, 155), -(50, 2, 156), -(50, 2, 157), -(50, 2, 158), -(50, 2, 159), -(50, 2, 160), -(50, 2, 161), -(50, 2, 162), -(50, 2, 163), -(50, 2, 164), -(50, 2, 165), -(50, 2, 166), -(50, 2, 167), -(50, 2, 168), -(50, 2, 169), -(50, 2, 170), -(50, 2, 171), -(50, 2, 172), -(50, 2, 173), -(50, 2, 174), -(50, 2, 175), -(50, 2, 176), -(50, 2, 177), -(50, 2, 178), -(50, 2, 179), -(50, 2, 180), -(50, 2, 181), -(50, 2, 182), -(50, 2, 183), -(50, 2, 184), -(50, 2, 185), -(50, 2, 186), -(50, 2, 187), -(50, 2, 188), -(50, 2, 189), -(50, 2, 190), -(50, 2, 191), -(50, 2, 192), -(50, 2, 193), -(50, 2, 194), -(50, 2, 195), -(50, 2, 196), -(50, 2, 197), -(50, 2, 198), -(50, 2, 199), -(50, 2, 200), -(50, 2, 201), -(50, 2, 202), -(50, 2, 203), -(50, 2, 204), -(50, 2, 205), -(50, 2, 206), -(50, 2, 207), -(50, 2, 208), -(50, 2, 209), -(50, 2, 210), -(50, 2, 211), -(50, 2, 212), -(50, 2, 213), -(50, 2, 214), -(50, 2, 215), -(50, 2, 216), -(50, 2, 217), -(50, 2, 218), -(50, 2, 219), -(50, 2, 220), -(50, 2, 221), -(50, 2, 222), -(50, 2, 223), -(50, 2, 224), -(50, 2, 225), -(50, 2, 226), -(50, 2, 227), -(50, 2, 228), -(50, 2, 229), -(50, 2, 230), -(50, 2, 231), -(50, 2, 232), -(50, 2, 233), -(50, 2, 234), -(50, 2, 235), -(50, 2, 236), -(50, 2, 237), -(50, 2, 238), -(50, 2, 239), -(50, 2, 240), -(50, 2, 241), -(55, 1, 1), -(55, 1, 2), -(55, 1, 3), -(55, 1, 4), -(55, 1, 5), -(55, 1, 6), -(55, 1, 7), -(55, 1, 8), -(55, 1, 9), -(55, 1, 10), -(55, 1, 11), -(55, 1, 12), -(55, 1, 13), -(55, 1, 14), -(55, 1, 15), -(55, 1, 16), -(55, 1, 17), -(55, 1, 18), -(55, 1, 19), -(55, 1, 20), -(55, 1, 21), -(55, 1, 22), -(55, 1, 23), -(55, 1, 24), -(55, 1, 25), -(55, 1, 26), -(55, 1, 27), -(55, 1, 28), -(55, 1, 29), -(55, 1, 30), -(55, 1, 31), -(55, 1, 32), -(55, 1, 33), -(55, 1, 34), -(55, 1, 35), -(55, 1, 36), -(55, 1, 37), -(55, 1, 38), -(55, 1, 39), -(55, 1, 40), -(55, 1, 41), -(55, 1, 42), -(55, 1, 43), -(55, 1, 44), -(55, 1, 45), -(55, 1, 46), -(55, 1, 47), -(55, 1, 48), -(55, 1, 49), -(55, 1, 50), -(55, 1, 51), -(55, 1, 52), -(55, 1, 53), -(55, 1, 54), -(55, 1, 55), -(55, 1, 56), -(55, 1, 57), -(55, 1, 58), -(55, 1, 59), -(55, 1, 60), -(55, 1, 61), -(55, 1, 62), -(55, 1, 63), -(55, 1, 64), -(55, 1, 65), -(55, 1, 66), -(55, 1, 67), -(55, 1, 68), -(55, 1, 69), -(55, 1, 70), -(55, 1, 71), -(55, 1, 72), -(55, 1, 73), -(55, 1, 74), -(55, 1, 75), -(55, 1, 76), -(55, 1, 77), -(55, 1, 78), -(55, 1, 79), -(55, 1, 80), -(55, 1, 81), -(55, 1, 82), -(55, 1, 83), -(55, 1, 84), -(55, 1, 85), -(55, 1, 86), -(55, 1, 87), -(55, 1, 88), -(55, 1, 89), -(55, 1, 90), -(55, 1, 91), -(55, 1, 92), -(55, 1, 93), -(55, 1, 94), -(55, 1, 95), -(55, 1, 96), -(55, 1, 97), -(55, 1, 98), -(55, 1, 99), -(55, 1, 100), -(55, 1, 101), -(55, 1, 102), -(55, 1, 103), -(55, 1, 104), -(55, 1, 105), -(55, 1, 106), -(55, 1, 107), -(55, 1, 108), -(55, 1, 109), -(55, 1, 110), -(55, 1, 111), -(55, 1, 112), -(55, 1, 113), -(55, 1, 114), -(55, 1, 115), -(55, 1, 116), -(55, 1, 117), -(55, 1, 118), -(55, 1, 119), -(55, 1, 120), -(55, 1, 121), -(55, 1, 122), -(55, 1, 123), -(55, 1, 124), -(55, 1, 125), -(55, 1, 126), -(55, 1, 127), -(55, 1, 128), -(55, 1, 129), -(55, 1, 130), -(55, 1, 131), -(55, 1, 132), -(55, 1, 133), -(55, 1, 134), -(55, 1, 135), -(55, 1, 136), -(55, 1, 137), -(55, 1, 138), -(55, 1, 139), -(55, 1, 140), -(55, 1, 141), -(55, 1, 142), -(55, 1, 143), -(55, 1, 144), -(55, 1, 145), -(55, 1, 146), -(55, 1, 147), -(55, 1, 148), -(55, 1, 149), -(55, 1, 150), -(55, 1, 151), -(55, 1, 152), -(55, 1, 153), -(55, 1, 154), -(55, 1, 155), -(55, 1, 156), -(55, 1, 157), -(55, 1, 158), -(55, 1, 159), -(55, 1, 160), -(55, 1, 161), -(55, 1, 162), -(55, 1, 163), -(55, 1, 164), -(55, 1, 165), -(55, 1, 166), -(55, 1, 167), -(55, 1, 168), -(55, 1, 169), -(55, 1, 170), -(55, 1, 171), -(55, 1, 172), -(55, 1, 173), -(55, 1, 174), -(55, 1, 175), -(55, 1, 176), -(55, 1, 177), -(55, 1, 178), -(55, 1, 179), -(55, 1, 180), -(55, 1, 181), -(55, 1, 182), -(55, 1, 183), -(55, 1, 184), -(55, 1, 185), -(55, 1, 186), -(55, 1, 187), -(55, 1, 188), -(55, 1, 189), -(55, 1, 190), -(55, 1, 191), -(55, 1, 192), -(55, 1, 193), -(55, 1, 194), -(55, 1, 195), -(55, 1, 196), -(55, 1, 197), -(55, 1, 198), -(55, 1, 199), -(55, 1, 200), -(55, 1, 201), -(55, 1, 202), -(55, 1, 203), -(55, 1, 204), -(55, 1, 205), -(55, 1, 206), -(55, 1, 207), -(55, 1, 208), -(55, 1, 209), -(55, 1, 210), -(55, 1, 211), -(55, 1, 212), -(55, 1, 213), -(55, 1, 214), -(55, 1, 215), -(55, 1, 216), -(55, 1, 217), -(55, 1, 218), -(55, 1, 219), -(55, 1, 220), -(55, 1, 221), -(55, 1, 222), -(55, 1, 223), -(55, 1, 224), -(55, 1, 225), -(55, 1, 226), -(55, 1, 227), -(55, 1, 228), -(55, 1, 229), -(55, 1, 230), -(55, 1, 231), -(55, 1, 232), -(55, 1, 233), -(55, 1, 234), -(55, 1, 235), -(55, 1, 236), -(55, 1, 237), -(55, 1, 238), -(55, 1, 239), -(55, 1, 240), -(55, 1, 241), -(55, 2, 1), -(55, 2, 2), -(55, 2, 3), -(55, 2, 4), -(55, 2, 5), -(55, 2, 6), -(55, 2, 7), -(55, 2, 8), -(55, 2, 9), -(55, 2, 10), -(55, 2, 11), -(55, 2, 12), -(55, 2, 13), -(55, 2, 14), -(55, 2, 15), -(55, 2, 16), -(55, 2, 17), -(55, 2, 18), -(55, 2, 19), -(55, 2, 20), -(55, 2, 21), -(55, 2, 22), -(55, 2, 23), -(55, 2, 24), -(55, 2, 25), -(55, 2, 26), -(55, 2, 27), -(55, 2, 28), -(55, 2, 29), -(55, 2, 30), -(55, 2, 31), -(55, 2, 32), -(55, 2, 33), -(55, 2, 34), -(55, 2, 35), -(55, 2, 36), -(55, 2, 37), -(55, 2, 38), -(55, 2, 39), -(55, 2, 40), -(55, 2, 41), -(55, 2, 42), -(55, 2, 43), -(55, 2, 44), -(55, 2, 45), -(55, 2, 46), -(55, 2, 47), -(55, 2, 48), -(55, 2, 49), -(55, 2, 50), -(55, 2, 51), -(55, 2, 52), -(55, 2, 53), -(55, 2, 54), -(55, 2, 55), -(55, 2, 56), -(55, 2, 57), -(55, 2, 58), -(55, 2, 59), -(55, 2, 60), -(55, 2, 61), -(55, 2, 62), -(55, 2, 63), -(55, 2, 64), -(55, 2, 65), -(55, 2, 66), -(55, 2, 67), -(55, 2, 68), -(55, 2, 69), -(55, 2, 70), -(55, 2, 71), -(55, 2, 72), -(55, 2, 73), -(55, 2, 74), -(55, 2, 75), -(55, 2, 76), -(55, 2, 77), -(55, 2, 78), -(55, 2, 79), -(55, 2, 80), -(55, 2, 81), -(55, 2, 82), -(55, 2, 83), -(55, 2, 84), -(55, 2, 85), -(55, 2, 86), -(55, 2, 87), -(55, 2, 88), -(55, 2, 89), -(55, 2, 90), -(55, 2, 91), -(55, 2, 92), -(55, 2, 93), -(55, 2, 94), -(55, 2, 95), -(55, 2, 96), -(55, 2, 97), -(55, 2, 98), -(55, 2, 99), -(55, 2, 100), -(55, 2, 101), -(55, 2, 102), -(55, 2, 103), -(55, 2, 104), -(55, 2, 105), -(55, 2, 106), -(55, 2, 107), -(55, 2, 108), -(55, 2, 109), -(55, 2, 110), -(55, 2, 111), -(55, 2, 112), -(55, 2, 113), -(55, 2, 114), -(55, 2, 115), -(55, 2, 116), -(55, 2, 117), -(55, 2, 118), -(55, 2, 119), -(55, 2, 120), -(55, 2, 121), -(55, 2, 122), -(55, 2, 123), -(55, 2, 124), -(55, 2, 125), -(55, 2, 126), -(55, 2, 127), -(55, 2, 128), -(55, 2, 129), -(55, 2, 130), -(55, 2, 131), -(55, 2, 132), -(55, 2, 133), -(55, 2, 134), -(55, 2, 135), -(55, 2, 136), -(55, 2, 137), -(55, 2, 138), -(55, 2, 139), -(55, 2, 140), -(55, 2, 141), -(55, 2, 142), -(55, 2, 143), -(55, 2, 144), -(55, 2, 145), -(55, 2, 146), -(55, 2, 147), -(55, 2, 148), -(55, 2, 149), -(55, 2, 150), -(55, 2, 151), -(55, 2, 152), -(55, 2, 153), -(55, 2, 154), -(55, 2, 155), -(55, 2, 156), -(55, 2, 157), -(55, 2, 158), -(55, 2, 159), -(55, 2, 160), -(55, 2, 161), -(55, 2, 162), -(55, 2, 163), -(55, 2, 164), -(55, 2, 165), -(55, 2, 166), -(55, 2, 167), -(55, 2, 168), -(55, 2, 169), -(55, 2, 170), -(55, 2, 171), -(55, 2, 172), -(55, 2, 173), -(55, 2, 174), -(55, 2, 175), -(55, 2, 176), -(55, 2, 177), -(55, 2, 178), -(55, 2, 179), -(55, 2, 180), -(55, 2, 181), -(55, 2, 182), -(55, 2, 183), -(55, 2, 184), -(55, 2, 185), -(55, 2, 186), -(55, 2, 187), -(55, 2, 188), -(55, 2, 189), -(55, 2, 190), -(55, 2, 191), -(55, 2, 192), -(55, 2, 193), -(55, 2, 194), -(55, 2, 195), -(55, 2, 196), -(55, 2, 197), -(55, 2, 198), -(55, 2, 199), -(55, 2, 200), -(55, 2, 201), -(55, 2, 202), -(55, 2, 203), -(55, 2, 204), -(55, 2, 205), -(55, 2, 206), -(55, 2, 207), -(55, 2, 208), -(55, 2, 209), -(55, 2, 210), -(55, 2, 211), -(55, 2, 212), -(55, 2, 213), -(55, 2, 214), -(55, 2, 215), -(55, 2, 216), -(55, 2, 217), -(55, 2, 218), -(55, 2, 219), -(55, 2, 220), -(55, 2, 221), -(55, 2, 222), -(55, 2, 223), -(55, 2, 224), -(55, 2, 225), -(55, 2, 226), -(55, 2, 227), -(55, 2, 228), -(55, 2, 229), -(55, 2, 230), -(55, 2, 231), -(55, 2, 232), -(55, 2, 233), -(55, 2, 234), -(55, 2, 235), -(55, 2, 236), -(55, 2, 237), -(55, 2, 238), -(55, 2, 239), -(55, 2, 240), -(55, 2, 241); +(53, 1, 1), +(53, 1, 2), +(53, 1, 3), +(53, 1, 4), +(53, 1, 5), +(53, 1, 6), +(53, 1, 7), +(53, 1, 8), +(53, 1, 9), +(53, 1, 10), +(53, 1, 11), +(53, 1, 12), +(53, 1, 13), +(53, 1, 14), +(53, 1, 15), +(53, 1, 16), +(53, 1, 17), +(53, 1, 18), +(53, 1, 19), +(53, 1, 20), +(53, 1, 21), +(53, 1, 22), +(53, 1, 23), +(53, 1, 24), +(53, 1, 25), +(53, 1, 26), +(53, 1, 27), +(53, 1, 28), +(53, 1, 29), +(53, 1, 30), +(53, 1, 31), +(53, 1, 32), +(53, 1, 33), +(53, 1, 34), +(53, 1, 35), +(53, 1, 36), +(53, 1, 37), +(53, 1, 38), +(53, 1, 39), +(53, 1, 40), +(53, 1, 41), +(53, 1, 42), +(53, 1, 43), +(53, 1, 44), +(53, 1, 45), +(53, 1, 46), +(53, 1, 47), +(53, 1, 48), +(53, 1, 49), +(53, 1, 50), +(53, 1, 51), +(53, 1, 52), +(53, 1, 53), +(53, 1, 54), +(53, 1, 55), +(53, 1, 56), +(53, 1, 57), +(53, 1, 58), +(53, 1, 59), +(53, 1, 60), +(53, 1, 61), +(53, 1, 62), +(53, 1, 63), +(53, 1, 64), +(53, 1, 65), +(53, 1, 66), +(53, 1, 67), +(53, 1, 68), +(53, 1, 69), +(53, 1, 70), +(53, 1, 71), +(53, 1, 72), +(53, 1, 73), +(53, 1, 74), +(53, 1, 75), +(53, 1, 76), +(53, 1, 77), +(53, 1, 78), +(53, 1, 79), +(53, 1, 80), +(53, 1, 81), +(53, 1, 82), +(53, 1, 83), +(53, 1, 84), +(53, 1, 85), +(53, 1, 86), +(53, 1, 87), +(53, 1, 88), +(53, 1, 89), +(53, 1, 90), +(53, 1, 91), +(53, 1, 92), +(53, 1, 93), +(53, 1, 94), +(53, 1, 95), +(53, 1, 96), +(53, 1, 97), +(53, 1, 98), +(53, 1, 99), +(53, 1, 100), +(53, 1, 101), +(53, 1, 102), +(53, 1, 103), +(53, 1, 104), +(53, 1, 105), +(53, 1, 106), +(53, 1, 107), +(53, 1, 108), +(53, 1, 109), +(53, 1, 110), +(53, 1, 111), +(53, 1, 112), +(53, 1, 113), +(53, 1, 114), +(53, 1, 115), +(53, 1, 116), +(53, 1, 117), +(53, 1, 118), +(53, 1, 119), +(53, 1, 120), +(53, 1, 121), +(53, 1, 122), +(53, 1, 123), +(53, 1, 124), +(53, 1, 125), +(53, 1, 126), +(53, 1, 127), +(53, 1, 128), +(53, 1, 129), +(53, 1, 130), +(53, 1, 131), +(53, 1, 132), +(53, 1, 133), +(53, 1, 134), +(53, 1, 135), +(53, 1, 136), +(53, 1, 137), +(53, 1, 138), +(53, 1, 139), +(53, 1, 140), +(53, 1, 141), +(53, 1, 142), +(53, 1, 143), +(53, 1, 144), +(53, 1, 145), +(53, 1, 146), +(53, 1, 147), +(53, 1, 148), +(53, 1, 149), +(53, 1, 150), +(53, 1, 151), +(53, 1, 152), +(53, 1, 153), +(53, 1, 154), +(53, 1, 155), +(53, 1, 156), +(53, 1, 157), +(53, 1, 158), +(53, 1, 159), +(53, 1, 160), +(53, 1, 161), +(53, 1, 162), +(53, 1, 163), +(53, 1, 164), +(53, 1, 165), +(53, 1, 166), +(53, 1, 167), +(53, 1, 168), +(53, 1, 169), +(53, 1, 170), +(53, 1, 171), +(53, 1, 172), +(53, 1, 173), +(53, 1, 174), +(53, 1, 175), +(53, 1, 176), +(53, 1, 177), +(53, 1, 178), +(53, 1, 179), +(53, 1, 180), +(53, 1, 181), +(53, 1, 182), +(53, 1, 183), +(53, 1, 184), +(53, 1, 185), +(53, 1, 186), +(53, 1, 187), +(53, 1, 188), +(53, 1, 189), +(53, 1, 190), +(53, 1, 191), +(53, 1, 192), +(53, 1, 193), +(53, 1, 194), +(53, 1, 195), +(53, 1, 196), +(53, 1, 197), +(53, 1, 198), +(53, 1, 199), +(53, 1, 200), +(53, 1, 201), +(53, 1, 202), +(53, 1, 203), +(53, 1, 204), +(53, 1, 205), +(53, 1, 206), +(53, 1, 207), +(53, 1, 208), +(53, 1, 209), +(53, 1, 210), +(53, 1, 211), +(53, 1, 212), +(53, 1, 213), +(53, 1, 214), +(53, 1, 215), +(53, 1, 216), +(53, 1, 217), +(53, 1, 218), +(53, 1, 219), +(53, 1, 220), +(53, 1, 221), +(53, 1, 222), +(53, 1, 223), +(53, 1, 224), +(53, 1, 225), +(53, 1, 226), +(53, 1, 227), +(53, 1, 228), +(53, 1, 229), +(53, 1, 230), +(53, 1, 231), +(53, 1, 232), +(53, 1, 233), +(53, 1, 234), +(53, 1, 235), +(53, 1, 236), +(53, 1, 237), +(53, 1, 238), +(53, 1, 239), +(53, 1, 240), +(53, 1, 241), +(64, 1, 1), +(64, 1, 2), +(64, 1, 3), +(64, 1, 4), +(64, 1, 5), +(64, 1, 6), +(64, 1, 7), +(64, 1, 8), +(64, 1, 9), +(64, 1, 10), +(64, 1, 11), +(64, 1, 12), +(64, 1, 13), +(64, 1, 14), +(64, 1, 15), +(64, 1, 16), +(64, 1, 17), +(64, 1, 18), +(64, 1, 19), +(64, 1, 20), +(64, 1, 21), +(64, 1, 22), +(64, 1, 23), +(64, 1, 24), +(64, 1, 25), +(64, 1, 26), +(64, 1, 27), +(64, 1, 28), +(64, 1, 29), +(64, 1, 30), +(64, 1, 31), +(64, 1, 32), +(64, 1, 33), +(64, 1, 34), +(64, 1, 35), +(64, 1, 36), +(64, 1, 37), +(64, 1, 38), +(64, 1, 39), +(64, 1, 40), +(64, 1, 41), +(64, 1, 42), +(64, 1, 43), +(64, 1, 44), +(64, 1, 45), +(64, 1, 46), +(64, 1, 47), +(64, 1, 48), +(64, 1, 49), +(64, 1, 50), +(64, 1, 51), +(64, 1, 52), +(64, 1, 53), +(64, 1, 54), +(64, 1, 55), +(64, 1, 56), +(64, 1, 57), +(64, 1, 58), +(64, 1, 59), +(64, 1, 60), +(64, 1, 61), +(64, 1, 62), +(64, 1, 63), +(64, 1, 64), +(64, 1, 65), +(64, 1, 66), +(64, 1, 67), +(64, 1, 68), +(64, 1, 69), +(64, 1, 70), +(64, 1, 71), +(64, 1, 72), +(64, 1, 73), +(64, 1, 74), +(64, 1, 75), +(64, 1, 76), +(64, 1, 77), +(64, 1, 78), +(64, 1, 79), +(64, 1, 80), +(64, 1, 81), +(64, 1, 82), +(64, 1, 83), +(64, 1, 84), +(64, 1, 85), +(64, 1, 86), +(64, 1, 87), +(64, 1, 88), +(64, 1, 89), +(64, 1, 90), +(64, 1, 91), +(64, 1, 92), +(64, 1, 93), +(64, 1, 94), +(64, 1, 95), +(64, 1, 96), +(64, 1, 97), +(64, 1, 98), +(64, 1, 99), +(64, 1, 100), +(64, 1, 101), +(64, 1, 102), +(64, 1, 103), +(64, 1, 104), +(64, 1, 105), +(64, 1, 106), +(64, 1, 107), +(64, 1, 108), +(64, 1, 109), +(64, 1, 110), +(64, 1, 111), +(64, 1, 112), +(64, 1, 113), +(64, 1, 114), +(64, 1, 115), +(64, 1, 116), +(64, 1, 117), +(64, 1, 118), +(64, 1, 119), +(64, 1, 120), +(64, 1, 121), +(64, 1, 122), +(64, 1, 123), +(64, 1, 124), +(64, 1, 125), +(64, 1, 126), +(64, 1, 127), +(64, 1, 128), +(64, 1, 129), +(64, 1, 130), +(64, 1, 131), +(64, 1, 132), +(64, 1, 133), +(64, 1, 134), +(64, 1, 135), +(64, 1, 136), +(64, 1, 137), +(64, 1, 138), +(64, 1, 139), +(64, 1, 140), +(64, 1, 141), +(64, 1, 142), +(64, 1, 143), +(64, 1, 144), +(64, 1, 145), +(64, 1, 146), +(64, 1, 147), +(64, 1, 148), +(64, 1, 149), +(64, 1, 150), +(64, 1, 151), +(64, 1, 152), +(64, 1, 153), +(64, 1, 154), +(64, 1, 155), +(64, 1, 156), +(64, 1, 157), +(64, 1, 158), +(64, 1, 159), +(64, 1, 160), +(64, 1, 161), +(64, 1, 162), +(64, 1, 163), +(64, 1, 164), +(64, 1, 165), +(64, 1, 166), +(64, 1, 167), +(64, 1, 168), +(64, 1, 169), +(64, 1, 170), +(64, 1, 171), +(64, 1, 172), +(64, 1, 173), +(64, 1, 174), +(64, 1, 175), +(64, 1, 176), +(64, 1, 177), +(64, 1, 178), +(64, 1, 179), +(64, 1, 180), +(64, 1, 181), +(64, 1, 182), +(64, 1, 183), +(64, 1, 184), +(64, 1, 185), +(64, 1, 186), +(64, 1, 187), +(64, 1, 188), +(64, 1, 189), +(64, 1, 190), +(64, 1, 191), +(64, 1, 192), +(64, 1, 193), +(64, 1, 194), +(64, 1, 195), +(64, 1, 196), +(64, 1, 197), +(64, 1, 198), +(64, 1, 199), +(64, 1, 200), +(64, 1, 201), +(64, 1, 202), +(64, 1, 203), +(64, 1, 204), +(64, 1, 205), +(64, 1, 206), +(64, 1, 207), +(64, 1, 208), +(64, 1, 209), +(64, 1, 210), +(64, 1, 211), +(64, 1, 212), +(64, 1, 213), +(64, 1, 214), +(64, 1, 215), +(64, 1, 216), +(64, 1, 217), +(64, 1, 218), +(64, 1, 219), +(64, 1, 220), +(64, 1, 221), +(64, 1, 222), +(64, 1, 223), +(64, 1, 224), +(64, 1, 225), +(64, 1, 226), +(64, 1, 227), +(64, 1, 228), +(64, 1, 229), +(64, 1, 230), +(64, 1, 231), +(64, 1, 232), +(64, 1, 233), +(64, 1, 234), +(64, 1, 235), +(64, 1, 236), +(64, 1, 237), +(64, 1, 238), +(64, 1, 239), +(64, 1, 240), +(64, 1, 241); DROP TABLE IF EXISTS `ps_module_currency`; CREATE TABLE `ps_module_currency` ( `id_module` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_currency` int(11) NOT NULL, PRIMARY KEY (`id_module`,`id_shop`,`id_currency`), KEY `id_module` (`id_module`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module_currency` (`id_module`, `id_shop`, `id_currency`) VALUES (32, 1, 1), (32, 1, 2), -(32, 2, 1), -(32, 2, 2), -(50, 1, 1), -(50, 1, 2), -(50, 2, 1), -(50, 2, 2), -(55, 1, 1), -(55, 1, 2), -(55, 2, 1), -(55, 2, 2); +(53, 1, 1), +(53, 1, 2), +(64, 1, 1), +(64, 1, 2); DROP TABLE IF EXISTS `ps_module_group`; CREATE TABLE `ps_module_group` ( `id_module` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', - `id_group` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', + `id_group` int(11) unsigned NOT NULL, PRIMARY KEY (`id_module`,`id_shop`,`id_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module_group` (`id_module`, `id_shop`, `id_group`) VALUES (1, 1, 1), (1, 1, 2), (1, 1, 3), -(1, 2, 1), -(1, 2, 2), -(1, 2, 3), (2, 1, 1), (2, 1, 2), (2, 1, 3), -(2, 2, 1), -(2, 2, 2), -(2, 2, 3), (3, 1, 1), (3, 1, 2), (3, 1, 3), -(3, 2, 1), -(3, 2, 2), -(3, 2, 3), (4, 1, 1), (4, 1, 2), (4, 1, 3), -(4, 2, 1), -(4, 2, 2), -(4, 2, 3), (5, 1, 1), (5, 1, 2), (5, 1, 3), -(5, 2, 1), -(5, 2, 2), -(5, 2, 3), (6, 1, 1), (6, 1, 2), (6, 1, 3), -(6, 2, 1), -(6, 2, 2), -(6, 2, 3), (7, 1, 1), (7, 1, 2), (7, 1, 3), -(7, 2, 1), -(7, 2, 2), -(7, 2, 3), (8, 1, 1), (8, 1, 2), (8, 1, 3), -(8, 2, 1), -(8, 2, 2), -(8, 2, 3), (9, 1, 1), (9, 1, 2), (9, 1, 3), -(9, 2, 1), -(9, 2, 2), -(9, 2, 3), (10, 1, 1), (10, 1, 2), (10, 1, 3), -(10, 2, 1), -(10, 2, 2), -(10, 2, 3), (11, 1, 1), (11, 1, 2), (11, 1, 3), -(11, 2, 1), -(11, 2, 2), -(11, 2, 3), (12, 1, 1), (12, 1, 2), (12, 1, 3), -(12, 2, 1), -(12, 2, 2), -(12, 2, 3), (13, 1, 1), (13, 1, 2), (13, 1, 3), -(13, 2, 1), -(13, 2, 2), -(13, 2, 3), (14, 1, 1), (14, 1, 2), (14, 1, 3), -(14, 2, 1), -(14, 2, 2), -(14, 2, 3), (15, 1, 1), (15, 1, 2), (15, 1, 3), -(15, 2, 1), -(15, 2, 2), -(15, 2, 3), (16, 1, 1), (16, 1, 2), (16, 1, 3), -(16, 2, 1), -(16, 2, 2), -(16, 2, 3), (17, 1, 1), (17, 1, 2), (17, 1, 3), -(17, 2, 1), -(17, 2, 2), -(17, 2, 3), (18, 1, 1), (18, 1, 2), (18, 1, 3), -(18, 2, 1), -(18, 2, 2), -(18, 2, 3), (19, 1, 1), (19, 1, 2), (19, 1, 3), -(19, 2, 1), -(19, 2, 2), -(19, 2, 3), (20, 1, 1), (20, 1, 2), (20, 1, 3), -(20, 2, 1), -(20, 2, 2), -(20, 2, 3), (21, 1, 1), (21, 1, 2), (21, 1, 3), -(21, 2, 1), -(21, 2, 2), -(21, 2, 3), (22, 1, 1), (22, 1, 2), (22, 1, 3), -(22, 2, 1), -(22, 2, 2), -(22, 2, 3), (23, 1, 1), (23, 1, 2), (23, 1, 3), -(23, 2, 1), -(23, 2, 2), -(23, 2, 3), (25, 1, 1), (25, 1, 2), (25, 1, 3), -(25, 2, 1), -(25, 2, 2), -(25, 2, 3), (26, 1, 1), (26, 1, 2), (26, 1, 3), -(26, 2, 1), -(26, 2, 2), -(26, 2, 3), (27, 1, 1), (27, 1, 2), (27, 1, 3), -(27, 2, 1), -(27, 2, 2), -(27, 2, 3), (28, 1, 1), (28, 1, 2), (28, 1, 3), -(28, 2, 1), -(28, 2, 2), -(28, 2, 3), (29, 1, 1), (29, 1, 2), (29, 1, 3), -(29, 2, 1), -(29, 2, 2), -(29, 2, 3), (30, 1, 1), (30, 1, 2), (30, 1, 3), -(30, 2, 1), -(30, 2, 2), -(30, 2, 3), (31, 1, 1), (31, 1, 2), (31, 1, 3), -(31, 2, 1), -(31, 2, 2), -(31, 2, 3), (32, 1, 1), (32, 1, 2), (32, 1, 3), -(32, 2, 1), -(32, 2, 2), -(32, 2, 3), (33, 1, 1), (33, 1, 2), (33, 1, 3), -(33, 2, 1), -(33, 2, 2), -(33, 2, 3), (34, 1, 1), (34, 1, 2), (34, 1, 3), -(34, 2, 1), -(34, 2, 2), -(34, 2, 3), (35, 1, 1), (35, 1, 2), (35, 1, 3), -(35, 2, 1), -(35, 2, 2), -(35, 2, 3), (36, 1, 1), (36, 1, 2), (36, 1, 3), -(36, 2, 1), -(36, 2, 2), -(36, 2, 3), (37, 1, 1), (37, 1, 2), (37, 1, 3), -(37, 2, 1), -(37, 2, 2), -(37, 2, 3), (38, 1, 1), (38, 1, 2), (38, 1, 3), -(38, 2, 1), -(38, 2, 2), -(38, 2, 3), (39, 1, 1), (39, 1, 2), (39, 1, 3), -(39, 2, 1), -(39, 2, 2), -(39, 2, 3), (40, 1, 1), (40, 1, 2), (40, 1, 3), -(40, 2, 1), -(40, 2, 2), -(40, 2, 3), (41, 1, 1), (41, 1, 2), (41, 1, 3), -(41, 2, 1), -(41, 2, 2), -(41, 2, 3), (42, 1, 1), (42, 1, 2), (42, 1, 3), -(42, 2, 1), -(42, 2, 2), -(42, 2, 3), (43, 1, 1), (43, 1, 2), (43, 1, 3), -(43, 2, 1), -(43, 2, 2), -(43, 2, 3), (44, 1, 1), (44, 1, 2), (44, 1, 3), -(44, 2, 1), -(44, 2, 2), -(44, 2, 3), (45, 1, 1), (45, 1, 2), (45, 1, 3), -(45, 2, 1), -(45, 2, 2), -(45, 2, 3), (46, 1, 1), (46, 1, 2), (46, 1, 3), -(46, 2, 1), -(46, 2, 2), -(46, 2, 3), (47, 1, 1), (47, 1, 2), (47, 1, 3), -(47, 2, 1), -(47, 2, 2), -(47, 2, 3), (48, 1, 1), (48, 1, 2), (48, 1, 3), -(48, 2, 1), -(48, 2, 2), -(48, 2, 3), (49, 1, 1), (49, 1, 2), (49, 1, 3), -(49, 2, 1), -(49, 2, 2), -(49, 2, 3), (50, 1, 1), (50, 1, 2), (50, 1, 3), -(50, 2, 1), -(50, 2, 2), -(50, 2, 3), (51, 1, 1), (51, 1, 2), (51, 1, 3), -(51, 2, 1), -(51, 2, 2), -(51, 2, 3), (52, 1, 1), (52, 1, 2), (52, 1, 3), -(52, 2, 1), -(52, 2, 2), -(52, 2, 3), (53, 1, 1), (53, 1, 2), (53, 1, 3), -(53, 2, 1), -(53, 2, 2), -(53, 2, 3), (54, 1, 1), (54, 1, 2), (54, 1, 3), -(54, 2, 1), -(54, 2, 2), -(54, 2, 3), (55, 1, 1), (55, 1, 2), (55, 1, 3), -(55, 2, 1), -(55, 2, 2), -(55, 2, 3), (56, 1, 1), (56, 1, 2), (56, 1, 3), -(56, 2, 1), -(56, 2, 2), -(56, 2, 3), (57, 1, 1), (57, 1, 2), (57, 1, 3), -(57, 2, 1), -(57, 2, 2), -(57, 2, 3), (58, 1, 1), (58, 1, 2), (58, 1, 3), -(58, 2, 1), -(58, 2, 2), -(58, 2, 3), (59, 1, 1), (59, 1, 2), (59, 1, 3), -(59, 2, 1), -(59, 2, 2), -(59, 2, 3), (60, 1, 1), (60, 1, 2), (60, 1, 3), -(60, 2, 1), -(60, 2, 2), -(60, 2, 3), (61, 1, 1), (61, 1, 2), (61, 1, 3), -(61, 2, 1), -(61, 2, 2), -(61, 2, 3), (62, 1, 1), (62, 1, 2), (62, 1, 3), -(62, 2, 1), -(62, 2, 2), -(62, 2, 3), (63, 1, 1), (63, 1, 2), (63, 1, 3), -(63, 2, 1), -(63, 2, 2), -(63, 2, 3), (64, 1, 1), (64, 1, 2), (64, 1, 3), -(64, 2, 1), -(64, 2, 2), -(64, 2, 3), (65, 1, 1), (65, 1, 2), (65, 1, 3), -(65, 2, 1), -(65, 2, 2), -(65, 2, 3), -(66, 1, 1), -(66, 1, 2), -(66, 1, 3), -(66, 2, 1), -(66, 2, 2), -(66, 2, 3); +(67, 1, 1), +(67, 1, 2), +(67, 1, 3); DROP TABLE IF EXISTS `ps_module_history`; CREATE TABLE `ps_module_history` ( @@ -12911,8 +9572,6 @@ CREATE TABLE `ps_module_history` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -INSERT INTO `ps_module_history` (`id`, `id_employee`, `id_module`, `date_add`, `date_upd`) VALUES -(1, 1, 50, '2023-05-08 18:33:53', '2023-05-08 18:33:53'); DROP TABLE IF EXISTS `ps_module_preference`; CREATE TABLE `ps_module_preference` ( @@ -12923,156 +9582,91 @@ CREATE TABLE `ps_module_preference` ( `favorite` tinyint(1) DEFAULT NULL, PRIMARY KEY (`id_module_preference`), UNIQUE KEY `employee_module` (`id_employee`,`module`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_module_shop`; CREATE TABLE `ps_module_shop` ( - `id_module` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_module` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `enable_device` tinyint(1) NOT NULL DEFAULT '7', PRIMARY KEY (`id_module`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_module_shop` (`id_module`, `id_shop`, `enable_device`) VALUES (1, 1, 7), -(1, 2, 7), (2, 1, 7), -(2, 2, 7), (3, 1, 7), -(3, 2, 7), (4, 1, 7), -(4, 2, 7), (5, 1, 7), -(5, 2, 7), (6, 1, 7), -(6, 2, 7), (7, 1, 7), -(7, 2, 7), (8, 1, 7), -(8, 2, 7), (9, 1, 7), -(9, 2, 7), (10, 1, 7), -(10, 2, 7), (11, 1, 7), -(11, 2, 7), (12, 1, 3), -(12, 2, 3), (13, 1, 7), -(13, 2, 7), (14, 1, 3), -(14, 2, 3), (15, 1, 7), -(15, 2, 7), (16, 1, 7), -(16, 2, 7), (17, 1, 7), -(17, 2, 7), (18, 1, 7), -(18, 2, 7), (19, 1, 7), -(19, 2, 7), (20, 1, 7), -(20, 2, 7), (21, 1, 7), -(21, 2, 7), (22, 1, 7), -(22, 2, 7), (23, 1, 7), -(23, 2, 7), (25, 1, 7), -(25, 2, 7), (26, 1, 7), -(26, 2, 7), (27, 1, 7), -(27, 2, 7), (28, 1, 7), -(28, 2, 7), (29, 1, 7), -(29, 2, 7), (30, 1, 7), -(30, 2, 7), (31, 1, 7), -(31, 2, 7), (32, 1, 7), -(32, 2, 7), (33, 1, 7), -(33, 2, 7), (34, 1, 7), -(34, 2, 7), (35, 1, 7), -(35, 2, 7), (36, 1, 7), -(36, 2, 7), (37, 1, 7), -(37, 2, 7), (38, 1, 7), -(38, 2, 7), (39, 1, 7), -(39, 2, 7), (40, 1, 7), -(40, 2, 7), (41, 1, 7), -(41, 2, 7), (42, 1, 7), -(42, 2, 7), (43, 1, 7), -(43, 2, 7), (44, 1, 7), -(44, 2, 7), (45, 1, 7), -(45, 2, 7), (46, 1, 7), -(46, 2, 7), (47, 1, 7), -(47, 2, 7), (48, 1, 7), -(48, 2, 7), (49, 1, 7), -(49, 2, 7), (50, 1, 7), -(50, 2, 7), (51, 1, 7), -(51, 2, 7), (52, 1, 7), -(52, 2, 7), (53, 1, 7), -(53, 2, 7), (54, 1, 7), -(54, 2, 7), (55, 1, 7), -(55, 2, 7), (56, 1, 7), -(56, 2, 7), (57, 1, 7), -(57, 2, 7), (58, 1, 7), -(58, 2, 7), (59, 1, 7), -(59, 2, 7), (60, 1, 7), -(60, 2, 7), (61, 1, 7), -(61, 2, 7), (62, 1, 7), -(62, 2, 7), (63, 1, 7), -(63, 2, 7), (64, 1, 7), -(64, 2, 7), (65, 1, 7), -(65, 2, 7), -(66, 1, 7), -(66, 2, 7); +(67, 1, 7); DROP TABLE IF EXISTS `ps_operating_system`; CREATE TABLE `ps_operating_system` ( `id_operating_system` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) DEFAULT NULL, PRIMARY KEY (`id_operating_system`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_operating_system` (`id_operating_system`, `name`) VALUES (1, 'Windows XP'), @@ -13089,8 +9683,8 @@ DROP TABLE IF EXISTS `ps_orders`; CREATE TABLE `ps_orders` ( `id_order` int(10) unsigned NOT NULL AUTO_INCREMENT, `reference` varchar(9) DEFAULT NULL, - `id_shop_group` int(10) unsigned NOT NULL DEFAULT '1', - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop_group` int(11) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_carrier` int(10) unsigned NOT NULL, `id_lang` int(10) unsigned NOT NULL, `id_customer` int(10) unsigned NOT NULL, @@ -13103,8 +9697,8 @@ CREATE TABLE `ps_orders` ( `payment` varchar(255) NOT NULL, `conversion_rate` decimal(13,6) NOT NULL DEFAULT '1.000000', `module` varchar(255) DEFAULT NULL, - `recyclable` tinyint(3) unsigned NOT NULL DEFAULT '0', - `gift` tinyint(3) unsigned NOT NULL DEFAULT '0', + `recyclable` tinyint(1) unsigned NOT NULL DEFAULT '0', + `gift` tinyint(1) unsigned NOT NULL DEFAULT '0', `gift_message` text, `mobile_theme` tinyint(1) NOT NULL DEFAULT '0', `total_discounts` decimal(20,6) NOT NULL DEFAULT '0.000000', @@ -13129,7 +9723,7 @@ CREATE TABLE `ps_orders` ( `delivery_number` int(10) unsigned NOT NULL DEFAULT '0', `invoice_date` datetime NOT NULL, `delivery_date` datetime NOT NULL, - `valid` int(10) unsigned NOT NULL DEFAULT '0', + `valid` int(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, `note` text, @@ -13147,32 +9741,22 @@ CREATE TABLE `ps_orders` ( KEY `current_state` (`current_state`), KEY `id_shop` (`id_shop`), KEY `date_add` (`date_add`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_orders` (`id_order`, `reference`, `id_shop_group`, `id_shop`, `id_carrier`, `id_lang`, `id_customer`, `id_cart`, `id_currency`, `id_address_delivery`, `id_address_invoice`, `current_state`, `secure_key`, `payment`, `conversion_rate`, `module`, `recyclable`, `gift`, `gift_message`, `mobile_theme`, `total_discounts`, `total_discounts_tax_incl`, `total_discounts_tax_excl`, `total_paid`, `total_paid_tax_incl`, `total_paid_tax_excl`, `total_paid_real`, `total_products`, `total_products_wt`, `total_shipping`, `total_shipping_tax_incl`, `total_shipping_tax_excl`, `carrier_tax_rate`, `total_wrapping`, `total_wrapping_tax_incl`, `total_wrapping_tax_excl`, `round_mode`, `round_type`, `invoice_number`, `delivery_number`, `invoice_date`, `delivery_date`, `valid`, `date_add`, `date_upd`, `note`) VALUES -(1, 'XKBKNABJK', 1, 1, 2, 1, 2, 1, 1, 5, 5, 6, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 61.800000, 68.200000, 66.800000, 0.000000, 59.800000, 59.800000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 'Test'), -(2, 'OHSATSERP', 1, 1, 2, 1, 2, 2, 1, 5, 5, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.900000, 169.900000, 169.900000, 0.000000, 169.900000, 169.900000, 0.000000, 0.000000, 0.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', ''), -(3, 'UOYEVOLI', 1, 1, 2, 1, 2, 3, 1, 5, 5, 8, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 14.900000, 21.300000, 19.900000, 0.000000, 12.900000, 12.900000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', ''), -(4, 'FFATNOMMJ', 1, 1, 2, 1, 2, 4, 1, 5, 5, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 14.900000, 21.300000, 19.900000, 0.000000, 12.900000, 12.900000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', ''), -(5, 'KHWLILZLL', 1, 1, 2, 1, 2, 5, 1, 5, 5, 10, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Bank wire', 1.000000, 'ps_wirepayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 20.900000, 27.300000, 25.900000, 0.000000, 18.900000, 18.900000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', ''), -(6, 'XPFLRJMAQ', 1, 2, 1, 1, 3, 6, 1, 7, 7, 1, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Payments by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 34.180000, 34.180000, 28.720000, 0.000000, 28.720000, 34.180000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-05-09 08:26:15', '2023-05-09 08:26:15', ''), -(7, 'UJYXWUVXZ', 1, 2, 1, 2, 3, 7, 1, 7, 7, 2, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Bancontact', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 52.690000, 52.690000, 47.230000, 105.380000, 28.720000, 34.180000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 1, 0, '2023-05-15 09:57:07', '0000-00-00 00:00:00', 1, '2023-05-15 09:57:06', '2023-05-15 09:57:07', ''), -(8, 'ABVITGLOT', 1, 2, 1, 2, 3, 13, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Bancontact', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 52.690000, 52.690000, 47.230000, 105.380000, 28.720000, 34.180000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 2, 0, '2023-05-15 10:01:09', '0000-00-00 00:00:00', 0, '2023-05-15 10:01:09', '2023-05-15 10:12:29', ''), -(9, 'FXQJCYYRS', 1, 2, 1, 2, 3, 15, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'iDEAL', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 52.690000, 52.690000, 47.230000, 105.380000, 28.720000, 34.180000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 3, 0, '2023-05-15 10:02:35', '0000-00-00 00:00:00', 0, '2023-05-15 10:02:35', '2023-05-15 10:13:28', ''), -(10, 'QDATPMUMJ', 1, 2, 1, 2, 3, 20, 1, 7, 7, 18, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Slice it.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 4, 0, '2023-05-15 10:12:14', '0000-00-00 00:00:00', 1, '2023-05-15 10:12:13', '2023-05-15 10:12:14', ''), -(11, 'QHWXVCBHE', 1, 2, 1, 2, 3, 21, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'iDEAL', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 5, 0, '2023-05-15 10:25:32', '0000-00-00 00:00:00', 0, '2023-05-15 10:25:32', '2023-05-15 10:36:51', ''), -(12, 'PWWTOWTOX', 1, 2, 1, 2, 3, 22, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Slice it.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 6, 0, '2023-05-15 10:26:29', '0000-00-00 00:00:00', 0, '2023-05-15 10:26:29', '2023-05-15 10:37:59', ''), -(13, 'HBRIAYHBX', 1, 2, 1, 2, 3, 23, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Pay later.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 7, 0, '2023-05-15 10:27:15', '0000-00-00 00:00:00', 0, '2023-05-15 10:27:14', '2023-05-15 10:38:26', ''), -(14, 'PKSGRJXBT', 1, 2, 1, 2, 3, 24, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Pay now.', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 8, 0, '2023-05-15 10:28:04', '0000-00-00 00:00:00', 0, '2023-05-15 10:28:04', '2023-05-15 10:39:34', ''), -(15, 'HGVLPLRYN', 1, 2, 1, 1, 3, 25, 1, 7, 7, 14, '0c46e3398a8f3f024dc6569fc56ed4eb', 'Credit/Debit Card', 1.000000, 'mollie', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.710000, 169.710000, 147.880000, 339.420000, 114.880000, 136.710000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 9, 0, '2023-05-15 10:29:11', '0000-00-00 00:00:00', 0, '2023-05-15 10:29:11', '2023-05-15 10:40:35', ''), -(16, 'QRVXSLSLY', 1, 1, 1, 1, 4, 28, 1, 10, 10, 10, '3374052bdf067ccff64d284a39dec0fd', 'Wire payment', 1.000000, 'ps_wirepayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 103.530000, 103.530000, 87.000000, 0.000000, 87.000000, 103.530000, 0.000000, 0.000000, 0.000000, 19.000, 0.000000, 0.000000, 0.000000, 2, 2, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 11:55:57', '2023-08-28 11:55:57', ''); +(1, 'XKBKNABJK', 1, 1, 2, 1, 2, 1, 1, 5, 5, 6, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 61.800000, 68.200000, 66.800000, 0.000000, 59.800000, 59.800000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 'Test'), +(2, 'OHSATSERP', 1, 1, 2, 1, 2, 2, 1, 5, 5, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 169.900000, 169.900000, 169.900000, 0.000000, 169.900000, 169.900000, 0.000000, 0.000000, 0.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', ''), +(3, 'UOYEVOLI', 1, 1, 2, 1, 2, 3, 1, 5, 5, 8, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 14.900000, 21.300000, 19.900000, 0.000000, 12.900000, 12.900000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', ''), +(4, 'FFATNOMMJ', 1, 1, 2, 1, 2, 4, 1, 5, 5, 1, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Payment by check', 1.000000, 'ps_checkpayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 14.900000, 21.300000, 19.900000, 0.000000, 12.900000, 12.900000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', ''), +(5, 'KHWLILZLL', 1, 1, 2, 1, 2, 5, 1, 5, 5, 10, 'b44a6d9efd7a0076a0fbce6b15eaf3b1', 'Bank wire', 1.000000, 'ps_wirepayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 20.900000, 27.300000, 25.900000, 0.000000, 18.900000, 18.900000, 7.000000, 8.400000, 7.000000, 0.000, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', ''), +(6, 'HSMNZOAHI', 1, 1, 1, 1, 3, 6, 1, 7, 7, 10, '4c26b11e96bb59693af803acba66be93', 'Bank transfer', 1.000000, 'ps_wirepayment', 0, 0, '', 0, 0.000000, 0.000000, 0.000000, 140.360000, 140.360000, 116.000000, 0.000000, 116.000000, 140.360000, 0.000000, 0.000000, 0.000000, 21.000, 0.000000, 0.000000, 0.000000, 2, 2, 0, 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, '2023-08-28 13:51:22', '2023-08-28 13:51:23', ''); DROP TABLE IF EXISTS `ps_order_carrier`; CREATE TABLE `ps_order_carrier` ( `id_order_carrier` int(11) NOT NULL AUTO_INCREMENT, - `id_order` int(10) unsigned NOT NULL, - `id_carrier` int(10) unsigned NOT NULL, - `id_order_invoice` int(10) unsigned DEFAULT NULL, + `id_order` int(11) unsigned NOT NULL, + `id_carrier` int(11) unsigned NOT NULL, + `id_order_invoice` int(11) unsigned DEFAULT NULL, `weight` decimal(20,6) DEFAULT NULL, `shipping_cost_tax_excl` decimal(20,6) DEFAULT NULL, `shipping_cost_tax_incl` decimal(20,6) DEFAULT NULL, @@ -13182,25 +9766,15 @@ CREATE TABLE `ps_order_carrier` ( KEY `id_order` (`id_order`), KEY `id_carrier` (`id_carrier`), KEY `id_order_invoice` (`id_order_invoice`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_carrier` (`id_order_carrier`, `id_order`, `id_carrier`, `id_order_invoice`, `weight`, `shipping_cost_tax_excl`, `shipping_cost_tax_incl`, `tracking_number`, `date_add`) VALUES -(1, 1, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-05-02 12:18:39'), -(2, 2, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-05-02 12:18:39'), -(3, 3, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-05-02 12:18:39'), -(4, 4, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-05-02 12:18:39'), -(5, 5, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-05-02 12:18:39'), -(6, 6, 1, 0, 0.300000, 0.000000, 0.000000, '', '2023-05-09 08:26:15'), -(7, 7, 1, 1, 0.300000, 0.000000, 0.000000, '', '2023-05-15 09:57:06'), -(8, 8, 1, 2, 0.300000, 0.000000, 0.000000, '', '2023-05-15 10:01:09'), -(9, 9, 1, 3, 0.300000, 0.000000, 0.000000, '', '2023-05-15 10:02:35'), -(10, 10, 1, 4, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:12:13'), -(11, 11, 1, 5, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:25:32'), -(12, 12, 1, 6, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:26:29'), -(13, 13, 1, 7, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:27:14'), -(14, 14, 1, 8, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:28:04'), -(15, 15, 1, 9, 1.200000, 0.000000, 0.000000, '', '2023-05-15 10:29:11'), -(16, 16, 1, 0, 0.900000, 0.000000, 0.000000, '', '2023-08-28 11:55:57'); +(1, 1, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-08-28 13:28:04'), +(2, 2, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-08-28 13:28:04'), +(3, 3, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-08-28 13:28:04'), +(4, 4, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-08-28 13:28:04'), +(5, 5, 2, 0, 0.000000, 7.000000, 8.400000, '', '2023-08-28 13:28:04'), +(6, 6, 1, 0, 1.200000, 0.000000, 0.000000, '', '2023-08-28 13:51:23'); DROP TABLE IF EXISTS `ps_order_cart_rule`; CREATE TABLE `ps_order_cart_rule` ( @@ -13212,11 +9786,11 @@ CREATE TABLE `ps_order_cart_rule` ( `value` decimal(20,6) NOT NULL DEFAULT '0.000000', `value_tax_excl` decimal(20,6) NOT NULL DEFAULT '0.000000', `free_shipping` tinyint(1) NOT NULL DEFAULT '0', - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_order_cart_rule`), KEY `id_order` (`id_order`), KEY `id_cart_rule` (`id_cart_rule`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_order_detail`; @@ -13225,13 +9799,13 @@ CREATE TABLE `ps_order_detail` ( `id_order` int(10) unsigned NOT NULL, `id_order_invoice` int(11) DEFAULT NULL, `id_warehouse` int(10) unsigned DEFAULT '0', - `id_shop` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, `product_id` int(10) unsigned NOT NULL, `product_attribute_id` int(10) unsigned DEFAULT NULL, `id_customization` int(10) unsigned DEFAULT '0', `product_name` text NOT NULL, `product_quantity` int(10) unsigned NOT NULL DEFAULT '0', - `product_quantity_in_stock` int(11) NOT NULL DEFAULT '0', + `product_quantity_in_stock` int(10) NOT NULL DEFAULT '0', `product_quantity_refunded` int(10) unsigned NOT NULL DEFAULT '0', `product_quantity_return` int(10) unsigned NOT NULL DEFAULT '0', `product_quantity_reinjected` int(10) unsigned NOT NULL DEFAULT '0', @@ -13249,8 +9823,8 @@ CREATE TABLE `ps_order_detail` ( `product_reference` varchar(64) DEFAULT NULL, `product_supplier_reference` varchar(64) DEFAULT NULL, `product_weight` decimal(20,6) NOT NULL, - `id_tax_rules_group` int(10) unsigned DEFAULT '0', - `tax_computation_method` tinyint(3) unsigned NOT NULL DEFAULT '0', + `id_tax_rules_group` int(11) unsigned DEFAULT '0', + `tax_computation_method` tinyint(1) unsigned NOT NULL DEFAULT '0', `tax_name` varchar(16) NOT NULL, `tax_rate` decimal(10,3) NOT NULL DEFAULT '0.000', `ecotax` decimal(17,6) NOT NULL DEFAULT '0.000000', @@ -13276,7 +9850,7 @@ CREATE TABLE `ps_order_detail` ( KEY `product_attribute_id` (`product_attribute_id`), KEY `id_tax_rules_group` (`id_tax_rules_group`), KEY `id_order_id_order_detail` (`id_order`,`id_order_detail`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_detail` (`id_order_detail`, `id_order`, `id_order_invoice`, `id_warehouse`, `id_shop`, `product_id`, `product_attribute_id`, `id_customization`, `product_name`, `product_quantity`, `product_quantity_in_stock`, `product_quantity_refunded`, `product_quantity_return`, `product_quantity_reinjected`, `product_price`, `reduction_percent`, `reduction_amount`, `reduction_amount_tax_incl`, `reduction_amount_tax_excl`, `group_reduction`, `product_quantity_discount`, `product_ean13`, `product_isbn`, `product_upc`, `product_mpn`, `product_reference`, `product_supplier_reference`, `product_weight`, `id_tax_rules_group`, `tax_computation_method`, `tax_name`, `tax_rate`, `ecotax`, `ecotax_tax_rate`, `discount_quantity_applied`, `download_hash`, `download_nb`, `download_deadline`, `total_price_tax_incl`, `total_price_tax_excl`, `unit_price_tax_incl`, `unit_price_tax_excl`, `total_shipping_price_tax_incl`, `total_shipping_price_tax_excl`, `purchase_supplier_price`, `original_product_price`, `original_wholesale_price`, `total_refunded_tax_excl`, `total_refunded_tax_incl`) VALUES (1, 1, 0, 0, 1, 1, 1, 0, 'Hummingbird printed t-shirt - Color : White, Size : S', 1, 1, 0, 0, 0, 23.900000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_1', '', 0.000000, 0, 0, '', 0.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 23.900000, 23.900000, 23.900000, 23.900000, 0.000000, 0.000000, 0.000000, 23.900000, 5.490000, 0.000000, 0.000000), @@ -13286,17 +9860,7 @@ INSERT INTO `ps_order_detail` (`id_order_detail`, `id_order`, `id_order_invoice` (5, 3, 0, 0, 1, 16, 28, 0, 'Mountain fox notebook Style : Ruled', 1, 1, 0, 0, 0, 12.900000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_8', '', 0.000000, 0, 0, '', 0.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 12.900000, 12.900000, 12.900000, 12.900000, 0.000000, 0.000000, 0.000000, 12.900000, 5.490000, 0.000000, 0.000000), (6, 4, 0, 0, 1, 16, 29, 0, 'Mountain fox notebook Style : Plain', 1, 1, 0, 0, 0, 12.900000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_8', '', 0.000000, 0, 0, '', 0.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 12.900000, 12.900000, 12.900000, 12.900000, 0.000000, 0.000000, 0.000000, 12.900000, 5.490000, 0.000000, 0.000000), (7, 5, 0, 0, 1, 10, 25, 0, 'Brown bear cushion Color : Black', 1, 1, 0, 0, 0, 18.900000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_16', '', 0.000000, 0, 0, '', 0.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 18.900000, 18.900000, 18.900000, 18.900000, 0.000000, 0.000000, 0.000000, 18.900000, 5.490000, 0.000000, 0.000000), -(8, 6, 0, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Size: S)', 1, 1, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 35.370000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 34.180000, 28.720000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(9, 7, 1, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 1, 1, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 35.370000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 34.180000, 28.720000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(10, 8, 2, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 1, 1, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 35.370000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 34.180000, 28.720000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(11, 9, 3, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 1, 1, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 35.370000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 34.180000, 28.720000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(12, 10, 4, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(13, 11, 5, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(14, 12, 6, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(15, 13, 7, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(16, 14, 8, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Größe: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(17, 15, 9, 0, 2, 2, 9, 0, 'Hummingbird printed sweater (Size: S)', 4, 4, 0, 0, 0, 28.720000, 20.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_3', 'demo_3_62', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 136.710000, 114.880000, 34.176800, 28.720000, 0.000000, 0.000000, 5.490000, 35.900000, 5.490000, 0.000000, 0.000000), -(18, 16, 0, 0, 1, 3, 13, 0, 'The best is yet to come\' Framed poster (Dimension: 40x60cm)', 3, 3, 0, 0, 0, 29.000000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_6', 'demo_6_70', 0.300000, 1, 0, 'MwSt. DE 19%', 19.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 103.530000, 87.000000, 34.510000, 29.000000, 0.000000, 0.000000, 5.490000, 29.000000, 5.490000, 0.000000, 0.000000); +(8, 6, 0, 0, 1, 4, 16, 0, 'The adventure begins Framed poster (Dimension: 40x60cm)', 4, 4, 0, 0, 0, 29.000000, 0.00, 0.000000, 0.000000, 0.000000, 0.00, 0.000000, '', '', '', '', 'demo_5', 'demo_5_73', 0.300000, 1, 0, 'BTW NL 21%', 21.000, 0.000000, 0.000, 0, '', 0, '0000-00-00 00:00:00', 140.360000, 116.000000, 35.090000, 29.000000, 0.000000, 0.000000, 5.490000, 29.000000, 5.490000, 0.000000, 0.000000); DROP TABLE IF EXISTS `ps_order_detail_tax`; CREATE TABLE `ps_order_detail_tax` ( @@ -13306,20 +9870,10 @@ CREATE TABLE `ps_order_detail_tax` ( `total_amount` decimal(16,6) NOT NULL DEFAULT '0.000000', KEY `id_order_detail` (`id_order_detail`), KEY `id_tax` (`id_tax`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_detail_tax` (`id_order_detail`, `id_tax`, `unit_amount`, `total_amount`) VALUES -(8, 1, 5.456800, 5.460000), -(9, 1, 5.456800, 5.460000), -(10, 1, 5.456800, 5.460000), -(11, 1, 5.456800, 5.460000), -(12, 1, 5.456800, 21.830000), -(13, 1, 5.456800, 21.830000), -(14, 1, 5.456800, 21.830000), -(15, 1, 5.456800, 21.830000), -(16, 1, 5.456800, 21.830000), -(17, 1, 5.456800, 21.830000), -(18, 1, 5.510000, 16.530000); +(8, 1, 6.090000, 24.360000); DROP TABLE IF EXISTS `ps_order_history`; CREATE TABLE `ps_order_history` ( @@ -13332,54 +9886,21 @@ CREATE TABLE `ps_order_history` ( KEY `order_history_order` (`id_order`), KEY `id_employee` (`id_employee`), KEY `id_order_state` (`id_order_state`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_history` (`id_order_history`, `id_employee`, `id_order`, `id_order_state`, `date_add`) VALUES -(1, 0, 1, 1, '2023-05-02 12:18:39'), -(2, 0, 2, 1, '2023-05-02 12:18:39'), -(3, 0, 3, 1, '2023-05-02 12:18:39'), -(4, 0, 4, 1, '2023-05-02 12:18:39'), -(5, 0, 5, 10, '2023-05-02 12:18:39'), -(6, 1, 1, 6, '2023-05-02 12:18:39'), -(7, 1, 3, 8, '2023-05-02 12:18:39'), -(8, 0, 6, 1, '2023-05-09 08:26:15'), -(9, 0, 7, 15, '2023-05-15 09:57:06'), -(10, 0, 7, 2, '2023-05-15 09:57:07'), -(11, 0, 8, 15, '2023-05-15 10:01:09'), -(12, 0, 8, 2, '2023-05-15 10:01:09'), -(13, 0, 8, 16, '2023-05-15 10:01:38'), -(14, 0, 9, 15, '2023-05-15 10:02:35'), -(15, 0, 9, 2, '2023-05-15 10:02:35'), -(16, 0, 9, 16, '2023-05-15 10:03:06'), -(17, 0, 10, 15, '2023-05-15 10:12:14'), -(18, 0, 10, 18, '2023-05-15 10:12:14'), -(19, 0, 8, 14, '2023-05-15 10:12:29'), -(20, 0, 9, 14, '2023-05-15 10:13:28'), -(21, 0, 11, 15, '2023-05-15 10:25:32'), -(22, 0, 11, 2, '2023-05-15 10:25:32'), -(23, 0, 11, 16, '2023-05-15 10:26:07'), -(24, 0, 12, 15, '2023-05-15 10:26:29'), -(25, 0, 12, 18, '2023-05-15 10:26:29'), -(26, 0, 12, 16, '2023-05-15 10:26:54'), -(27, 0, 13, 15, '2023-05-15 10:27:15'), -(28, 0, 13, 18, '2023-05-15 10:27:15'), -(29, 0, 14, 15, '2023-05-15 10:28:04'), -(30, 0, 14, 18, '2023-05-15 10:28:05'), -(31, 0, 13, 16, '2023-05-15 10:28:21'), -(32, 0, 14, 16, '2023-05-15 10:28:32'), -(33, 0, 15, 15, '2023-05-15 10:29:11'), -(34, 0, 15, 2, '2023-05-15 10:29:11'), -(35, 0, 15, 16, '2023-05-15 10:30:09'), -(36, 0, 11, 14, '2023-05-15 10:36:51'), -(37, 0, 12, 14, '2023-05-15 10:37:59'), -(38, 0, 13, 14, '2023-05-15 10:38:26'), -(39, 0, 14, 14, '2023-05-15 10:39:34'), -(40, 0, 15, 14, '2023-05-15 10:40:35'), -(41, 0, 16, 10, '2023-08-28 11:55:57'); +(1, 0, 1, 1, '2023-08-28 13:28:04'), +(2, 0, 2, 1, '2023-08-28 13:28:04'), +(3, 0, 3, 1, '2023-08-28 13:28:04'), +(4, 0, 4, 1, '2023-08-28 13:28:04'), +(5, 0, 5, 10, '2023-08-28 13:28:04'), +(6, 1, 1, 6, '2023-08-28 13:28:04'), +(7, 1, 3, 8, '2023-08-28 13:28:04'), +(8, 0, 6, 10, '2023-08-28 13:51:23'); DROP TABLE IF EXISTS `ps_order_invoice`; CREATE TABLE `ps_order_invoice` ( - `id_order_invoice` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_order_invoice` int(11) unsigned NOT NULL AUTO_INCREMENT, `id_order` int(11) NOT NULL, `number` int(11) NOT NULL, `delivery_number` int(11) NOT NULL, @@ -13400,39 +9921,19 @@ CREATE TABLE `ps_order_invoice` ( `date_add` datetime NOT NULL, PRIMARY KEY (`id_order_invoice`), KEY `id_order` (`id_order`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `ps_order_invoice` (`id_order_invoice`, `id_order`, `number`, `delivery_number`, `delivery_date`, `total_discount_tax_excl`, `total_discount_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `shipping_tax_computation_method`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, `shop_address`, `note`, `date_add`) VALUES -(1, 7, 1, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 47.230000, 52.690000, 28.720000, 34.180000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 09:57:07'), -(2, 8, 2, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 47.230000, 52.690000, 28.720000, 34.180000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:01:09'), -(3, 9, 3, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 47.230000, 52.690000, 28.720000, 34.180000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:02:35'), -(4, 10, 4, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 147.880000, 169.710000, 114.880000, 136.710000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:12:14'), -(5, 11, 5, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 147.880000, 169.710000, 114.880000, 136.710000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:25:32'), -(6, 12, 6, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 147.880000, 169.710000, 114.880000, 136.710000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:26:29'), -(7, 13, 7, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 147.880000, 169.710000, 114.880000, 136.710000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:27:15'), -(8, 14, 8, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 147.880000, 169.710000, 114.880000, 136.710000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:28:04'), -(9, 15, 9, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 147.880000, 169.710000, 114.880000, 136.710000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PrestaShop', '', '2023-05-15 10:29:11'); DROP TABLE IF EXISTS `ps_order_invoice_payment`; CREATE TABLE `ps_order_invoice_payment` ( - `id_order_invoice` int(10) unsigned NOT NULL, - `id_order_payment` int(10) unsigned NOT NULL, - `id_order` int(10) unsigned NOT NULL, + `id_order_invoice` int(11) unsigned NOT NULL, + `id_order_payment` int(11) unsigned NOT NULL, + `id_order` int(11) unsigned NOT NULL, PRIMARY KEY (`id_order_invoice`,`id_order_payment`), KEY `order_payment` (`id_order_payment`), KEY `id_order` (`id_order`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `ps_order_invoice_payment` (`id_order_invoice`, `id_order_payment`, `id_order`) VALUES -(1, 1, 7), -(2, 2, 8), -(3, 3, 9), -(4, 4, 10), -(5, 5, 11), -(6, 6, 12), -(7, 7, 13), -(8, 8, 14), -(9, 9, 15); DROP TABLE IF EXISTS `ps_order_invoice_tax`; CREATE TABLE `ps_order_invoice_tax` ( @@ -13441,28 +9942,18 @@ CREATE TABLE `ps_order_invoice_tax` ( `id_tax` int(11) NOT NULL, `amount` decimal(10,6) NOT NULL DEFAULT '0.000000', KEY `id_tax` (`id_tax`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `ps_order_invoice_tax` (`id_order_invoice`, `type`, `id_tax`, `amount`) VALUES -(1, 'shipping', 1, 0.000000), -(2, 'shipping', 1, 0.000000), -(3, 'shipping', 1, 0.000000), -(4, 'shipping', 1, 0.000000), -(5, 'shipping', 1, 0.000000), -(6, 'shipping', 1, 0.000000), -(7, 'shipping', 1, 0.000000), -(8, 'shipping', 1, 0.000000), -(9, 'shipping', 1, 0.000000); DROP TABLE IF EXISTS `ps_order_message`; CREATE TABLE `ps_order_message` ( `id_order_message` int(10) unsigned NOT NULL AUTO_INCREMENT, `date_add` datetime NOT NULL, PRIMARY KEY (`id_order_message`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_message` (`id_order_message`, `date_add`) VALUES -(1, '2023-05-02 12:18:39'); +(1, '2023-08-28 13:28:04'); DROP TABLE IF EXISTS `ps_order_message_lang`; CREATE TABLE `ps_order_message_lang` ( @@ -13471,12 +9962,12 @@ CREATE TABLE `ps_order_message_lang` ( `name` varchar(128) NOT NULL, `message` text NOT NULL, PRIMARY KEY (`id_order_message`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_message_lang` (`id_order_message`, `id_lang`, `name`, `message`) VALUES (1, 1, 'Delay', 'Hi,\n\nUnfortunately, an item on your order is currently out of stock. This may cause a slight delay in delivery.\nPlease accept our apologies and rest assured that we are working hard to rectify this.\n\nBest regards,'), -(1, 2, 'Lieferung', 'Leider sind ein oder mehrere Artikel Ihrer Bestellung derzeit nicht auf Lager. Dies kann zu einer leichten Verzögerung bei Auslieferung führen. Wir entschuldigen uns und versichern Ihnen, dass Sie Ihre Bestellung schnellstmöglich erhalten.'), -(1, 3, 'Vertraging', 'Hallo, Een van de door u bestelde artikelen is momenteel niet op voorraad. Hierdoor kan de levertijd iets uitlopen. Wij bieden u onze excuses aan en doen er alles aan om u zo snel mogelijk te leveren. Met vriendelijke groet,'); +(1, 2, 'Vertraging', 'Hallo, Een van de door u bestelde artikelen is momenteel niet op voorraad. Hierdoor kan de levertijd iets uitlopen. Wij bieden u onze excuses aan en doen er alles aan om u zo snel mogelijk te leveren. Met vriendelijke groet,'), +(1, 3, 'Lieferung', 'Leider sind ein oder mehrere Artikel Ihrer Bestellung derzeit nicht auf Lager. Dies kann zu einer leichten Verzögerung bei Auslieferung führen. Wir entschuldigen uns und versichern Ihnen, dass Sie Ihre Bestellung schnellstmöglich erhalten.'); DROP TABLE IF EXISTS `ps_order_payment`; CREATE TABLE `ps_order_payment` ( @@ -13494,32 +9985,22 @@ CREATE TABLE `ps_order_payment` ( `date_add` datetime NOT NULL, PRIMARY KEY (`id_order_payment`), KEY `order_reference` (`order_reference`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `ps_order_payment` (`id_order_payment`, `order_reference`, `id_currency`, `amount`, `payment_method`, `conversion_rate`, `transaction_id`, `card_number`, `card_brand`, `card_expiration`, `card_holder`, `date_add`) VALUES -(1, 'UJYXWUVXZ', 1, 52.690000, 'Bancontact', 1.000000, 'ord_669hzt', '', '', '', '', '2023-05-15 09:57:07'), -(2, 'ABVITGLOT', 1, 52.690000, 'Bancontact', 1.000000, 'ord_srdwat', '', '', '', '', '2023-05-15 10:01:09'), -(3, 'FXQJCYYRS', 1, 52.690000, 'iDEAL', 1.000000, 'ord_8rjvbf', '', '', '', '', '2023-05-15 10:02:35'), -(4, 'QDATPMUMJ', 1, 169.710000, 'Slice it.', 1.000000, 'ord_d9j8y9', '', '', '', '', '2023-05-15 10:12:14'), -(5, 'QHWXVCBHE', 1, 169.710000, 'iDEAL', 1.000000, 'ord_oidygr', '', '', '', '', '2023-05-15 10:25:32'), -(6, 'PWWTOWTOX', 1, 169.710000, 'Slice it.', 1.000000, 'ord_qgnewp', '', '', '', '', '2023-05-15 10:26:29'), -(7, 'HBRIAYHBX', 1, 169.710000, 'Pay later.', 1.000000, 'ord_tl0hh9', '', '', '', '', '2023-05-15 10:27:15'), -(8, 'PKSGRJXBT', 1, 169.710000, 'Pay now.', 1.000000, 'ord_zeu9qb', '', '', '', '', '2023-05-15 10:28:04'), -(9, 'HGVLPLRYN', 1, 169.710000, 'Credit/Debit Card', 1.000000, 'ord_v0nt43', '', '', '', '', '2023-05-15 10:29:11'); DROP TABLE IF EXISTS `ps_order_return`; CREATE TABLE `ps_order_return` ( `id_order_return` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_customer` int(10) unsigned NOT NULL, `id_order` int(10) unsigned NOT NULL, - `state` tinyint(3) unsigned NOT NULL DEFAULT '1', + `state` tinyint(1) unsigned NOT NULL DEFAULT '1', `question` text NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_order_return`), KEY `order_return_customer` (`id_customer`), KEY `id_order` (`id_order`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_order_return_detail`; @@ -13529,7 +10010,7 @@ CREATE TABLE `ps_order_return_detail` ( `id_customization` int(10) unsigned NOT NULL DEFAULT '0', `product_quantity` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_order_return`,`id_order_detail`,`id_customization`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_order_return_state`; @@ -13537,7 +10018,7 @@ CREATE TABLE `ps_order_return_state` ( `id_order_return_state` int(10) unsigned NOT NULL AUTO_INCREMENT, `color` varchar(32) DEFAULT NULL, PRIMARY KEY (`id_order_return_state`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_return_state` (`id_order_return_state`, `color`) VALUES (1, '#4169E1'), @@ -13552,24 +10033,24 @@ CREATE TABLE `ps_order_return_state_lang` ( `id_lang` int(10) unsigned NOT NULL, `name` varchar(64) NOT NULL, PRIMARY KEY (`id_order_return_state`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_return_state_lang` (`id_order_return_state`, `id_lang`, `name`) VALUES (1, 1, 'Waiting for confirmation'), -(1, 2, 'Warten auf Bestätigung'), -(1, 3, 'Wacht op bevestiging'), +(1, 2, 'Wacht op bevestiging'), +(1, 3, 'Warten auf Bestätigung'), (2, 1, 'Waiting for package'), -(2, 2, 'Sendung erwartet'), -(2, 3, 'Wacht op pakket'), +(2, 2, 'Wacht op pakket'), +(2, 3, 'Sendung erwartet'), (3, 1, 'Package received'), -(3, 2, 'Sendung erhalten'), -(3, 3, 'Pakket ontvangen'), +(3, 2, 'Pakket ontvangen'), +(3, 3, 'Sendung erhalten'), (4, 1, 'Return denied'), -(4, 2, 'Rücksendung verweigert'), -(4, 3, 'Retour geweigerd'), +(4, 2, 'Retour geweigerd'), +(4, 3, 'Rücksendung verweigert'), (5, 1, 'Return completed'), -(5, 2, 'Rücksendung abgeschlossen'), -(5, 3, 'Retour voltooid'); +(5, 2, 'Retour voltooid'), +(5, 3, 'Rücksendung abgeschlossen'); DROP TABLE IF EXISTS `ps_order_slip`; CREATE TABLE `ps_order_slip` ( @@ -13585,13 +10066,13 @@ CREATE TABLE `ps_order_slip` ( `amount` decimal(20,6) NOT NULL DEFAULT '0.000000', `shipping_cost_amount` decimal(20,6) NOT NULL DEFAULT '0.000000', `partial` tinyint(1) NOT NULL, - `order_slip_type` tinyint(3) unsigned NOT NULL DEFAULT '0', + `order_slip_type` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_order_slip`), KEY `order_slip_customer` (`id_customer`), KEY `id_order` (`id_order`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_order_slip_detail`; @@ -13606,28 +10087,28 @@ CREATE TABLE `ps_order_slip_detail` ( `amount_tax_excl` decimal(20,6) DEFAULT NULL, `amount_tax_incl` decimal(20,6) DEFAULT NULL, PRIMARY KEY (`id_order_slip`,`id_order_detail`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_order_state`; CREATE TABLE `ps_order_state` ( `id_order_state` int(10) unsigned NOT NULL AUTO_INCREMENT, - `invoice` tinyint(3) unsigned DEFAULT '0', - `send_email` tinyint(3) unsigned NOT NULL DEFAULT '0', + `invoice` tinyint(1) unsigned DEFAULT '0', + `send_email` tinyint(1) unsigned NOT NULL DEFAULT '0', `module_name` varchar(255) DEFAULT NULL, `color` varchar(32) DEFAULT NULL, - `unremovable` tinyint(3) unsigned NOT NULL, - `hidden` tinyint(3) unsigned NOT NULL DEFAULT '0', + `unremovable` tinyint(1) unsigned NOT NULL, + `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0', `logable` tinyint(1) NOT NULL DEFAULT '0', - `delivery` tinyint(3) unsigned NOT NULL DEFAULT '0', - `shipped` tinyint(3) unsigned NOT NULL DEFAULT '0', - `paid` tinyint(3) unsigned NOT NULL DEFAULT '0', - `pdf_invoice` tinyint(3) unsigned NOT NULL DEFAULT '0', - `pdf_delivery` tinyint(3) unsigned NOT NULL DEFAULT '0', - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', + `delivery` tinyint(1) unsigned NOT NULL DEFAULT '0', + `shipped` tinyint(1) unsigned NOT NULL DEFAULT '0', + `paid` tinyint(1) unsigned NOT NULL DEFAULT '0', + `pdf_invoice` tinyint(1) unsigned NOT NULL DEFAULT '0', + `pdf_delivery` tinyint(1) unsigned NOT NULL DEFAULT '0', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_order_state`), KEY `module_name` (`module_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_state` (`id_order_state`, `invoice`, `send_email`, `module_name`, `color`, `unremovable`, `hidden`, `logable`, `delivery`, `shipped`, `paid`, `pdf_invoice`, `pdf_delivery`, `deleted`) VALUES (1, 0, 1, 'ps_checkpayment', '#34209E', 1, 0, 0, 0, 0, 0, 0, 0, 0), @@ -13658,48 +10139,54 @@ CREATE TABLE `ps_order_state_lang` ( `name` varchar(64) NOT NULL, `template` varchar(64) NOT NULL, PRIMARY KEY (`id_order_state`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_state_lang` (`id_order_state`, `id_lang`, `name`, `template`) VALUES (1, 1, 'Awaiting check payment', 'cheque'), -(1, 2, 'Scheckzahlung wird erwartet', 'cheque'), -(1, 3, 'Wachtend op uw betaling', 'cheque'), +(1, 2, 'Wachtend op uw betaling', 'cheque'), +(1, 3, 'Scheckzahlung wird erwartet', 'cheque'), (2, 1, 'Payment accepted', 'payment'), -(2, 2, 'Zahlung eingegangen', 'payment'), -(2, 3, 'Betaling aanvaard', 'payment'), +(2, 2, 'Betaling aanvaard', 'payment'), +(2, 3, 'Zahlung eingegangen', 'payment'), (3, 1, 'Processing in progress', 'preparation'), -(3, 2, 'Bestellung in Bearbeitung', 'preparation'), -(3, 3, 'Wordt momenteel voorbereid', 'preparation'), +(3, 2, 'Wordt momenteel voorbereid', 'preparation'), +(3, 3, 'Bestellung in Bearbeitung', 'preparation'), (4, 1, 'Shipped', 'shipped'), -(4, 2, 'Versand', 'shipped'), -(4, 3, 'Verzonden', 'shipped'), +(4, 2, 'Verzonden', 'shipped'), +(4, 3, 'Versand', 'shipped'), (5, 1, 'Delivered', ''), -(5, 2, 'Bestellung ausgeliefert', ''), -(5, 3, 'Afgeleverd', ''), +(5, 2, 'Afgeleverd', ''), +(5, 3, 'Bestellung ausgeliefert', ''), (6, 1, 'Canceled', 'order_canceled'), -(6, 2, 'Bestellung storniert', 'order_canceled'), -(6, 3, 'Geannuleerd', 'order_canceled'), +(6, 2, 'Geannuleerd', 'order_canceled'), +(6, 3, 'Bestellung storniert', 'order_canceled'), (7, 1, 'Refunded', 'refund'), -(7, 2, 'Erstattet', 'refund'), -(7, 3, 'Terugbetaald', 'refund'), +(7, 2, 'Terugbetaald', 'refund'), +(7, 3, 'Erstattet', 'refund'), (8, 1, 'Payment error', 'payment_error'), -(8, 2, 'Fehler bei der Bezahlung', 'payment_error'), -(8, 3, 'Betalingsfout', 'payment_error'), +(8, 2, 'Betalingsfout', 'payment_error'), +(8, 3, 'Fehler bei der Bezahlung', 'payment_error'), (9, 1, 'On backorder (paid)', 'outofstock'), -(9, 2, 'Artikel nicht auf Lager (bezahlt)', 'outofstock'), -(9, 3, 'Momenteel in backorder (betaald)', 'outofstock'), +(9, 2, 'Momenteel in backorder (betaald)', 'outofstock'), +(9, 3, 'Artikel nicht auf Lager (bezahlt)', 'outofstock'), (10, 1, 'Awaiting bank wire payment', 'bankwire'), -(10, 2, 'Warten auf Zahlungseingang Überweisung', 'bankwire'), -(10, 3, 'In afwachting van bankoverschrijving', 'bankwire'), +(10, 2, 'In afwachting van bankoverschrijving', 'bankwire'), +(10, 3, 'Warten auf Zahlungseingang Überweisung', 'bankwire'), (11, 1, 'Remote payment accepted', 'payment'), -(11, 2, 'Zahlung ausserhalb von PrestaShop eingegangen', 'payment'), -(11, 3, 'Betaling op afstand aanvaard', 'payment'), +(11, 2, 'Betaling op afstand aanvaard', 'payment'), +(11, 3, 'Zahlung ausserhalb von PrestaShop eingegangen', 'payment'), (12, 1, 'On backorder (not paid)', 'outofstock'), -(12, 2, 'Artikel nicht auf Lager', 'outofstock'), -(12, 3, 'Momenteel in backorder (niet betaald)', 'outofstock'), +(12, 2, 'Momenteel in backorder (niet betaald)', 'outofstock'), +(12, 3, 'Artikel nicht auf Lager', 'outofstock'), (13, 1, 'Awaiting Cash On Delivery validation', 'cashondelivery'), -(13, 2, 'Warten auf Zahlungseingang Nachnahme', 'cashondelivery'), -(13, 3, 'Wachten op bevestiging (rembours)', 'cashondelivery'), +(13, 2, 'Wachten op bevestiging (rembours)', 'cashondelivery'), +(13, 3, 'Warten auf Zahlungseingang Nachnahme', 'cashondelivery'), +(14, 1, 'Partially refunded by Mollie', ''), +(14, 2, 'Partially refunded by Mollie', ''), +(14, 3, 'Partially refunded by Mollie', ''), +(15, 1, 'Awaiting Mollie payment', ''), +(15, 2, 'Awaiting Mollie payment', ''), +(15, 3, 'Awaiting Mollie payment', ''), (16, 1, 'Partially shipped', ''), (16, 2, 'Partially shipped', ''), (16, 3, 'Partially shipped', ''), @@ -13711,7 +10198,10 @@ INSERT INTO `ps_order_state_lang` (`id_order_state`, `id_lang`, `name`, `templat (18, 3, 'Klarna payment authorized', 'payment'), (19, 1, 'Klarna payment shipped', 'shipped'), (19, 2, 'Klarna payment shipped', 'shipped'), -(19, 3, 'Klarna payment shipped', 'shipped'); +(19, 3, 'Klarna payment shipped', 'shipped'), +(20, 1, 'Mollie Chargeback', ''), +(20, 2, 'Mollie Chargeback', ''), +(20, 3, 'Mollie Chargeback', ''); DROP TABLE IF EXISTS `ps_pack`; CREATE TABLE `ps_pack` ( @@ -13721,7 +10211,7 @@ CREATE TABLE `ps_pack` ( `quantity` int(10) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id_product_pack`,`id_product_item`,`id_product_attribute_item`), KEY `product_item` (`id_product_item`,`id_product_attribute_item`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_pack` (`id_product_pack`, `id_product_item`, `id_product_attribute_item`, `quantity`) VALUES (15, 5, 19, 5), @@ -13735,13 +10225,10 @@ CREATE TABLE `ps_page` ( PRIMARY KEY (`id_page`), KEY `id_page_type` (`id_page_type`), KEY `id_object` (`id_object`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_page` (`id_page`, `id_page_type`, `id_object`) VALUES -(1, 1, NULL), -(2, 2, NULL), -(3, 3, NULL), -(4, 4, NULL); +(1, 1, NULL); DROP TABLE IF EXISTS `ps_pagenotfound`; CREATE TABLE `ps_pagenotfound` ( @@ -13756,61 +10243,17 @@ CREATE TABLE `ps_pagenotfound` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES -(1, 1, 1, '/robots.txt', '', '2023-05-08 14:44:32'), -(2, 1, 1, '/robots.txt', '', '2023-05-08 14:44:33'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/customers/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:48:20'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:57:32'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:03'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:18'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:58:45'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:01'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 14:59:11'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:52'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:31:55'), -(12, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:32:24'), -(13, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/payment_methods?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:33:49'), -(14, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:09'), -(15, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-08 16:34:17'), -(16, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:39'), -(17, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:44'), -(18, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:25:53'), -(19, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=8kvKNoRR8zrWFaljFxM8vyqMXp5uLVayut0W-xnrpUE', '2023-05-09 06:26:04'), -(20, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:22'), -(21, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:31'), -(22, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:54:54'), -(23, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=FBFec2BM6y2n7FM8SUlUEcj4uuGSbAnZNlluYTShj_E', '2023-05-15 07:55:04'), -(24, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:20'), -(25, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/8/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:01:27'), -(26, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:46'), -(27, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/9/view?_token=XNo2X-Z6uF5_Y4eQvBKTTxo6gbJA0PESflgIwMVLiW4', '2023-05-15 08:02:51'), -(28, 1, 1, '/robots.txt', '', '2023-05-15 08:12:52'), -(29, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:13:43'), -(30, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:14:11'), -(31, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=1TeDOpdXf_3KK90TVh8l08EoOZb5eaLtz9669VA5A24', '2023-05-15 08:15:10'), -(32, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:38'), -(33, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:22:47'), -(34, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:12'), -(35, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/modules/admin-subscription-faq?_token=6gHRv85NANOVG2T8NKHZNX01t10aYM7d1pCK_aEI_Hs', '2023-05-15 08:23:21'), -(36, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:47'), -(37, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/11/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:25:55'), -(38, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:41'), -(39, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/12/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:26:44'), -(40, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(41, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/13/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:27:28'), -(42, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:14'), -(43, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/14/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:28:18'), -(44, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(45, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/sell/orders/15/view?_token=-4T8sUy-G4i3wSUcSK7doHUndY8Ge_0CvF5pzd8dNB8', '2023-05-15 08:29:55'), -(46, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:30:46'), -(47, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:13'), -(48, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/languages/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:23'), -(49, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:31:27'), -(50, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:18'), -(51, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=nTu0Lk4gwombN6hbt35X3HfjP7LW5F5xTqrGD7bnChk', '2023-05-15 08:42:45'), -(52, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:34:01'), -(53, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/preferences/preferences?_token=DfP9qU5FzUoB3bkGqr42PcRsal3UjPstoaDtc4ln11s', '2023-08-28 09:40:33'), -(54, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/seo-urls/?_token=MQa6djbISf87mQfrA5liTH0pHguHQoUlCnNByQsBVrE', '2023-08-28 09:51:39'), -(55, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'https://demoshop8debug.ngrok.io/admin1/index.php/configure/shop/seo-urls/?_token=MQa6djbISf87mQfrA5liTH0pHguHQoUlCnNByQsBVrE', '2023-08-28 09:52:36'); +(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), +(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -13818,13 +10261,10 @@ CREATE TABLE `ps_page_type` ( `name` varchar(255) NOT NULL, PRIMARY KEY (`id_page_type`), KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_page_type` (`id_page_type`, `name`) VALUES -(2, 'authentication'), -(4, 'cart'), -(1, 'index'), -(3, 'pagenotfound'); +(1, 'index'); DROP TABLE IF EXISTS `ps_page_viewed`; CREATE TABLE `ps_page_viewed` ( @@ -13834,7 +10274,7 @@ CREATE TABLE `ps_page_viewed` ( `id_date_range` int(10) unsigned NOT NULL, `counter` int(10) unsigned NOT NULL, PRIMARY KEY (`id_page`,`id_date_range`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_product`; @@ -13844,17 +10284,17 @@ CREATE TABLE `ps_product` ( `id_manufacturer` int(10) unsigned DEFAULT NULL, `id_category_default` int(10) unsigned DEFAULT NULL, `id_shop_default` int(10) unsigned NOT NULL DEFAULT '1', - `id_tax_rules_group` int(10) unsigned NOT NULL, - `on_sale` tinyint(3) unsigned NOT NULL DEFAULT '0', - `online_only` tinyint(3) unsigned NOT NULL DEFAULT '0', + `id_tax_rules_group` int(11) unsigned NOT NULL, + `on_sale` tinyint(1) unsigned NOT NULL DEFAULT '0', + `online_only` tinyint(1) unsigned NOT NULL DEFAULT '0', `ean13` varchar(13) DEFAULT NULL, `isbn` varchar(32) DEFAULT NULL, `upc` varchar(12) DEFAULT NULL, `mpn` varchar(40) DEFAULT NULL, `ecotax` decimal(17,6) NOT NULL DEFAULT '0.000000', - `quantity` int(11) NOT NULL DEFAULT '0', + `quantity` int(10) NOT NULL DEFAULT '0', `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1', - `low_stock_threshold` int(11) DEFAULT NULL, + `low_stock_threshold` int(10) DEFAULT NULL, `low_stock_alert` tinyint(1) NOT NULL DEFAULT '0', `price` decimal(20,6) NOT NULL DEFAULT '0.000000', `wholesale_price` decimal(20,6) NOT NULL DEFAULT '0.000000', @@ -13870,12 +10310,12 @@ CREATE TABLE `ps_product` ( `depth` decimal(20,6) NOT NULL DEFAULT '0.000000', `weight` decimal(20,6) NOT NULL DEFAULT '0.000000', `out_of_stock` int(10) unsigned NOT NULL DEFAULT '2', - `additional_delivery_times` tinyint(3) unsigned NOT NULL DEFAULT '1', + `additional_delivery_times` tinyint(1) unsigned NOT NULL DEFAULT '1', `quantity_discount` tinyint(1) DEFAULT '0', - `customizable` tinyint(4) NOT NULL DEFAULT '0', + `customizable` tinyint(2) NOT NULL DEFAULT '0', `uploadable_files` tinyint(4) NOT NULL DEFAULT '0', `text_fields` tinyint(4) NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `redirect_type` enum('404','410','301-product','302-product','301-category','302-category') NOT NULL DEFAULT '404', `id_type_redirected` int(10) unsigned NOT NULL DEFAULT '0', `available_for_order` tinyint(1) NOT NULL DEFAULT '1', @@ -13892,8 +10332,8 @@ CREATE TABLE `ps_product` ( `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, `advanced_stock_management` tinyint(1) NOT NULL DEFAULT '0', - `pack_stock_type` int(10) unsigned NOT NULL DEFAULT '3', - `state` int(10) unsigned NOT NULL DEFAULT '1', + `pack_stock_type` int(11) unsigned NOT NULL DEFAULT '3', + `state` int(11) unsigned NOT NULL DEFAULT '1', `product_type` enum('standard','pack','virtual','combinations','') NOT NULL DEFAULT '', PRIMARY KEY (`id_product`), KEY `reference_idx` (`reference`), @@ -13904,35 +10344,35 @@ CREATE TABLE `ps_product` ( KEY `indexed` (`indexed`), KEY `date_add` (`date_add`), KEY `state` (`state`,`date_upd`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product` (`id_product`, `id_supplier`, `id_manufacturer`, `id_category_default`, `id_shop_default`, `id_tax_rules_group`, `on_sale`, `online_only`, `ean13`, `isbn`, `upc`, `mpn`, `ecotax`, `quantity`, `minimal_quantity`, `low_stock_threshold`, `low_stock_alert`, `price`, `wholesale_price`, `unity`, `unit_price`, `unit_price_ratio`, `additional_shipping_cost`, `reference`, `supplier_reference`, `location`, `width`, `height`, `depth`, `weight`, `out_of_stock`, `additional_delivery_times`, `quantity_discount`, `customizable`, `uploadable_files`, `text_fields`, `active`, `redirect_type`, `id_type_redirected`, `available_for_order`, `available_date`, `show_condition`, `condition`, `show_price`, `indexed`, `visibility`, `cache_is_pack`, `cache_has_attachments`, `is_virtual`, `cache_default_attribute`, `date_add`, `date_upd`, `advanced_stock_management`, `pack_stock_type`, `state`, `product_type`) VALUES -(1, 1, 1, 4, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 23.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_1', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 1, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(2, 1, 1, 5, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 35.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_3', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 9, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(3, 1, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_6', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 13, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(4, 1, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_5', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 16, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(5, 1, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_7', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 19, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(6, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_11', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'standard'), -(7, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_12', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'standard'), -(8, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_13', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'standard'), -(9, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_15', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 22, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(10, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_16', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 24, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(11, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_17', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 26, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(12, 2, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_18', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 1, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'virtual'), -(13, 2, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_19', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 1, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'virtual'), -(14, 2, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_20', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 1, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'virtual'), -(15, 2, 0, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 35.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_21', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 1, 0, 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'pack'), -(16, 2, 2, 7, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_8', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 28, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(17, 2, 2, 7, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_9', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 32, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(18, 2, 2, 7, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_10', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 36, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'combinations'), -(19, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 13.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_14', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 1, 0, 1, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 0, 3, 1, 'standard'); +(1, 1, 1, 4, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 23.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_1', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 1, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(2, 1, 1, 5, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 35.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_3', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 9, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(3, 1, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_6', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 13, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(4, 1, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_5', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 16, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(5, 1, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_7', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 19, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(6, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_11', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'standard'), +(7, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_12', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'standard'), +(8, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_13', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'standard'), +(9, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_15', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 22, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(10, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_16', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 24, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(11, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_17', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 26, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(12, 2, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_18', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 1, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'virtual'), +(13, 2, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_19', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 1, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'virtual'), +(14, 2, 2, 9, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_20', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 1, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'virtual'), +(15, 2, 0, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 35.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_21', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 1, 0, 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'pack'), +(16, 2, 2, 7, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_8', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 28, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 0, 3, 1, 'combinations'), +(17, 2, 2, 7, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_9', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 32, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 0, 3, 1, 'combinations'), +(18, 2, 2, 7, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_10', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 36, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 0, 3, 1, 'combinations'), +(19, 2, 1, 8, 1, 1, 0, 0, '', '', '', '', 0.000000, 0, 1, NULL, 0, 13.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 'demo_14', '', '', 0.000000, 0.000000, 0.000000, 0.300000, 2, 1, 0, 1, 0, 1, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, 0, 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 0, 3, 1, 'standard'); DROP TABLE IF EXISTS `ps_product_attachment`; CREATE TABLE `ps_product_attachment` ( `id_product` int(10) unsigned NOT NULL, `id_attachment` int(10) unsigned NOT NULL, PRIMARY KEY (`id_product`,`id_attachment`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_product_attribute`; @@ -13950,9 +10390,9 @@ CREATE TABLE `ps_product_attribute` ( `ecotax` decimal(17,6) NOT NULL DEFAULT '0.000000', `weight` decimal(20,6) NOT NULL DEFAULT '0.000000', `unit_price_impact` decimal(20,6) NOT NULL DEFAULT '0.000000', - `default_on` tinyint(3) unsigned DEFAULT NULL, + `default_on` tinyint(1) unsigned DEFAULT NULL, `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1', - `low_stock_threshold` int(11) DEFAULT NULL, + `low_stock_threshold` int(10) DEFAULT NULL, `low_stock_alert` tinyint(1) NOT NULL DEFAULT '0', `available_date` date DEFAULT NULL, PRIMARY KEY (`id_product_attribute`), @@ -13961,7 +10401,7 @@ CREATE TABLE `ps_product_attribute` ( KEY `reference` (`reference`), KEY `supplier_reference` (`supplier_reference`), KEY `id_product_id_product_attribute` (`id_product_attribute`,`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_attribute` (`id_product_attribute`, `id_product`, `reference`, `supplier_reference`, `ean13`, `isbn`, `upc`, `mpn`, `wholesale_price`, `price`, `ecotax`, `weight`, `unit_price_impact`, `default_on`, `minimal_quantity`, `low_stock_threshold`, `low_stock_alert`, `available_date`) VALUES (1, 1, 'demo_1', '', '', '', '', '', 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), @@ -14010,56 +10450,56 @@ CREATE TABLE `ps_product_attribute_combination` ( `id_product_attribute` int(10) unsigned NOT NULL, PRIMARY KEY (`id_attribute`,`id_product_attribute`), KEY `id_product_attribute` (`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_attribute_combination` (`id_attribute`, `id_product_attribute`) VALUES -(1, 1), -(8, 1), -(1, 2), -(11, 2), -(2, 3), -(8, 3), -(2, 4), -(11, 4), -(3, 5), +(6, 1), +(13, 1), +(6, 2), +(16, 2), +(7, 3), +(13, 3), +(7, 4), +(16, 4), (8, 5), -(3, 6), -(11, 6), -(4, 7), -(8, 7), -(4, 8), -(11, 8), -(1, 9), -(2, 10), -(3, 11), -(4, 12), -(19, 13), -(20, 14), -(21, 15), -(19, 16), -(20, 17), -(21, 18), -(19, 19), -(20, 20), -(21, 21), -(8, 22), -(11, 23), -(8, 24), -(11, 25), -(8, 26), -(11, 27), -(22, 28), -(23, 29), -(24, 30), -(25, 31), -(22, 32), -(23, 33), -(24, 34), -(25, 35), -(22, 36), -(23, 37), -(24, 38), -(25, 39); +(13, 5), +(8, 6), +(16, 6), +(9, 7), +(13, 7), +(9, 8), +(16, 8), +(6, 9), +(7, 10), +(8, 11), +(9, 12), +(24, 13), +(25, 14), +(26, 15), +(24, 16), +(25, 17), +(26, 18), +(24, 19), +(25, 20), +(26, 21), +(13, 22), +(16, 23), +(13, 24), +(16, 25), +(13, 26), +(16, 27), +(27, 28), +(28, 29), +(29, 30), +(30, 31), +(27, 32), +(28, 33), +(29, 34), +(30, 35), +(27, 36), +(28, 37), +(29, 38), +(30, 39); DROP TABLE IF EXISTS `ps_product_attribute_image`; CREATE TABLE `ps_product_attribute_image` ( @@ -14067,7 +10507,7 @@ CREATE TABLE `ps_product_attribute_image` ( `id_image` int(10) unsigned NOT NULL, PRIMARY KEY (`id_product_attribute`,`id_image`), KEY `id_image` (`id_image`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_attribute_image` (`id_product_attribute`, `id_image`) VALUES (2, 1), @@ -14120,94 +10560,55 @@ CREATE TABLE `ps_product_attribute_shop` ( `ecotax` decimal(17,6) NOT NULL DEFAULT '0.000000', `weight` decimal(20,6) NOT NULL DEFAULT '0.000000', `unit_price_impact` decimal(20,6) NOT NULL DEFAULT '0.000000', - `default_on` tinyint(3) unsigned DEFAULT NULL, + `default_on` tinyint(1) unsigned DEFAULT NULL, `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1', - `low_stock_threshold` int(11) DEFAULT NULL, + `low_stock_threshold` int(10) DEFAULT NULL, `low_stock_alert` tinyint(1) NOT NULL DEFAULT '0', `available_date` date DEFAULT NULL, PRIMARY KEY (`id_product_attribute`,`id_shop`), UNIQUE KEY `id_product` (`id_product`,`id_shop`,`default_on`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_attribute_shop` (`id_product`, `id_product_attribute`, `id_shop`, `wholesale_price`, `price`, `ecotax`, `weight`, `unit_price_impact`, `default_on`, `minimal_quantity`, `low_stock_threshold`, `low_stock_alert`, `available_date`) VALUES (1, 1, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(1, 1, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (1, 2, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 2, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (1, 3, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 3, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (1, 4, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 4, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (1, 5, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 5, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (1, 6, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 6, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (1, 7, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 7, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (1, 8, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(1, 8, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (2, 9, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(2, 9, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (2, 10, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(2, 10, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (2, 11, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(2, 11, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (2, 12, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(2, 12, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (3, 13, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(3, 13, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (3, 14, 1, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(3, 14, 2, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (3, 15, 1, 0.000000, 50.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(3, 15, 2, 0.000000, 50.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (4, 16, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(4, 16, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (4, 17, 1, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(4, 17, 2, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (4, 18, 1, 0.000000, 50.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(4, 18, 2, 0.000000, 50.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (5, 19, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(5, 19, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (5, 20, 1, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(5, 20, 2, 0.000000, 20.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (5, 21, 1, 0.000000, 50.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(5, 21, 2, 0.000000, 50.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (9, 22, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(9, 22, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (9, 23, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(9, 23, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (10, 24, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(10, 24, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (10, 25, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(10, 25, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (11, 26, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(11, 26, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (11, 27, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(11, 27, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (16, 28, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(16, 28, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (16, 29, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(16, 29, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (16, 30, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(16, 30, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (16, 31, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(16, 31, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (17, 32, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(17, 32, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (17, 33, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(17, 33, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (17, 34, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(17, 34, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (17, 35, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(17, 35, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (18, 36, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), -(18, 36, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 1, 1, NULL, 0, '0000-00-00'), (18, 37, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(18, 37, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), (18, 38, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(18, 38, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(18, 39, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'), -(18, 39, 2, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'); +(18, 39, 1, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, NULL, 1, NULL, 0, '0000-00-00'); DROP TABLE IF EXISTS `ps_product_carrier`; CREATE TABLE `ps_product_carrier` ( @@ -14215,7 +10616,7 @@ CREATE TABLE `ps_product_carrier` ( `id_carrier_reference` int(10) unsigned NOT NULL, `id_shop` int(10) unsigned NOT NULL, PRIMARY KEY (`id_product`,`id_carrier_reference`,`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_product_comment`; @@ -14260,8 +10661,8 @@ CREATE TABLE `ps_product_comment_criterion_category` ( DROP TABLE IF EXISTS `ps_product_comment_criterion_lang`; CREATE TABLE `ps_product_comment_criterion_lang` ( - `id_product_comment_criterion` int(10) unsigned NOT NULL, - `id_lang` int(10) unsigned NOT NULL, + `id_product_comment_criterion` int(11) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, `name` varchar(64) NOT NULL, PRIMARY KEY (`id_product_comment_criterion`,`id_lang`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -14302,7 +10703,7 @@ DROP TABLE IF EXISTS `ps_product_comment_usefulness`; CREATE TABLE `ps_product_comment_usefulness` ( `id_product_comment` int(10) unsigned NOT NULL, `id_customer` int(10) unsigned NOT NULL, - `usefulness` tinyint(3) unsigned NOT NULL, + `usefulness` tinyint(1) unsigned NOT NULL, PRIMARY KEY (`id_product_comment`,`id_customer`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -14313,7 +10714,7 @@ CREATE TABLE `ps_product_country_tax` ( `id_country` int(11) NOT NULL, `id_tax` int(11) NOT NULL, PRIMARY KEY (`id_product`,`id_country`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_product_download`; @@ -14326,10 +10727,10 @@ CREATE TABLE `ps_product_download` ( `date_expiration` datetime DEFAULT NULL, `nb_days_accessible` int(10) unsigned DEFAULT NULL, `nb_downloadable` int(10) unsigned DEFAULT '1', - `active` tinyint(3) unsigned NOT NULL DEFAULT '1', - `is_shareable` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '1', + `is_shareable` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_product_download`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_product_group_reduction_cache`; @@ -14338,13 +10739,13 @@ CREATE TABLE `ps_product_group_reduction_cache` ( `id_group` int(10) unsigned NOT NULL, `reduction` decimal(5,4) NOT NULL, PRIMARY KEY (`id_product`,`id_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_product_lang`; CREATE TABLE `ps_product_lang` ( `id_product` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, `description` text, `description_short` text, @@ -14360,123 +10761,66 @@ CREATE TABLE `ps_product_lang` ( PRIMARY KEY (`id_product`,`id_shop`,`id_lang`), KEY `id_lang` (`id_lang`), KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_lang` (`id_product`, `id_shop`, `id_lang`, `description`, `description_short`, `link_rewrite`, `meta_description`, `meta_keywords`, `meta_title`, `name`, `available_now`, `available_later`, `delivery_in_stock`, `delivery_out_stock`) VALUES (1, 1, 1, '

Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.

\r\n

', 'hummingbird-printed-t-shirt', '', '', '', 'Hummingbird printed t-shirt', '', '', '', ''), (1, 1, 2, '

Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.

\r\n

', 'hummingbird-printed-t-shirt', '', '', '', 'Hummingbird printed t-shirt', '', '', '', ''), (1, 1, 3, '

Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.

\r\n

', 'hummingbird-printed-t-shirt', '', '', '', 'Hummingbird printed t-shirt', '', '', '', ''), -(1, 2, 1, '

Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.

\r\n

', 'hummingbird-printed-t-shirt', '', '', '', 'Hummingbird printed t-shirt', '', '', '', ''), -(1, 2, 2, '

Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.

\r\n

', 'hummingbird-printed-t-shirt', '', '', '', 'Hummingbird printed t-shirt', '', '', '', ''), -(1, 2, 3, '

Symbol of lightness and delicacy, the hummingbird evokes curiosity and joy. Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, short sleeves. Made of extra long staple pima cotton.

\r\n

', 'hummingbird-printed-t-shirt', '', '', '', 'Hummingbird printed t-shirt', '', '', '', ''), (2, 1, 1, '

Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, long sleeves. 100% cotton, brushed inner side for extra comfort.

', 'brown-bear-printed-sweater', '', '', '', 'Hummingbird printed sweater', '', '', '', ''), (2, 1, 2, '

Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, long sleeves. 100% cotton, brushed inner side for extra comfort.

', 'brown-bear-printed-sweater', '', '', '', 'Hummingbird printed sweater', '', '', '', ''), (2, 1, 3, '

Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, long sleeves. 100% cotton, brushed inner side for extra comfort.

', 'brown-bear-printed-sweater', '', '', '', 'Hummingbird printed sweater', '', '', '', ''), -(2, 2, 1, '

Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, long sleeves. 100% cotton, brushed inner side for extra comfort.

', 'brown-bear-printed-sweater', '', '', '', 'Hummingbird printed sweater', '', '', '', ''), -(2, 2, 2, '

Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, long sleeves. 100% cotton, brushed inner side for extra comfort.

', 'brown-bear-printed-sweater', '', '', '', 'Hummingbird printed sweater', '', '', '', ''), -(2, 2, 3, '

Studio Design\' PolyFaune collection features classic products with colorful patterns, inspired by the traditional japanese origamis. To wear with a chino or jeans. The sublimation textile printing process provides an exceptional color rendering and a color, guaranteed overtime.

', '

Regular fit, round neckline, long sleeves. 100% cotton, brushed inner side for extra comfort.

', 'brown-bear-printed-sweater', '', '', '', 'Hummingbird printed sweater', '', '', '', ''), (3, 1, 1, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt paper and smooth surface.

', 'the-best-is-yet-to-come-framed-poster', '', '', '', 'The best is yet to come\' Framed poster', '', '', '', ''), (3, 1, 2, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt paper and smooth surface.

', 'the-best-is-yet-to-come-framed-poster', '', '', '', 'The best is yet to come\' Framed poster', '', '', '', ''), (3, 1, 3, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt paper and smooth surface.

', 'the-best-is-yet-to-come-framed-poster', '', '', '', 'The best is yet to come\' Framed poster', '', '', '', ''), -(3, 2, 1, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt paper and smooth surface.

', 'the-best-is-yet-to-come-framed-poster', '', '', '', 'The best is yet to come\' Framed poster', '', '', '', ''), -(3, 2, 2, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt paper and smooth surface.

', 'the-best-is-yet-to-come-framed-poster', '', '', '', 'The best is yet to come\' Framed poster', '', '', '', ''), -(3, 2, 3, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt paper and smooth surface.

', 'the-best-is-yet-to-come-framed-poster', '', '', '', 'The best is yet to come\' Framed poster', '', '', '', ''), (4, 1, 1, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt finish and smooth surface.

', 'the-adventure-begins-framed-poster', '', '', '', 'The adventure begins Framed poster', '', '', '', ''), (4, 1, 2, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt finish and smooth surface.

', 'the-adventure-begins-framed-poster', '', '', '', 'The adventure begins Framed poster', '', '', '', ''), (4, 1, 3, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt finish and smooth surface.

', 'the-adventure-begins-framed-poster', '', '', '', 'The adventure begins Framed poster', '', '', '', ''), -(4, 2, 1, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt finish and smooth surface.

', 'the-adventure-begins-framed-poster', '', '', '', 'The adventure begins Framed poster', '', '', '', ''), -(4, 2, 2, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt finish and smooth surface.

', 'the-adventure-begins-framed-poster', '', '', '', 'The adventure begins Framed poster', '', '', '', ''), -(4, 2, 3, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid matt finish and smooth surface.

', 'the-adventure-begins-framed-poster', '', '', '', 'The adventure begins Framed poster', '', '', '', ''), (5, 1, 1, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid paper with matt finish and smooth surface.

', 'today-is-a-good-day-framed-poster', '', '', '', 'Today is a good day Framed poster', '', '', '', ''), (5, 1, 2, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid paper with matt finish and smooth surface.

', 'today-is-a-good-day-framed-poster', '', '', '', 'Today is a good day Framed poster', '', '', '', ''), (5, 1, 3, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid paper with matt finish and smooth surface.

', 'today-is-a-good-day-framed-poster', '', '', '', 'Today is a good day Framed poster', '', '', '', ''), -(5, 2, 1, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid paper with matt finish and smooth surface.

', 'today-is-a-good-day-framed-poster', '', '', '', 'Today is a good day Framed poster', '', '', '', ''), -(5, 2, 2, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid paper with matt finish and smooth surface.

', 'today-is-a-good-day-framed-poster', '', '', '', 'Today is a good day Framed poster', '', '', '', ''), -(5, 2, 3, '

The best is yet to come! Give your walls a voice with a framed poster. This aesthethic, optimistic poster will look great in your desk or in an open-space office. Painted wooden frame with passe-partout for more depth.

', '

Printed on rigid paper with matt finish and smooth surface.

', 'today-is-a-good-day-framed-poster', '', '', '', 'Today is a good day Framed poster', '', '', '', ''), (6, 1, 1, '

The best is yet to come! Start the day off right with a positive thought. 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug, 325ml.

', 'mug-the-best-is-yet-to-come', '', '', '', 'Mug The best is yet to come', '', '', '', ''), (6, 1, 2, '

The best is yet to come! Start the day off right with a positive thought. 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug, 325ml.

', 'mug-the-best-is-yet-to-come', '', '', '', 'Mug The best is yet to come', '', '', '', ''), (6, 1, 3, '

The best is yet to come! Start the day off right with a positive thought. 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug, 325ml.

', 'mug-the-best-is-yet-to-come', '', '', '', 'Mug The best is yet to come', '', '', '', ''), -(6, 2, 1, '

The best is yet to come! Start the day off right with a positive thought. 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug, 325ml.

', 'mug-the-best-is-yet-to-come', '', '', '', 'Mug The best is yet to come', '', '', '', ''), -(6, 2, 2, '

The best is yet to come! Start the day off right with a positive thought. 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug, 325ml.

', 'mug-the-best-is-yet-to-come', '', '', '', 'Mug The best is yet to come', '', '', '', ''), -(6, 2, 3, '

The best is yet to come! Start the day off right with a positive thought. 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug, 325ml.

', 'mug-the-best-is-yet-to-come', '', '', '', 'Mug The best is yet to come', '', '', '', ''), (7, 1, 1, '

The adventure begins with a cup of coffee. Set out to conquer the day! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-the-adventure-begins', '', '', '', 'Mug The adventure begins', '', '', '', ''), (7, 1, 2, '

The adventure begins with a cup of coffee. Set out to conquer the day! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-the-adventure-begins', '', '', '', 'Mug The adventure begins', '', '', '', ''), (7, 1, 3, '

The adventure begins with a cup of coffee. Set out to conquer the day! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-the-adventure-begins', '', '', '', 'Mug The adventure begins', '', '', '', ''), -(7, 2, 1, '

The adventure begins with a cup of coffee. Set out to conquer the day! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-the-adventure-begins', '', '', '', 'Mug The adventure begins', '', '', '', ''), -(7, 2, 2, '

The adventure begins with a cup of coffee. Set out to conquer the day! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-the-adventure-begins', '', '', '', 'Mug The adventure begins', '', '', '', ''), -(7, 2, 3, '

The adventure begins with a cup of coffee. Set out to conquer the day! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-the-adventure-begins', '', '', '', 'Mug The adventure begins', '', '', '', ''), (8, 1, 1, '

Add an optimistic touch to your morning coffee and start the day in a good mood! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-today-is-a-good-day', '', '', '', 'Mug Today is a good day', '', '', '', ''), (8, 1, 2, '

Add an optimistic touch to your morning coffee and start the day in a good mood! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-today-is-a-good-day', '', '', '', 'Mug Today is a good day', '', '', '', ''), (8, 1, 3, '

Add an optimistic touch to your morning coffee and start the day in a good mood! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-today-is-a-good-day', '', '', '', 'Mug Today is a good day', '', '', '', ''), -(8, 2, 1, '

Add an optimistic touch to your morning coffee and start the day in a good mood! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-today-is-a-good-day', '', '', '', 'Mug Today is a good day', '', '', '', ''), -(8, 2, 2, '

Add an optimistic touch to your morning coffee and start the day in a good mood! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-today-is-a-good-day', '', '', '', 'Mug Today is a good day', '', '', '', ''), -(8, 2, 3, '

Add an optimistic touch to your morning coffee and start the day in a good mood! 8,2cm diameter / 9,5cm height / 0.43kg. Dishwasher-proof.

', '

White Ceramic Mug. 325ml

', 'mug-today-is-a-good-day', '', '', '', 'Mug Today is a good day', '', '', '', ''), (9, 1, 1, '

The mountain fox cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'mountain-fox-cushion', '', '', '', 'Mountain fox cushion', '', '', '', ''), (9, 1, 2, '

The mountain fox cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'mountain-fox-cushion', '', '', '', 'Mountain fox cushion', '', '', '', ''), (9, 1, 3, '

The mountain fox cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'mountain-fox-cushion', '', '', '', 'Mountain fox cushion', '', '', '', ''), -(9, 2, 1, '

The mountain fox cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'mountain-fox-cushion', '', '', '', 'Mountain fox cushion', '', '', '', ''), -(9, 2, 2, '

The mountain fox cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'mountain-fox-cushion', '', '', '', 'Mountain fox cushion', '', '', '', ''), -(9, 2, 3, '

The mountain fox cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'mountain-fox-cushion', '', '', '', 'Mountain fox cushion', '', '', '', ''), (10, 1, 1, '

The brown bear cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'brown-bear-cushion', '', '', '', 'Brown bear cushion', '', '', '', ''), (10, 1, 2, '

The brown bear cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'brown-bear-cushion', '', '', '', 'Brown bear cushion', '', '', '', ''), (10, 1, 3, '

The brown bear cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'brown-bear-cushion', '', '', '', 'Brown bear cushion', '', '', '', ''), -(10, 2, 1, '

The brown bear cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'brown-bear-cushion', '', '', '', 'Brown bear cushion', '', '', '', ''), -(10, 2, 2, '

The brown bear cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'brown-bear-cushion', '', '', '', 'Brown bear cushion', '', '', '', ''), -(10, 2, 3, '

The brown bear cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'brown-bear-cushion', '', '', '', 'Brown bear cushion', '', '', '', ''), (11, 1, 1, '

The hummingbird cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'hummingbird-cushion', '', '', '', 'Hummingbird cushion', '', '', '', ''), (11, 1, 2, '

The hummingbird cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'hummingbird-cushion', '', '', '', 'Hummingbird cushion', '', '', '', ''), (11, 1, 3, '

The hummingbird cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'hummingbird-cushion', '', '', '', 'Hummingbird cushion', '', '', '', ''), -(11, 2, 1, '

The hummingbird cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'hummingbird-cushion', '', '', '', 'Hummingbird cushion', '', '', '', ''), -(11, 2, 2, '

The hummingbird cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'hummingbird-cushion', '', '', '', 'Hummingbird cushion', '', '', '', ''), -(11, 2, 3, '

The hummingbird cushion will add a graphic and colorful touch to your sofa, armchair or bed. Create a modern and zen atmosphere that inspires relaxation. Cover 100% cotton, machine washable at 60° / Filling 100% hypoallergenic polyester.

', '

Cushion with removable cover and invisible zip on the back. 32x32cm

', 'hummingbird-cushion', '', '', '', 'Hummingbird cushion', '', '', '', ''), (12, 1, 1, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'mountain-fox-vector-graphics', '', '', '', 'Mountain fox - Vector graphics', '', '', '', ''), (12, 1, 2, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'mountain-fox-vector-graphics', '', '', '', 'Mountain fox - Vector graphics', '', '', '', ''), (12, 1, 3, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'mountain-fox-vector-graphics', '', '', '', 'Mountain fox - Vector graphics', '', '', '', ''), -(12, 2, 1, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'mountain-fox-vector-graphics', '', '', '', 'Mountain fox - Vector graphics', '', '', '', ''), -(12, 2, 2, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'mountain-fox-vector-graphics', '', '', '', 'Mountain fox - Vector graphics', '', '', '', ''), -(12, 2, 3, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'mountain-fox-vector-graphics', '', '', '', 'Mountain fox - Vector graphics', '', '', '', ''), (13, 1, 1, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'brown-bear-vector-graphics', '', '', '', 'Brown bear - Vector graphics', '', '', '', ''), (13, 1, 2, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'brown-bear-vector-graphics', '', '', '', 'Brown bear - Vector graphics', '', '', '', ''), (13, 1, 3, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'brown-bear-vector-graphics', '', '', '', 'Brown bear - Vector graphics', '', '', '', ''), -(13, 2, 1, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'brown-bear-vector-graphics', '', '', '', 'Brown bear - Vector graphics', '', '', '', ''), -(13, 2, 2, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'brown-bear-vector-graphics', '', '', '', 'Brown bear - Vector graphics', '', '', '', ''), -(13, 2, 3, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'brown-bear-vector-graphics', '', '', '', 'Brown bear - Vector graphics', '', '', '', ''), (14, 1, 1, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'hummingbird-vector-graphics', '', '', '', 'Hummingbird - Vector graphics', '', '', '', ''), (14, 1, 2, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'hummingbird-vector-graphics', '', '', '', 'Hummingbird - Vector graphics', '', '', '', ''), (14, 1, 3, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'hummingbird-vector-graphics', '', '', '', 'Hummingbird - Vector graphics', '', '', '', ''), -(14, 2, 1, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'hummingbird-vector-graphics', '', '', '', 'Hummingbird - Vector graphics', '', '', '', ''), -(14, 2, 2, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'hummingbird-vector-graphics', '', '', '', 'Hummingbird - Vector graphics', '', '', '', ''), -(14, 2, 3, '

You have a custom printing creative project? The vector graphic Mountain fox illustration can be used for printing purpose on any support, without size limitation.

', '

Vector graphic, format: svg. Download for personal, private and non-commercial use.

', 'hummingbird-vector-graphics', '', '', '', 'Hummingbird - Vector graphics', '', '', '', ''), (15, 1, 1, '', '

Mug The Adventure Begins + Framed poster Today is a good day 40x60cm

', 'pack-mug-framed-poster', '', '', '', 'Pack Mug + Framed poster', '', '', '', ''), (15, 1, 2, '', '

Mug The Adventure Begins + Framed poster Today is a good day 40x60cm

', 'pack-mug-framed-poster', '', '', '', 'Pack Mug + Framed poster', '', '', '', ''), (15, 1, 3, '', '

Mug The Adventure Begins + Framed poster Today is a good day 40x60cm

', 'pack-mug-framed-poster', '', '', '', 'Pack Mug + Framed poster', '', '', '', ''), -(15, 2, 1, '', '

Mug The Adventure Begins + Framed poster Today is a good day 40x60cm

', 'pack-mug-framed-poster', '', '', '', 'Pack Mug + Framed poster', '', '', '', ''), -(15, 2, 2, '', '

Mug The Adventure Begins + Framed poster Today is a good day 40x60cm

', 'pack-mug-framed-poster', '', '', '', 'Pack Mug + Framed poster', '', '', '', ''), -(15, 2, 3, '', '

Mug The Adventure Begins + Framed poster Today is a good day 40x60cm

', 'pack-mug-framed-poster', '', '', '', 'Pack Mug + Framed poster', '', '', '', ''), (16, 1, 1, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'mountain-fox-notebook', '', '', '', 'Mountain fox notebook', '', '', '', ''), (16, 1, 2, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'mountain-fox-notebook', '', '', '', 'Mountain fox notebook', '', '', '', ''), (16, 1, 3, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'mountain-fox-notebook', '', '', '', 'Mountain fox notebook', '', '', '', ''), -(16, 2, 1, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'mountain-fox-notebook', '', '', '', 'Mountain fox notebook', '', '', '', ''), -(16, 2, 2, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'mountain-fox-notebook', '', '', '', 'Mountain fox notebook', '', '', '', ''), -(16, 2, 3, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'mountain-fox-notebook', '', '', '', 'Mountain fox notebook', '', '', '', ''), (17, 1, 1, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'brown-bear-notebook', '', '', '', 'Brown bear notebook', '', '', '', ''), (17, 1, 2, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'brown-bear-notebook', '', '', '', 'Brown bear notebook', '', '', '', ''), (17, 1, 3, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'brown-bear-notebook', '', '', '', 'Brown bear notebook', '', '', '', ''), -(17, 2, 1, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'brown-bear-notebook', '', '', '', 'Brown bear notebook', '', '', '', ''), -(17, 2, 2, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'brown-bear-notebook', '', '', '', 'Brown bear notebook', '', '', '', ''), -(17, 2, 3, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'brown-bear-notebook', '', '', '', 'Brown bear notebook', '', '', '', ''), (18, 1, 1, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'hummingbird-notebook', '', '', '', 'Hummingbird notebook', '', '', '', ''), (18, 1, 2, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'hummingbird-notebook', '', '', '', 'Hummingbird notebook', '', '', '', ''), (18, 1, 3, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'hummingbird-notebook', '', '', '', 'Hummingbird notebook', '', '', '', ''), -(18, 2, 1, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'hummingbird-notebook', '', '', '', 'Hummingbird notebook', '', '', '', ''), -(18, 2, 2, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'hummingbird-notebook', '', '', '', 'Hummingbird notebook', '', '', '', ''), -(18, 2, 3, '

The Mountain fox notebook is the best option to write down your most ingenious ideas. At work, at home or when traveling, its endearing design and manufacturing quality will make you feel like writing! 90 gsm paper / double spiral binding.

', '

120 sheets notebook with hard cover made of recycled cardboard. 16x22cm

', 'hummingbird-notebook', '', '', '', 'Hummingbird notebook', '', '', '', ''), (19, 1, 1, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''), (19, 1, 2, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''), -(19, 1, 3, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''), -(19, 2, 1, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''), -(19, 2, 2, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''), -(19, 2, 3, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''); +(19, 1, 3, '

Customize your mug with the text of your choice. A mood, a message, a quote... It\'s up to you! Maximum number of characters: ---

', '

White Ceramic Mug. 325ml

', 'customizable-mug', '', '', '', 'Customizable mug', '', '', '', ''); DROP TABLE IF EXISTS `ps_product_sale`; CREATE TABLE `ps_product_sale` ( @@ -14486,22 +10830,20 @@ CREATE TABLE `ps_product_sale` ( `date_upd` date DEFAULT NULL, PRIMARY KEY (`id_product`), KEY `quantity` (`quantity`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; -INSERT INTO `ps_product_sale` (`id_product`, `quantity`, `sale_nbr`, `date_upd`) VALUES -(2, 5, 2, '2023-05-15'); DROP TABLE IF EXISTS `ps_product_shop`; CREATE TABLE `ps_product_shop` ( `id_product` int(10) unsigned NOT NULL, `id_shop` int(10) unsigned NOT NULL, `id_category_default` int(10) unsigned DEFAULT NULL, - `id_tax_rules_group` int(10) unsigned NOT NULL, - `on_sale` tinyint(3) unsigned NOT NULL DEFAULT '0', - `online_only` tinyint(3) unsigned NOT NULL DEFAULT '0', + `id_tax_rules_group` int(11) unsigned NOT NULL, + `on_sale` tinyint(1) unsigned NOT NULL DEFAULT '0', + `online_only` tinyint(1) unsigned NOT NULL DEFAULT '0', `ecotax` decimal(17,6) NOT NULL DEFAULT '0.000000', `minimal_quantity` int(10) unsigned NOT NULL DEFAULT '1', - `low_stock_threshold` int(11) DEFAULT NULL, + `low_stock_threshold` int(10) DEFAULT NULL, `low_stock_alert` tinyint(1) NOT NULL DEFAULT '0', `price` decimal(20,6) NOT NULL DEFAULT '0.000000', `wholesale_price` decimal(20,6) NOT NULL DEFAULT '0.000000', @@ -14509,10 +10851,10 @@ CREATE TABLE `ps_product_shop` ( `unit_price` decimal(20,6) NOT NULL DEFAULT '0.000000', `unit_price_ratio` decimal(20,6) NOT NULL DEFAULT '0.000000', `additional_shipping_cost` decimal(20,6) NOT NULL DEFAULT '0.000000', - `customizable` tinyint(4) NOT NULL DEFAULT '0', + `customizable` tinyint(2) NOT NULL DEFAULT '0', `uploadable_files` tinyint(4) NOT NULL DEFAULT '0', `text_fields` tinyint(4) NOT NULL DEFAULT '0', - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `redirect_type` enum('','404','410','301-product','302-product','301-category','302-category') NOT NULL DEFAULT '', `id_type_redirected` int(10) unsigned NOT NULL DEFAULT '0', `available_for_order` tinyint(1) NOT NULL DEFAULT '1', @@ -14526,66 +10868,47 @@ CREATE TABLE `ps_product_shop` ( `advanced_stock_management` tinyint(1) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, - `pack_stock_type` int(10) unsigned NOT NULL DEFAULT '3', + `pack_stock_type` int(11) unsigned NOT NULL DEFAULT '3', PRIMARY KEY (`id_product`,`id_shop`), KEY `id_category_default` (`id_category_default`), KEY `date_add` (`date_add`,`active`,`visibility`), KEY `indexed` (`indexed`,`active`,`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_shop` (`id_product`, `id_shop`, `id_category_default`, `id_tax_rules_group`, `on_sale`, `online_only`, `ecotax`, `minimal_quantity`, `low_stock_threshold`, `low_stock_alert`, `price`, `wholesale_price`, `unity`, `unit_price`, `unit_price_ratio`, `additional_shipping_cost`, `customizable`, `uploadable_files`, `text_fields`, `active`, `redirect_type`, `id_type_redirected`, `available_for_order`, `available_date`, `show_condition`, `condition`, `show_price`, `indexed`, `visibility`, `cache_default_attribute`, `advanced_stock_management`, `date_add`, `date_upd`, `pack_stock_type`) VALUES -(1, 1, 4, 1, 0, 0, 0.000000, 1, NULL, 0, 23.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 1, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(1, 2, 4, 1, 0, 0, 0.000000, 1, NULL, 0, 23.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 1, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(2, 1, 5, 1, 0, 0, 0.000000, 1, NULL, 0, 35.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 9, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(2, 2, 5, 1, 0, 0, 0.000000, 1, NULL, 0, 35.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 9, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(3, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 13, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(3, 2, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 13, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(4, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 16, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(4, 2, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 16, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(5, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 19, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(5, 2, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 19, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(6, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(6, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(7, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(7, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(8, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(8, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(9, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 22, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(9, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 22, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(10, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 24, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(10, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 24, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(11, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 26, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(11, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 26, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(12, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(12, 2, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(13, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(13, 2, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(14, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(14, 2, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(15, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 35.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(15, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 35.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(16, 1, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 28, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(16, 2, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 28, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(17, 1, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 32, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(17, 2, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 32, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(18, 1, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 36, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(18, 2, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 36, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(19, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 13.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 1, 0, 1, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3), -(19, 2, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 13.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 1, 0, 1, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-05-02 12:18:39', '2023-05-02 12:18:39', 3); +(1, 1, 4, 1, 0, 0, 0.000000, 1, NULL, 0, 23.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 1, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(2, 1, 5, 1, 0, 0, 0.000000, 1, NULL, 0, 35.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 9, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(3, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 13, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(4, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 16, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(5, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 29.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 19, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(6, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(7, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(8, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 11.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '404', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(9, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 22, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(10, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 24, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(11, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 18.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 26, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(12, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(13, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(14, 1, 9, 1, 0, 0, 0.000000, 1, NULL, 0, 9.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(15, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 35.000000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(16, 1, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 28, 0, '2023-08-28 13:28:03', '2023-08-28 13:28:03', 3), +(17, 1, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 32, 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 3), +(18, 1, 7, 1, 0, 0, 0.000000, 1, NULL, 0, 12.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 0, 0, 0, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 36, 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 3), +(19, 1, 8, 1, 0, 0, 0.000000, 1, NULL, 0, 13.900000, 5.490000, '', 0.000000, 0.000000, 0.000000, 1, 0, 1, 1, '301-category', 0, 1, '0000-00-00', 0, 'new', 1, 1, 'both', 0, 0, '2023-08-28 13:28:04', '2023-08-28 13:28:04', 3); DROP TABLE IF EXISTS `ps_product_supplier`; CREATE TABLE `ps_product_supplier` ( - `id_product_supplier` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_product` int(10) unsigned NOT NULL, - `id_product_attribute` int(10) unsigned NOT NULL DEFAULT '0', - `id_supplier` int(10) unsigned NOT NULL, + `id_product_supplier` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_product` int(11) unsigned NOT NULL, + `id_product_attribute` int(11) unsigned NOT NULL DEFAULT '0', + `id_supplier` int(11) unsigned NOT NULL, `product_supplier_reference` varchar(64) DEFAULT NULL, `product_supplier_price_te` decimal(20,6) NOT NULL DEFAULT '0.000000', - `id_currency` int(10) unsigned NOT NULL, + `id_currency` int(11) unsigned NOT NULL, PRIMARY KEY (`id_product_supplier`), UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`,`id_supplier`), KEY `id_supplier` (`id_supplier`,`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_product_supplier` (`id_product_supplier`, `id_product`, `id_product_attribute`, `id_supplier`, `product_supplier_reference`, `product_supplier_price_te`, `id_currency`) VALUES (1, 6, 0, 2, 'demo_11', 5.490000, 1), @@ -14670,14 +10993,14 @@ CREATE TABLE `ps_product_tag` ( PRIMARY KEY (`id_product`,`id_tag`), KEY `id_tag` (`id_tag`), KEY `id_lang` (`id_lang`,`id_tag`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_profile`; CREATE TABLE `ps_profile` ( `id_profile` int(10) unsigned NOT NULL AUTO_INCREMENT, PRIMARY KEY (`id_profile`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_profile` (`id_profile`) VALUES (1), @@ -14691,28 +11014,28 @@ CREATE TABLE `ps_profile_lang` ( `id_profile` int(10) unsigned NOT NULL, `name` varchar(128) NOT NULL, PRIMARY KEY (`id_profile`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_profile_lang` (`id_lang`, `id_profile`, `name`) VALUES (1, 1, 'SuperAdmin'), (2, 1, 'SuperAdmin'), (3, 1, 'SuperAdmin'), (1, 2, 'Logistician'), -(2, 2, 'Logistiker'), -(3, 2, 'Logistiek medewerker'), +(2, 2, 'Logistiek medewerker'), +(3, 2, 'Logistiker'), (1, 3, 'Translator'), -(2, 3, 'Übersetzer'), -(3, 3, 'Vertaler'), +(2, 3, 'Vertaler'), +(3, 3, 'Übersetzer'), (1, 4, 'Salesman'), -(2, 4, 'Verkäufer'), -(3, 4, 'Verkoper'); +(2, 4, 'Verkoper'), +(3, 4, 'Verkäufer'); DROP TABLE IF EXISTS `ps_psgdpr_consent`; CREATE TABLE `ps_psgdpr_consent` ( `id_gdpr_consent` int(10) unsigned NOT NULL AUTO_INCREMENT, `id_module` int(10) unsigned NOT NULL, - `active` int(11) NOT NULL, - `error` int(11) DEFAULT NULL, + `active` int(10) NOT NULL, + `error` int(10) DEFAULT NULL, `error_message` text, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, @@ -14737,7 +11060,7 @@ CREATE TABLE `ps_psgdpr_log` ( `id_guest` int(10) unsigned DEFAULT NULL, `client_name` varchar(250) DEFAULT NULL, `id_module` int(10) unsigned NOT NULL, - `request_type` int(11) NOT NULL, + `request_type` int(10) NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_gdpr_log`), @@ -14746,8 +11069,7 @@ CREATE TABLE `ps_psgdpr_log` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_psgdpr_log` (`id_gdpr_log`, `id_customer`, `id_guest`, `client_name`, `id_module`, `request_type`, `date_add`, `date_upd`) VALUES -(1, 3, 0, 'INVERTUS RRRRRRR', 0, 1, '2023-05-08 17:09:50', '2023-05-08 17:09:50'), -(2, 4, 0, 'TEST TEST TESSST', 0, 1, '2023-08-28 11:54:29', '2023-08-28 11:54:29'); +(1, 3, 0, 'TEST TEST TESSST', 0, 1, '2023-08-28 13:48:29', '2023-08-28 13:48:29'); DROP TABLE IF EXISTS `ps_psreassurance`; CREATE TABLE `ps_psreassurance` ( @@ -14764,9 +11086,9 @@ CREATE TABLE `ps_psreassurance` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_psreassurance` (`id_psreassurance`, `icon`, `custom_icon`, `status`, `position`, `type_link`, `id_cms`, `date_add`, `date_upd`) VALUES -(1, '//modules/blockreassurance/views/img/reassurance/pack2/security.svg', NULL, 1, 1, NULL, NULL, '2023-05-02 10:16:59', NULL), -(2, '//modules/blockreassurance/views/img/reassurance/pack2/carrier.svg', NULL, 1, 2, NULL, NULL, '2023-05-02 10:16:59', NULL), -(3, '//modules/blockreassurance/views/img/reassurance/pack2/parcel.svg', NULL, 1, 3, NULL, NULL, '2023-05-02 10:16:59', NULL); +(1, '//modules/blockreassurance/views/img/reassurance/pack2/security.svg', NULL, 1, 1, NULL, NULL, '2023-08-28 11:26:21', NULL), +(2, '//modules/blockreassurance/views/img/reassurance/pack2/carrier.svg', NULL, 1, 2, NULL, NULL, '2023-08-28 11:26:21', NULL), +(3, '//modules/blockreassurance/views/img/reassurance/pack2/parcel.svg', NULL, 1, 3, NULL, NULL, '2023-08-28 11:26:21', NULL); DROP TABLE IF EXISTS `ps_psreassurance_lang`; CREATE TABLE `ps_psreassurance_lang` ( @@ -14795,7 +11117,7 @@ CREATE TABLE `ps_quick_access` ( `new_window` tinyint(1) NOT NULL DEFAULT '0', `link` varchar(255) NOT NULL, PRIMARY KEY (`id_quick_access`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_quick_access` (`id_quick_access`, `new_window`, `link`) VALUES (1, 0, 'index.php/sell/orders'), @@ -14811,27 +11133,27 @@ CREATE TABLE `ps_quick_access_lang` ( `id_lang` int(10) unsigned NOT NULL, `name` varchar(32) NOT NULL, PRIMARY KEY (`id_quick_access`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_quick_access_lang` (`id_quick_access`, `id_lang`, `name`) VALUES (1, 1, 'Orders'), -(1, 2, 'Bestellungen'), -(1, 3, 'Bestellingen'), +(1, 2, 'Bestellingen'), +(1, 3, 'Bestellungen'), (2, 1, 'New voucher'), -(2, 2, 'Neuer Ermäßigungsgutschein'), -(2, 3, 'Nieuwe voucher'), +(2, 2, 'Nieuwe voucher'), +(2, 3, 'Neuer Ermäßigungsgutschein'), (3, 1, 'New product'), -(3, 2, 'Neuer Artikel'), -(3, 3, 'Nieuw product'), +(3, 2, 'Nieuw product'), +(3, 3, 'Neuer Artikel'), (4, 1, 'New category'), -(4, 2, 'Neue Kategorie'), -(4, 3, 'Nieuwe categorie'), +(4, 2, 'Nieuwe categorie'), +(4, 3, 'Neue Kategorie'), (5, 1, 'Installed modules'), -(5, 2, 'Installierte Module'), -(5, 3, 'Geïnstalleerde modules'), +(5, 2, 'Geïnstalleerde modules'), +(5, 3, 'Installierte Module'), (6, 1, 'Catalog evaluation'), -(6, 2, 'Katalogauswertung'), -(6, 3, 'Winkel evaluatie'); +(6, 2, 'Winkel evaluatie'), +(6, 3, 'Katalogauswertung'); DROP TABLE IF EXISTS `ps_range_price`; CREATE TABLE `ps_range_price` ( @@ -14841,7 +11163,7 @@ CREATE TABLE `ps_range_price` ( `delimiter2` decimal(20,6) NOT NULL, PRIMARY KEY (`id_range_price`), UNIQUE KEY `id_carrier` (`id_carrier`,`delimiter1`,`delimiter2`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_range_price` (`id_range_price`, `id_carrier`, `delimiter1`, `delimiter2`) VALUES (1, 2, 0.000000, 10000.000000), @@ -14857,14 +11179,13 @@ CREATE TABLE `ps_range_weight` ( `delimiter2` decimal(20,6) NOT NULL, PRIMARY KEY (`id_range_weight`), UNIQUE KEY `id_carrier` (`id_carrier`,`delimiter1`,`delimiter2`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_range_weight` (`id_range_weight`, `id_carrier`, `delimiter1`, `delimiter2`) VALUES (1, 2, 0.000000, 10000.000000), (2, 4, 0.000000, 1.000000), (3, 4, 1.000000, 3.000000), -(4, 4, 3.000000, 10000.000000), -(5, 5, 0.000000, 10000.000000); +(4, 4, 3.000000, 10000.000000); DROP TABLE IF EXISTS `ps_request_sql`; CREATE TABLE `ps_request_sql` ( @@ -14872,7 +11193,7 @@ CREATE TABLE `ps_request_sql` ( `name` varchar(200) NOT NULL, `sql` text NOT NULL, PRIMARY KEY (`id_request_sql`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_required_field`; @@ -14882,16 +11203,16 @@ CREATE TABLE `ps_required_field` ( `field_name` varchar(32) NOT NULL, PRIMARY KEY (`id_required_field`), KEY `object_name` (`object_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_risk`; CREATE TABLE `ps_risk` ( - `id_risk` int(10) unsigned NOT NULL AUTO_INCREMENT, - `percent` tinyint(4) NOT NULL, + `id_risk` int(11) unsigned NOT NULL AUTO_INCREMENT, + `percent` tinyint(3) NOT NULL, `color` varchar(32) DEFAULT NULL, PRIMARY KEY (`id_risk`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_risk` (`id_risk`, `percent`, `color`) VALUES (1, 0, '#32CD32'), @@ -14906,21 +11227,21 @@ CREATE TABLE `ps_risk_lang` ( `name` varchar(20) NOT NULL, PRIMARY KEY (`id_risk`,`id_lang`), KEY `id_risk` (`id_risk`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_risk_lang` (`id_risk`, `id_lang`, `name`) VALUES (1, 1, 'None'), -(1, 2, 'Keine'), -(1, 3, 'Geen'), +(1, 2, 'Geen'), +(1, 3, 'Keine'), (2, 1, 'Low'), -(2, 2, 'Niedrig'), -(2, 3, 'Laag'), +(2, 2, 'Laag'), +(2, 3, 'Niedrig'), (3, 1, 'Medium'), -(3, 2, 'Mittel'), -(3, 3, 'Gemiddeld'), +(3, 2, 'Gemiddeld'), +(3, 3, 'Mittel'), (4, 1, 'High'), -(4, 2, 'Hoch'), -(4, 3, 'Hoog'); +(4, 2, 'Hoog'), +(4, 3, 'Hoch'); DROP TABLE IF EXISTS `ps_search_engine`; CREATE TABLE `ps_search_engine` ( @@ -14928,7 +11249,7 @@ CREATE TABLE `ps_search_engine` ( `server` varchar(64) NOT NULL, `getvar` varchar(16) NOT NULL, PRIMARY KEY (`id_search_engine`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_search_engine` (`id_search_engine`, `server`, `getvar`) VALUES (1, 'google', 'q'), @@ -14972,23 +11293,26 @@ INSERT INTO `ps_search_engine` (`id_search_engine`, `server`, `getvar`) VALUES DROP TABLE IF EXISTS `ps_search_index`; CREATE TABLE `ps_search_index` ( - `id_product` int(10) unsigned NOT NULL, - `id_word` int(10) unsigned NOT NULL, - `weight` smallint(5) unsigned NOT NULL DEFAULT '1', + `id_product` int(11) unsigned NOT NULL, + `id_word` int(11) unsigned NOT NULL, + `weight` smallint(4) unsigned NOT NULL DEFAULT '1', PRIMARY KEY (`id_word`,`id_product`), KEY `id_product` (`id_product`,`weight`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (1, 7, 1), (1, 8, 1), (1, 9, 1), (1, 10, 1), +(1, 11, 1), +(1, 12, 1), (1, 13, 1), (1, 14, 1), (1, 15, 1), (1, 16, 1), (1, 17, 1), +(1, 18, 1), (1, 19, 1), (1, 20, 1), (1, 21, 1), @@ -15019,135 +11343,27 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (1, 48, 1), (1, 49, 1), (1, 50, 1), -(1, 662, 1), -(1, 663, 1), -(1, 664, 1), -(1, 665, 1), -(1, 668, 1), -(1, 669, 1), -(1, 670, 1), -(1, 671, 1), -(1, 672, 1), -(1, 674, 1), -(1, 675, 1), -(1, 676, 1), -(1, 677, 1), -(1, 678, 1), -(1, 679, 1), -(1, 682, 1), -(1, 683, 1), -(1, 684, 1), -(1, 685, 1), -(1, 686, 1), -(1, 687, 1), -(1, 688, 1), -(1, 689, 1), -(1, 690, 1), -(1, 691, 1), -(1, 692, 1), -(1, 693, 1), -(1, 694, 1), -(1, 695, 1), -(1, 696, 1), -(1, 697, 1), -(1, 698, 1), -(1, 699, 1), -(1, 700, 1), -(1, 701, 1), -(1, 702, 1), -(1, 703, 1), -(1, 704, 1), -(1, 705, 1), -(1, 715, 1), -(1, 716, 1), -(1, 717, 1), -(1, 718, 1), -(1, 721, 1), -(1, 722, 1), -(1, 723, 1), -(1, 724, 1), -(1, 725, 1), -(1, 726, 1), -(1, 727, 1), -(1, 728, 1), -(1, 729, 1), -(1, 730, 1), -(1, 731, 1), -(1, 732, 1), -(1, 733, 1), -(1, 734, 1), -(1, 737, 1), -(1, 738, 1), -(1, 739, 1), -(1, 740, 1), -(1, 741, 1), -(1, 742, 1), -(1, 743, 1), -(1, 744, 1), -(1, 745, 1), -(1, 746, 1), -(1, 747, 1), -(1, 748, 1), -(1, 749, 1), -(1, 750, 1), -(1, 751, 1), -(1, 752, 1), -(1, 753, 1), -(1, 754, 1), -(1, 755, 1), -(1, 756, 1), -(1, 757, 1), -(1, 758, 1), -(1, 759, 1), -(1, 760, 1), -(1, 761, 1), (1, 52, 2), (1, 53, 2), -(1, 707, 2), -(1, 708, 2), -(1, 763, 2), -(1, 764, 2), -(1, 765, 2), -(1, 11, 3), -(1, 12, 3), -(1, 18, 3), +(1, 54, 2), +(1, 55, 2), +(1, 56, 2), (1, 51, 3), -(1, 666, 3), -(1, 667, 3), -(1, 673, 3), -(1, 706, 3), -(1, 719, 3), -(1, 720, 3), -(1, 762, 3), (1, 25, 4), (1, 26, 4), -(1, 680, 4), -(1, 681, 4), -(1, 735, 4), -(1, 736, 4), (1, 2, 6), (1, 3, 6), (1, 4, 6), (1, 5, 6), -(1, 657, 6), -(1, 658, 6), -(1, 659, 6), -(1, 660, 6), -(1, 710, 6), -(1, 711, 6), -(1, 712, 6), -(1, 713, 6), (1, 1, 7), -(1, 656, 7), -(1, 709, 7), (1, 6, 90), -(1, 661, 90), -(1, 714, 90), (2, 7, 1), (2, 8, 1), (2, 9, 1), (2, 10, 1), +(2, 12, 1), (2, 14, 1), +(2, 15, 1), (2, 27, 1), (2, 28, 1), (2, 29, 1), @@ -15172,117 +11388,21 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (2, 48, 1), (2, 49, 1), (2, 50, 1), -(2, 55, 1), -(2, 56, 1), -(2, 57, 1), (2, 58, 1), (2, 59, 1), -(2, 662, 1), -(2, 663, 1), -(2, 664, 1), -(2, 665, 1), -(2, 669, 1), -(2, 682, 1), -(2, 683, 1), -(2, 684, 1), -(2, 685, 1), -(2, 686, 1), -(2, 687, 1), -(2, 688, 1), -(2, 689, 1), -(2, 690, 1), -(2, 691, 1), -(2, 692, 1), -(2, 693, 1), -(2, 694, 1), -(2, 695, 1), -(2, 696, 1), -(2, 697, 1), -(2, 698, 1), -(2, 699, 1), -(2, 700, 1), -(2, 701, 1), -(2, 702, 1), -(2, 703, 1), -(2, 704, 1), -(2, 705, 1), -(2, 715, 1), -(2, 716, 1), -(2, 717, 1), -(2, 718, 1), -(2, 722, 1), -(2, 726, 1), -(2, 729, 1), -(2, 731, 1), -(2, 737, 1), -(2, 738, 1), -(2, 739, 1), -(2, 740, 1), -(2, 741, 1), -(2, 742, 1), -(2, 743, 1), -(2, 744, 1), -(2, 745, 1), -(2, 746, 1), -(2, 747, 1), -(2, 748, 1), -(2, 749, 1), -(2, 750, 1), -(2, 751, 1), -(2, 752, 1), -(2, 753, 1), -(2, 754, 1), -(2, 755, 1), -(2, 756, 1), -(2, 757, 1), -(2, 758, 1), -(2, 759, 1), -(2, 760, 1), -(2, 761, 1), -(2, 767, 1), -(2, 768, 1), -(2, 769, 1), -(2, 770, 1), -(2, 771, 1), -(2, 811, 1), -(2, 812, 1), -(2, 813, 1), -(2, 814, 1), -(2, 815, 1), -(2, 816, 1), -(2, 765, 2), -(2, 12, 3), -(2, 15, 3), +(2, 60, 1), +(2, 61, 1), +(2, 62, 1), +(2, 54, 2), (2, 18, 3), -(2, 60, 3), -(2, 667, 3), -(2, 670, 3), -(2, 673, 3), -(2, 720, 3), -(2, 723, 3), -(2, 772, 3), -(2, 817, 3), +(2, 63, 3), (2, 25, 4), (2, 26, 4), -(2, 680, 4), -(2, 681, 4), -(2, 735, 4), -(2, 736, 4), (2, 1, 6), (2, 2, 6), -(2, 54, 6), -(2, 656, 6), -(2, 657, 6), -(2, 709, 6), -(2, 710, 6), -(2, 766, 6), -(2, 810, 6), +(2, 57, 6), (2, 6, 50), -(2, 661, 50), -(2, 714, 50), (3, 2, 1), -(3, 103, 1), -(3, 106, 1), (3, 107, 1), (3, 108, 1), (3, 109, 1), @@ -15306,116 +11426,29 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (3, 127, 1), (3, 128, 1), (3, 129, 1), -(3, 657, 1), -(3, 710, 1), -(3, 729, 1), -(3, 742, 1), -(3, 815, 1), -(3, 864, 1), -(3, 867, 1), -(3, 868, 1), -(3, 869, 1), -(3, 870, 1), -(3, 871, 1), -(3, 872, 1), -(3, 873, 1), -(3, 874, 1), -(3, 875, 1), -(3, 876, 1), -(3, 877, 1), -(3, 878, 1), -(3, 879, 1), -(3, 880, 1), -(3, 881, 1), -(3, 882, 1), -(3, 883, 1), -(3, 884, 1), -(3, 885, 1), -(3, 886, 1), -(3, 887, 1), -(3, 888, 1), -(3, 889, 1), -(3, 890, 1), -(3, 904, 1), -(3, 907, 1), -(3, 908, 1), -(3, 909, 1), -(3, 910, 1), -(3, 911, 1), -(3, 912, 1), -(3, 913, 1), -(3, 914, 1), -(3, 915, 1), -(3, 916, 1), -(3, 917, 1), -(3, 918, 1), -(3, 919, 1), -(3, 920, 1), -(3, 921, 1), -(3, 922, 1), -(3, 923, 1), -(3, 924, 1), -(3, 925, 1), -(3, 926, 1), -(3, 927, 1), -(3, 928, 1), -(3, 929, 1), -(3, 930, 1), -(3, 931, 1), -(3, 932, 1), -(3, 933, 1), -(3, 133, 2), -(3, 134, 2), -(3, 135, 2), -(3, 894, 2), -(3, 895, 2), -(3, 896, 2), -(3, 937, 2), -(3, 938, 2), -(3, 939, 2), -(3, 104, 3), -(3, 105, 3), -(3, 130, 3), -(3, 131, 3), -(3, 132, 3), -(3, 865, 3), -(3, 866, 3), -(3, 891, 3), -(3, 892, 3), -(3, 893, 3), -(3, 905, 3), -(3, 906, 3), -(3, 934, 3), -(3, 935, 3), -(3, 936, 3), -(3, 98, 7), -(3, 99, 7), -(3, 100, 7), -(3, 101, 7), +(3, 130, 1), +(3, 131, 1), +(3, 132, 1), +(3, 133, 1), +(3, 137, 2), +(3, 138, 2), +(3, 139, 2), +(3, 140, 2), +(3, 134, 3), +(3, 135, 3), +(3, 136, 3), (3, 102, 7), -(3, 731, 7), -(3, 859, 7), -(3, 860, 7), -(3, 861, 7), -(3, 862, 7), -(3, 863, 7), -(3, 899, 7), -(3, 900, 7), -(3, 901, 7), -(3, 902, 7), -(3, 903, 7), +(3, 103, 7), +(3, 104, 7), +(3, 105, 7), +(3, 106, 7), (3, 6, 40), -(3, 661, 40), -(3, 714, 40), (4, 2, 1), -(4, 98, 1), -(4, 99, 1), -(4, 100, 1), +(4, 102, 1), (4, 103, 1), -(4, 106, 1), +(4, 104, 1), (4, 107, 1), (4, 108, 1), -(4, 109, 1), (4, 110, 1), (4, 111, 1), (4, 112, 1), @@ -15436,119 +11469,27 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (4, 127, 1), (4, 128, 1), (4, 129, 1), -(4, 140, 1), -(4, 657, 1), -(4, 710, 1), -(4, 729, 1), -(4, 742, 1), -(4, 815, 1), -(4, 859, 1), -(4, 860, 1), -(4, 861, 1), -(4, 864, 1), -(4, 867, 1), -(4, 868, 1), -(4, 869, 1), -(4, 870, 1), -(4, 871, 1), -(4, 872, 1), -(4, 873, 1), -(4, 874, 1), -(4, 875, 1), -(4, 876, 1), -(4, 877, 1), -(4, 878, 1), -(4, 879, 1), -(4, 880, 1), -(4, 881, 1), -(4, 882, 1), -(4, 883, 1), -(4, 884, 1), -(4, 885, 1), -(4, 886, 1), -(4, 887, 1), -(4, 888, 1), -(4, 889, 1), -(4, 890, 1), -(4, 899, 1), -(4, 900, 1), -(4, 901, 1), -(4, 904, 1), -(4, 907, 1), -(4, 908, 1), -(4, 909, 1), -(4, 910, 1), -(4, 911, 1), -(4, 912, 1), -(4, 913, 1), -(4, 914, 1), -(4, 915, 1), -(4, 916, 1), -(4, 917, 1), -(4, 918, 1), -(4, 919, 1), -(4, 920, 1), -(4, 921, 1), -(4, 922, 1), -(4, 923, 1), -(4, 924, 1), -(4, 925, 1), -(4, 926, 1), -(4, 927, 1), -(4, 928, 1), -(4, 929, 1), -(4, 930, 1), -(4, 931, 1), -(4, 932, 1), -(4, 933, 1), -(4, 948, 1), -(4, 991, 1), -(4, 105, 2), -(4, 133, 2), -(4, 134, 2), -(4, 135, 2), -(4, 866, 2), -(4, 894, 2), -(4, 895, 2), -(4, 896, 2), -(4, 906, 2), -(4, 937, 2), -(4, 938, 2), -(4, 939, 2), -(4, 104, 3), -(4, 130, 3), -(4, 131, 3), -(4, 132, 3), -(4, 865, 3), -(4, 891, 3), -(4, 892, 3), -(4, 893, 3), -(4, 905, 3), -(4, 934, 3), -(4, 935, 3), -(4, 936, 3), -(4, 138, 6), -(4, 139, 6), -(4, 946, 6), -(4, 947, 6), -(4, 989, 6), -(4, 990, 6), -(4, 101, 7), -(4, 102, 7), -(4, 731, 7), -(4, 862, 7), -(4, 863, 7), -(4, 902, 7), -(4, 903, 7), +(4, 130, 1), +(4, 131, 1), +(4, 132, 1), +(4, 133, 1), +(4, 145, 1), +(4, 137, 2), +(4, 138, 2), +(4, 139, 2), +(4, 140, 2), +(4, 134, 3), +(4, 135, 3), +(4, 136, 3), +(4, 143, 6), +(4, 144, 6), +(4, 105, 7), +(4, 106, 7), (4, 6, 40), -(4, 661, 40), -(4, 714, 40), (5, 2, 1), -(5, 98, 1), -(5, 99, 1), -(5, 100, 1), +(5, 102, 1), (5, 103, 1), -(5, 106, 1), +(5, 104, 1), (5, 107, 1), (5, 108, 1), (5, 109, 1), @@ -15572,123 +11513,27 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (5, 127, 1), (5, 128, 1), (5, 129, 1), -(5, 140, 1), -(5, 657, 1), -(5, 710, 1), -(5, 729, 1), -(5, 731, 1), -(5, 815, 1), -(5, 859, 1), -(5, 860, 1), -(5, 861, 1), -(5, 864, 1), -(5, 867, 1), -(5, 868, 1), -(5, 869, 1), -(5, 870, 1), -(5, 871, 1), -(5, 872, 1), -(5, 873, 1), -(5, 874, 1), -(5, 875, 1), -(5, 876, 1), -(5, 877, 1), -(5, 878, 1), -(5, 879, 1), -(5, 880, 1), -(5, 881, 1), -(5, 882, 1), -(5, 883, 1), -(5, 884, 1), -(5, 885, 1), -(5, 886, 1), -(5, 887, 1), -(5, 888, 1), -(5, 889, 1), -(5, 890, 1), -(5, 899, 1), -(5, 900, 1), -(5, 901, 1), -(5, 904, 1), -(5, 907, 1), -(5, 908, 1), -(5, 909, 1), -(5, 910, 1), -(5, 911, 1), -(5, 912, 1), -(5, 913, 1), -(5, 914, 1), -(5, 915, 1), -(5, 916, 1), -(5, 917, 1), -(5, 918, 1), -(5, 919, 1), -(5, 920, 1), -(5, 921, 1), -(5, 922, 1), -(5, 923, 1), -(5, 924, 1), -(5, 925, 1), -(5, 926, 1), -(5, 927, 1), -(5, 928, 1), -(5, 929, 1), -(5, 930, 1), -(5, 931, 1), -(5, 932, 1), -(5, 933, 1), -(5, 948, 1), -(5, 991, 1), -(5, 133, 2), -(5, 134, 2), -(5, 135, 2), -(5, 742, 2), -(5, 894, 2), -(5, 895, 2), -(5, 896, 2), -(5, 937, 2), -(5, 938, 2), -(5, 939, 2), -(5, 104, 3), -(5, 105, 3), -(5, 130, 3), -(5, 131, 3), -(5, 132, 3), -(5, 865, 3), -(5, 866, 3), -(5, 891, 3), -(5, 892, 3), -(5, 893, 3), -(5, 905, 3), -(5, 906, 3), -(5, 934, 3), -(5, 935, 3), -(5, 936, 3), -(5, 181, 6), -(5, 182, 6), -(5, 183, 6), -(5, 1039, 6), -(5, 1040, 6), -(5, 1041, 6), -(5, 1083, 6), -(5, 1084, 6), -(5, 1085, 6), -(5, 101, 7), -(5, 102, 7), -(5, 862, 7), -(5, 863, 7), -(5, 902, 7), -(5, 903, 7), +(5, 130, 1), +(5, 131, 1), +(5, 132, 1), +(5, 133, 1), +(5, 145, 1), +(5, 137, 2), +(5, 138, 2), +(5, 139, 2), +(5, 140, 2), +(5, 134, 3), +(5, 135, 3), +(5, 136, 3), +(5, 186, 6), +(5, 187, 6), +(5, 188, 6), +(5, 105, 7), +(5, 106, 7), (5, 6, 40), -(5, 661, 40), -(5, 714, 40), (6, 53, 1), -(6, 183, 1), -(6, 227, 1), -(6, 228, 1), -(6, 229, 1), -(6, 230, 1), -(6, 231, 1), +(6, 140, 1), +(6, 188, 1), (6, 232, 1), (6, 233, 1), (6, 234, 1), @@ -15698,252 +11543,85 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (6, 238, 1), (6, 239, 1), (6, 240, 1), -(6, 708, 1), -(6, 742, 1), -(6, 1041, 1), -(6, 1085, 1), -(6, 1136, 1), -(6, 1137, 1), -(6, 1138, 1), -(6, 1139, 1), -(6, 1140, 1), -(6, 1141, 1), -(6, 1142, 1), -(6, 1143, 1), -(6, 1144, 1), -(6, 1145, 1), -(6, 1146, 1), -(6, 1147, 1), -(6, 1148, 1), -(6, 1149, 1), -(6, 1161, 1), -(6, 1163, 1), -(6, 1164, 1), -(6, 1165, 1), -(6, 1166, 1), -(6, 1167, 1), -(6, 1168, 1), -(6, 1169, 1), -(6, 1170, 1), -(6, 1171, 1), -(6, 1172, 1), -(6, 1173, 1), -(6, 1174, 1), -(6, 1175, 1), -(6, 1176, 1), -(6, 1177, 1), +(6, 241, 1), +(6, 242, 1), +(6, 243, 1), +(6, 244, 1), +(6, 245, 1), +(6, 248, 2), (6, 25, 3), (6, 26, 3), -(6, 226, 3), -(6, 241, 3), -(6, 242, 3), -(6, 680, 3), -(6, 681, 3), -(6, 735, 3), -(6, 736, 3), -(6, 1135, 3), -(6, 1150, 3), -(6, 1151, 3), -(6, 1162, 3), -(6, 1178, 3), -(6, 1179, 3), -(6, 98, 7), -(6, 99, 7), -(6, 100, 7), -(6, 225, 7), -(6, 731, 7), -(6, 859, 7), -(6, 860, 7), -(6, 861, 7), -(6, 899, 7), -(6, 900, 7), -(6, 901, 7), -(6, 1134, 7), -(6, 1160, 7), +(6, 246, 3), +(6, 247, 3), +(6, 102, 7), +(6, 103, 7), +(6, 104, 7), +(6, 231, 7), (6, 6, 10), -(6, 661, 10), -(6, 714, 10), (7, 53, 1), -(7, 183, 1), -(7, 227, 1), +(7, 140, 1), +(7, 188, 1), (7, 232, 1), -(7, 233, 1), -(7, 234, 1), -(7, 235, 1), -(7, 236, 1), (7, 237, 1), (7, 238, 1), (7, 239, 1), (7, 240, 1), -(7, 251, 1), -(7, 252, 1), -(7, 253, 1), -(7, 254, 1), -(7, 708, 1), -(7, 742, 1), -(7, 1041, 1), -(7, 1085, 1), -(7, 1136, 1), -(7, 1141, 1), -(7, 1142, 1), -(7, 1143, 1), -(7, 1144, 1), -(7, 1145, 1), -(7, 1146, 1), -(7, 1147, 1), -(7, 1148, 1), -(7, 1149, 1), -(7, 1161, 1), -(7, 1163, 1), -(7, 1169, 1), -(7, 1170, 1), -(7, 1171, 1), -(7, 1172, 1), -(7, 1173, 1), -(7, 1174, 1), -(7, 1175, 1), -(7, 1176, 1), -(7, 1177, 1), -(7, 1189, 1), -(7, 1190, 1), -(7, 1191, 1), -(7, 1192, 1), -(7, 1214, 1), -(7, 1215, 1), -(7, 1216, 1), -(7, 1217, 1), -(7, 1218, 1), +(7, 241, 1), +(7, 242, 1), +(7, 243, 1), +(7, 244, 1), +(7, 245, 1), +(7, 258, 1), +(7, 259, 1), +(7, 260, 1), +(7, 261, 1), +(7, 248, 2), (7, 25, 3), (7, 26, 3), -(7, 226, 3), -(7, 241, 3), -(7, 242, 3), -(7, 680, 3), -(7, 681, 3), -(7, 735, 3), -(7, 736, 3), -(7, 1135, 3), -(7, 1150, 3), -(7, 1151, 3), -(7, 1162, 3), -(7, 1178, 3), -(7, 1179, 3), -(7, 138, 7), -(7, 139, 7), -(7, 225, 7), -(7, 731, 7), -(7, 946, 7), -(7, 947, 7), -(7, 989, 7), -(7, 990, 7), -(7, 1134, 7), -(7, 1160, 7), +(7, 246, 3), +(7, 247, 3), +(7, 143, 7), +(7, 144, 7), +(7, 231, 7), (7, 6, 10), -(7, 661, 10), -(7, 714, 10), (8, 53, 1), -(8, 112, 1), -(8, 227, 1), -(8, 228, 1), +(8, 116, 1), +(8, 140, 1), (8, 232, 1), (8, 233, 1), -(8, 234, 1), -(8, 235, 1), -(8, 236, 1), (8, 237, 1), (8, 238, 1), (8, 239, 1), (8, 240, 1), -(8, 252, 1), -(8, 276, 1), -(8, 277, 1), -(8, 278, 1), -(8, 279, 1), -(8, 708, 1), -(8, 729, 1), -(8, 731, 1), -(8, 873, 1), -(8, 910, 1), -(8, 915, 1), -(8, 1136, 1), -(8, 1137, 1), -(8, 1141, 1), -(8, 1142, 1), -(8, 1143, 1), -(8, 1144, 1), -(8, 1145, 1), -(8, 1146, 1), -(8, 1147, 1), -(8, 1148, 1), -(8, 1149, 1), -(8, 1161, 1), -(8, 1163, 1), -(8, 1164, 1), -(8, 1169, 1), -(8, 1170, 1), -(8, 1171, 1), -(8, 1172, 1), -(8, 1173, 1), -(8, 1174, 1), -(8, 1175, 1), -(8, 1176, 1), -(8, 1177, 1), -(8, 1190, 1), -(8, 1215, 1), -(8, 1242, 1), -(8, 1243, 1), -(8, 1244, 1), -(8, 1245, 1), -(8, 1270, 1), -(8, 1271, 1), -(8, 1272, 1), -(8, 1273, 1), +(8, 241, 1), +(8, 242, 1), +(8, 243, 1), +(8, 244, 1), +(8, 245, 1), +(8, 259, 1), +(8, 284, 1), +(8, 285, 1), +(8, 286, 1), +(8, 287, 1), +(8, 248, 2), (8, 25, 3), (8, 26, 3), -(8, 226, 3), -(8, 241, 3), -(8, 242, 3), -(8, 680, 3), -(8, 681, 3), -(8, 735, 3), -(8, 736, 3), -(8, 1135, 3), -(8, 1150, 3), -(8, 1151, 3), -(8, 1162, 3), -(8, 1178, 3), -(8, 1179, 3), -(8, 181, 6), -(8, 1039, 6), -(8, 1083, 6), -(8, 182, 7), -(8, 183, 7), -(8, 225, 7), -(8, 1040, 7), -(8, 1041, 7), -(8, 1084, 7), -(8, 1085, 7), -(8, 1134, 7), -(8, 1160, 7), +(8, 246, 3), +(8, 247, 3), +(8, 186, 6), +(8, 187, 7), +(8, 188, 7), +(8, 231, 7), (8, 6, 10), -(8, 661, 10), -(8, 714, 10), (9, 18, 1), (9, 32, 1), -(9, 55, 1), -(9, 113, 1), -(9, 131, 1), -(9, 276, 1), -(9, 277, 1), -(9, 309, 1), -(9, 310, 1), -(9, 311, 1), -(9, 312, 1), -(9, 313, 1), -(9, 314, 1), -(9, 315, 1), +(9, 54, 1), +(9, 58, 1), +(9, 117, 1), +(9, 135, 1), +(9, 284, 1), +(9, 285, 1), (9, 316, 1), -(9, 317, 1), (9, 318, 1), (9, 319, 1), (9, 320, 1), @@ -15952,114 +11630,38 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (9, 323, 1), (9, 324, 1), (9, 325, 1), -(9, 673, 1), -(9, 687, 1), -(9, 726, 1), -(9, 742, 1), -(9, 743, 1), -(9, 767, 1), -(9, 811, 1), -(9, 874, 1), -(9, 892, 1), -(9, 910, 1), -(9, 916, 1), -(9, 935, 1), -(9, 1242, 1), -(9, 1243, 1), -(9, 1270, 1), -(9, 1271, 1), -(9, 1306, 1), -(9, 1307, 1), -(9, 1308, 1), -(9, 1309, 1), -(9, 1310, 1), -(9, 1311, 1), -(9, 1312, 1), -(9, 1313, 1), -(9, 1314, 1), -(9, 1315, 1), -(9, 1316, 1), -(9, 1317, 1), -(9, 1318, 1), -(9, 1319, 1), -(9, 1320, 1), -(9, 1321, 1), -(9, 1322, 1), -(9, 1343, 1), -(9, 1344, 1), -(9, 1345, 1), -(9, 1346, 1), -(9, 1347, 1), -(9, 1348, 1), -(9, 1349, 1), -(9, 1350, 1), -(9, 1351, 1), -(9, 1352, 1), -(9, 1353, 1), -(9, 1354, 1), -(9, 1355, 1), -(9, 1356, 1), -(9, 1357, 1), -(9, 1358, 1), -(9, 1359, 1), -(9, 1360, 1), +(9, 326, 1), +(9, 327, 1), +(9, 328, 1), +(9, 329, 1), +(9, 330, 1), +(9, 331, 1), +(9, 332, 1), +(9, 333, 1), +(9, 334, 1), (9, 52, 2), (9, 53, 2), -(9, 707, 2), -(9, 708, 2), -(9, 729, 2), -(9, 731, 2), -(9, 763, 2), -(9, 764, 2), +(9, 108, 2), +(9, 109, 2), +(9, 317, 2), +(9, 335, 2), (9, 25, 3), (9, 26, 3), -(9, 241, 3), -(9, 242, 3), -(9, 307, 3), -(9, 326, 3), -(9, 680, 3), -(9, 681, 3), -(9, 735, 3), -(9, 736, 3), -(9, 1150, 3), -(9, 1151, 3), -(9, 1178, 3), -(9, 1179, 3), -(9, 1304, 3), -(9, 1323, 3), -(9, 1341, 3), -(9, 1361, 3), -(9, 308, 4), -(9, 1305, 4), -(9, 1342, 4), -(9, 304, 7), -(9, 305, 7), -(9, 1301, 7), -(9, 1302, 7), -(9, 1338, 7), -(9, 1339, 7), -(9, 306, 8), -(9, 1303, 8), -(9, 1340, 8), +(9, 246, 3), +(9, 247, 3), +(9, 313, 7), +(9, 314, 7), +(9, 315, 8), (9, 6, 30), -(9, 661, 30), -(9, 714, 30), (10, 18, 1), (10, 32, 1), -(10, 55, 1), -(10, 113, 1), -(10, 131, 1), -(10, 276, 1), -(10, 277, 1), -(10, 309, 1), -(10, 310, 1), -(10, 311, 1), -(10, 312, 1), -(10, 313, 1), -(10, 314, 1), -(10, 315, 1), +(10, 54, 1), +(10, 58, 1), +(10, 117, 1), +(10, 135, 1), +(10, 284, 1), +(10, 285, 1), (10, 316, 1), -(10, 317, 1), (10, 318, 1), (10, 319, 1), (10, 320, 1), @@ -16068,114 +11670,38 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (10, 323, 1), (10, 324, 1), (10, 325, 1), -(10, 673, 1), -(10, 687, 1), -(10, 726, 1), -(10, 742, 1), -(10, 743, 1), -(10, 767, 1), -(10, 811, 1), -(10, 874, 1), -(10, 892, 1), -(10, 910, 1), -(10, 916, 1), -(10, 935, 1), -(10, 1242, 1), -(10, 1243, 1), -(10, 1270, 1), -(10, 1271, 1), -(10, 1306, 1), -(10, 1307, 1), -(10, 1308, 1), -(10, 1309, 1), -(10, 1310, 1), -(10, 1311, 1), -(10, 1312, 1), -(10, 1313, 1), -(10, 1314, 1), -(10, 1315, 1), -(10, 1316, 1), -(10, 1317, 1), -(10, 1318, 1), -(10, 1319, 1), -(10, 1320, 1), -(10, 1321, 1), -(10, 1322, 1), -(10, 1343, 1), -(10, 1344, 1), -(10, 1345, 1), -(10, 1346, 1), -(10, 1347, 1), -(10, 1348, 1), -(10, 1349, 1), -(10, 1350, 1), -(10, 1351, 1), -(10, 1352, 1), -(10, 1353, 1), -(10, 1354, 1), -(10, 1355, 1), -(10, 1356, 1), -(10, 1357, 1), -(10, 1358, 1), -(10, 1359, 1), -(10, 1360, 1), +(10, 326, 1), +(10, 327, 1), +(10, 328, 1), +(10, 329, 1), +(10, 330, 1), +(10, 331, 1), +(10, 332, 1), +(10, 333, 1), +(10, 334, 1), (10, 52, 2), (10, 53, 2), -(10, 707, 2), -(10, 708, 2), -(10, 729, 2), -(10, 731, 2), -(10, 763, 2), -(10, 764, 2), +(10, 108, 2), +(10, 109, 2), +(10, 317, 2), +(10, 335, 2), (10, 25, 3), (10, 26, 3), -(10, 241, 3), -(10, 242, 3), -(10, 307, 3), -(10, 326, 3), -(10, 680, 3), -(10, 681, 3), -(10, 735, 3), -(10, 736, 3), -(10, 1150, 3), -(10, 1151, 3), -(10, 1178, 3), -(10, 1179, 3), -(10, 1304, 3), -(10, 1323, 3), -(10, 1341, 3), -(10, 1361, 3), -(10, 308, 4), -(10, 1305, 4), -(10, 1342, 4), -(10, 341, 7), -(10, 342, 7), -(10, 1380, 7), -(10, 1381, 7), -(10, 1417, 7), -(10, 1418, 7), -(10, 306, 8), -(10, 1303, 8), -(10, 1340, 8), +(10, 246, 3), +(10, 247, 3), +(10, 353, 7), +(10, 354, 7), +(10, 315, 8), (10, 6, 30), -(10, 661, 30), -(10, 714, 30), (11, 18, 1), (11, 32, 1), -(11, 55, 1), -(11, 113, 1), -(11, 131, 1), -(11, 276, 1), -(11, 277, 1), -(11, 309, 1), -(11, 310, 1), -(11, 311, 1), -(11, 312, 1), -(11, 313, 1), -(11, 314, 1), -(11, 315, 1), +(11, 54, 1), +(11, 58, 1), +(11, 117, 1), +(11, 135, 1), +(11, 284, 1), +(11, 285, 1), (11, 316, 1), -(11, 317, 1), (11, 318, 1), (11, 319, 1), (11, 320, 1), @@ -16184,1590 +11710,519 @@ INSERT INTO `ps_search_index` (`id_product`, `id_word`, `weight`) VALUES (11, 323, 1), (11, 324, 1), (11, 325, 1), -(11, 673, 1), -(11, 687, 1), -(11, 726, 1), -(11, 742, 1), -(11, 743, 1), -(11, 767, 1), -(11, 811, 1), -(11, 874, 1), -(11, 892, 1), -(11, 910, 1), -(11, 916, 1), -(11, 935, 1), -(11, 1242, 1), -(11, 1243, 1), -(11, 1270, 1), -(11, 1271, 1), -(11, 1306, 1), -(11, 1307, 1), -(11, 1308, 1), -(11, 1309, 1), -(11, 1310, 1), -(11, 1311, 1), -(11, 1312, 1), -(11, 1313, 1), -(11, 1314, 1), -(11, 1315, 1), -(11, 1316, 1), -(11, 1317, 1), -(11, 1318, 1), -(11, 1319, 1), -(11, 1320, 1), -(11, 1321, 1), -(11, 1322, 1), -(11, 1343, 1), -(11, 1344, 1), -(11, 1345, 1), -(11, 1346, 1), -(11, 1347, 1), -(11, 1348, 1), -(11, 1349, 1), -(11, 1350, 1), -(11, 1351, 1), -(11, 1352, 1), -(11, 1353, 1), -(11, 1354, 1), -(11, 1355, 1), -(11, 1356, 1), -(11, 1357, 1), -(11, 1358, 1), -(11, 1359, 1), -(11, 1360, 1), +(11, 326, 1), +(11, 327, 1), +(11, 328, 1), +(11, 329, 1), +(11, 330, 1), +(11, 331, 1), +(11, 332, 1), +(11, 333, 1), +(11, 334, 1), (11, 52, 2), (11, 53, 2), -(11, 707, 2), -(11, 708, 2), -(11, 729, 2), -(11, 731, 2), -(11, 763, 2), -(11, 764, 2), +(11, 108, 2), +(11, 109, 2), +(11, 317, 2), +(11, 335, 2), (11, 25, 3), (11, 26, 3), -(11, 241, 3), -(11, 242, 3), -(11, 307, 3), -(11, 326, 3), -(11, 680, 3), -(11, 681, 3), -(11, 735, 3), -(11, 736, 3), -(11, 1150, 3), -(11, 1151, 3), -(11, 1178, 3), -(11, 1179, 3), -(11, 1304, 3), -(11, 1323, 3), -(11, 1341, 3), -(11, 1361, 3), -(11, 308, 4), -(11, 1305, 4), -(11, 1342, 4), +(11, 246, 3), +(11, 247, 3), (11, 1, 7), -(11, 656, 7), -(11, 709, 7), -(11, 306, 8), -(11, 1303, 8), -(11, 1340, 8), +(11, 315, 8), (11, 6, 30), -(11, 661, 30), -(11, 714, 30), (12, 43, 1), -(12, 416, 1), -(12, 417, 1), -(12, 418, 1), -(12, 419, 1), -(12, 420, 1), -(12, 421, 1), -(12, 422, 1), -(12, 423, 1), -(12, 424, 1), -(12, 425, 1), -(12, 426, 1), -(12, 427, 1), -(12, 428, 1), -(12, 429, 1), -(12, 430, 1), -(12, 431, 1), -(12, 432, 1), -(12, 433, 1), (12, 434, 1), (12, 435, 1), -(12, 698, 1), -(12, 729, 1), -(12, 731, 1), -(12, 754, 1), -(12, 1538, 1), -(12, 1539, 1), -(12, 1540, 1), -(12, 1541, 1), -(12, 1542, 1), -(12, 1543, 1), -(12, 1544, 1), -(12, 1545, 1), -(12, 1546, 1), -(12, 1547, 1), -(12, 1548, 1), -(12, 1549, 1), -(12, 1550, 1), -(12, 1551, 1), -(12, 1552, 1), -(12, 1553, 1), -(12, 1554, 1), -(12, 1555, 1), -(12, 1556, 1), -(12, 1557, 1), -(12, 1567, 1), -(12, 1568, 1), -(12, 1569, 1), -(12, 1570, 1), -(12, 1571, 1), -(12, 1572, 1), -(12, 1573, 1), -(12, 1574, 1), -(12, 1575, 1), -(12, 1576, 1), -(12, 1577, 1), -(12, 1578, 1), -(12, 1579, 1), -(12, 1580, 1), -(12, 1581, 1), -(12, 1582, 1), -(12, 1583, 1), -(12, 1584, 1), -(12, 1585, 1), -(12, 1586, 1), -(12, 1587, 1), -(12, 1588, 1), -(12, 1589, 1), -(12, 1590, 1), -(12, 815, 2), -(12, 130, 3), -(12, 132, 3), -(12, 891, 3), -(12, 893, 3), -(12, 934, 3), -(12, 936, 3), -(12, 131, 5), -(12, 892, 5), -(12, 935, 5), -(12, 415, 6), -(12, 1537, 6), -(12, 1566, 6), -(12, 304, 7), -(12, 305, 7), -(12, 1301, 7), -(12, 1302, 7), -(12, 1338, 7), -(12, 1339, 7), -(12, 414, 8), -(12, 1536, 8), -(12, 1565, 8), +(12, 436, 1), +(12, 437, 1), +(12, 438, 1), +(12, 439, 1), +(12, 440, 1), +(12, 441, 1), +(12, 442, 1), +(12, 443, 1), +(12, 444, 1), +(12, 445, 1), +(12, 446, 1), +(12, 447, 1), +(12, 448, 1), +(12, 449, 1), +(12, 450, 1), +(12, 451, 1), +(12, 452, 1), +(12, 453, 1), +(12, 134, 3), +(12, 136, 3), +(12, 135, 5), +(12, 433, 6), +(12, 313, 7), +(12, 314, 7), +(12, 432, 8), (12, 6, 10), -(12, 661, 10), -(12, 714, 10), (13, 43, 1), -(13, 304, 1), -(13, 305, 1), -(13, 416, 1), -(13, 417, 1), -(13, 418, 1), -(13, 419, 1), -(13, 420, 1), -(13, 421, 1), -(13, 422, 1), -(13, 423, 1), -(13, 424, 1), -(13, 425, 1), -(13, 426, 1), -(13, 427, 1), -(13, 428, 1), -(13, 429, 1), -(13, 430, 1), -(13, 431, 1), -(13, 432, 1), -(13, 433, 1), +(13, 313, 1), +(13, 314, 1), (13, 434, 1), (13, 435, 1), -(13, 698, 1), -(13, 729, 1), -(13, 731, 1), -(13, 754, 1), -(13, 1301, 1), -(13, 1302, 1), -(13, 1338, 1), -(13, 1339, 1), -(13, 1538, 1), -(13, 1539, 1), -(13, 1540, 1), -(13, 1541, 1), -(13, 1542, 1), -(13, 1543, 1), -(13, 1544, 1), -(13, 1545, 1), -(13, 1546, 1), -(13, 1547, 1), -(13, 1548, 1), -(13, 1549, 1), -(13, 1550, 1), -(13, 1551, 1), -(13, 1552, 1), -(13, 1553, 1), -(13, 1554, 1), -(13, 1555, 1), -(13, 1556, 1), -(13, 1557, 1), -(13, 1567, 1), -(13, 1568, 1), -(13, 1569, 1), -(13, 1570, 1), -(13, 1571, 1), -(13, 1572, 1), -(13, 1573, 1), -(13, 1574, 1), -(13, 1575, 1), -(13, 1576, 1), -(13, 1577, 1), -(13, 1578, 1), -(13, 1579, 1), -(13, 1580, 1), -(13, 1581, 1), -(13, 1582, 1), -(13, 1583, 1), -(13, 1584, 1), -(13, 1585, 1), -(13, 1586, 1), -(13, 1587, 1), -(13, 1588, 1), -(13, 1589, 1), -(13, 1590, 1), -(13, 815, 2), -(13, 130, 3), -(13, 132, 3), -(13, 891, 3), -(13, 893, 3), -(13, 934, 3), -(13, 936, 3), -(13, 131, 5), -(13, 892, 5), -(13, 935, 5), -(13, 341, 6), -(13, 342, 6), -(13, 415, 6), -(13, 1380, 6), -(13, 1381, 6), -(13, 1417, 6), -(13, 1418, 6), -(13, 1537, 6), -(13, 1566, 6), -(13, 414, 8), -(13, 1536, 8), -(13, 1565, 8), +(13, 436, 1), +(13, 437, 1), +(13, 438, 1), +(13, 439, 1), +(13, 440, 1), +(13, 441, 1), +(13, 442, 1), +(13, 443, 1), +(13, 444, 1), +(13, 445, 1), +(13, 446, 1), +(13, 447, 1), +(13, 448, 1), +(13, 449, 1), +(13, 450, 1), +(13, 451, 1), +(13, 452, 1), +(13, 453, 1), +(13, 134, 3), +(13, 136, 3), +(13, 135, 5), +(13, 353, 6), +(13, 354, 6), +(13, 433, 6), +(13, 432, 8), (13, 6, 10), -(13, 661, 10), -(13, 714, 10), (14, 43, 1), -(14, 304, 1), -(14, 305, 1), -(14, 416, 1), -(14, 417, 1), -(14, 418, 1), -(14, 419, 1), -(14, 420, 1), -(14, 421, 1), -(14, 422, 1), -(14, 423, 1), -(14, 424, 1), -(14, 425, 1), -(14, 426, 1), -(14, 427, 1), -(14, 428, 1), -(14, 429, 1), -(14, 430, 1), -(14, 431, 1), -(14, 432, 1), -(14, 433, 1), +(14, 313, 1), +(14, 314, 1), (14, 434, 1), (14, 435, 1), -(14, 698, 1), -(14, 729, 1), -(14, 731, 1), -(14, 754, 1), -(14, 1301, 1), -(14, 1302, 1), -(14, 1338, 1), -(14, 1339, 1), -(14, 1538, 1), -(14, 1539, 1), -(14, 1540, 1), -(14, 1541, 1), -(14, 1542, 1), -(14, 1543, 1), -(14, 1544, 1), -(14, 1545, 1), -(14, 1546, 1), -(14, 1547, 1), -(14, 1548, 1), -(14, 1549, 1), -(14, 1550, 1), -(14, 1551, 1), -(14, 1552, 1), -(14, 1553, 1), -(14, 1554, 1), -(14, 1555, 1), -(14, 1556, 1), -(14, 1557, 1), -(14, 1567, 1), -(14, 1568, 1), -(14, 1569, 1), -(14, 1570, 1), -(14, 1571, 1), -(14, 1572, 1), -(14, 1573, 1), -(14, 1574, 1), -(14, 1575, 1), -(14, 1576, 1), -(14, 1577, 1), -(14, 1578, 1), -(14, 1579, 1), -(14, 1580, 1), -(14, 1581, 1), -(14, 1582, 1), -(14, 1583, 1), -(14, 1584, 1), -(14, 1585, 1), -(14, 1586, 1), -(14, 1587, 1), -(14, 1588, 1), -(14, 1589, 1), -(14, 1590, 1), -(14, 815, 2), -(14, 130, 3), -(14, 132, 3), -(14, 891, 3), -(14, 893, 3), -(14, 934, 3), -(14, 936, 3), -(14, 131, 5), -(14, 892, 5), -(14, 935, 5), +(14, 436, 1), +(14, 437, 1), +(14, 438, 1), +(14, 439, 1), +(14, 440, 1), +(14, 441, 1), +(14, 442, 1), +(14, 443, 1), +(14, 444, 1), +(14, 445, 1), +(14, 446, 1), +(14, 447, 1), +(14, 448, 1), +(14, 449, 1), +(14, 450, 1), +(14, 451, 1), +(14, 452, 1), +(14, 453, 1), +(14, 134, 3), +(14, 136, 3), +(14, 135, 5), (14, 1, 6), -(14, 415, 6), -(14, 656, 6), -(14, 709, 6), -(14, 1537, 6), -(14, 1566, 6), -(14, 414, 8), -(14, 1536, 8), -(14, 1565, 8), +(14, 433, 6), +(14, 432, 8), (14, 6, 10), -(14, 661, 10), -(14, 714, 10), -(15, 133, 1), -(15, 138, 1), -(15, 139, 1), -(15, 181, 1), -(15, 182, 1), -(15, 183, 1), -(15, 731, 1), -(15, 894, 1), -(15, 937, 1), -(15, 946, 1), -(15, 947, 1), -(15, 989, 1), -(15, 990, 1), -(15, 1039, 1), -(15, 1040, 1), -(15, 1041, 1), -(15, 1083, 1), -(15, 1084, 1), -(15, 1085, 1), -(15, 241, 3), -(15, 242, 3), -(15, 1150, 3), -(15, 1151, 3), -(15, 1178, 3), -(15, 1179, 3), -(15, 504, 6), -(15, 1737, 6), -(15, 1750, 6), -(15, 101, 7), -(15, 102, 7), -(15, 225, 7), -(15, 862, 7), -(15, 863, 7), -(15, 902, 7), -(15, 903, 7), -(15, 1134, 7), -(15, 1160, 7), +(15, 137, 1), +(15, 143, 1), +(15, 144, 1), +(15, 186, 1), +(15, 187, 1), +(15, 188, 1), +(15, 246, 3), +(15, 247, 3), +(15, 522, 6), +(15, 105, 7), +(15, 106, 7), +(15, 231, 7), (15, 6, 10), -(15, 661, 10), -(15, 714, 10), (16, 13, 1), (16, 26, 1), -(16, 98, 1), -(16, 105, 1), -(16, 113, 1), -(16, 241, 1), -(16, 308, 1), -(16, 519, 1), -(16, 520, 1), -(16, 523, 1), -(16, 524, 1), -(16, 525, 1), -(16, 526, 1), -(16, 527, 1), -(16, 528, 1), -(16, 529, 1), -(16, 530, 1), -(16, 531, 1), -(16, 532, 1), -(16, 533, 1), -(16, 534, 1), -(16, 535, 1), +(16, 55, 1), +(16, 56, 1), +(16, 102, 1), +(16, 109, 1), +(16, 117, 1), +(16, 246, 1), +(16, 317, 1), (16, 536, 1), (16, 537, 1), (16, 538, 1), (16, 539, 1), (16, 540, 1), -(16, 668, 1), -(16, 681, 1), -(16, 721, 1), -(16, 729, 1), -(16, 731, 1), -(16, 736, 1), -(16, 742, 1), -(16, 859, 1), -(16, 866, 1), -(16, 874, 1), -(16, 899, 1), -(16, 906, 1), -(16, 910, 1), -(16, 916, 1), -(16, 1150, 1), -(16, 1178, 1), -(16, 1305, 1), -(16, 1342, 1), -(16, 1577, 1), -(16, 1766, 1), -(16, 1767, 1), -(16, 1770, 1), -(16, 1771, 1), -(16, 1772, 1), -(16, 1773, 1), -(16, 1774, 1), -(16, 1775, 1), -(16, 1776, 1), -(16, 1777, 1), -(16, 1778, 1), -(16, 1779, 1), -(16, 1780, 1), -(16, 1781, 1), -(16, 1782, 1), -(16, 1783, 1), -(16, 1784, 1), -(16, 1785, 1), -(16, 1786, 1), -(16, 1787, 1), -(16, 1808, 1), -(16, 1809, 1), -(16, 1812, 1), -(16, 1813, 1), -(16, 1814, 1), -(16, 1815, 1), -(16, 1816, 1), -(16, 1817, 1), -(16, 1818, 1), -(16, 1819, 1), -(16, 1820, 1), -(16, 1821, 1), -(16, 1822, 1), -(16, 1823, 1), -(16, 1824, 1), -(16, 1825, 1), -(16, 1826, 1), -(16, 1827, 1), -(16, 1828, 1), -(16, 1829, 1), -(16, 1830, 1), -(16, 1831, 1), -(16, 1832, 1), -(16, 1833, 1), -(16, 542, 2), -(16, 543, 2), -(16, 544, 2), -(16, 545, 2), -(16, 546, 2), -(16, 1789, 2), -(16, 1790, 2), -(16, 1791, 2), -(16, 1792, 2), -(16, 1793, 2), -(16, 1835, 2), -(16, 1836, 2), -(16, 1837, 2), -(16, 1838, 2), -(16, 1839, 2), -(16, 131, 3), -(16, 132, 3), -(16, 518, 3), -(16, 521, 3), -(16, 522, 3), -(16, 541, 3), -(16, 892, 3), -(16, 893, 3), -(16, 935, 3), -(16, 936, 3), -(16, 1765, 3), -(16, 1768, 3), -(16, 1769, 3), -(16, 1788, 3), -(16, 1807, 3), -(16, 1810, 3), -(16, 1811, 3), -(16, 1834, 3), -(16, 304, 7), -(16, 305, 7), -(16, 1301, 7), -(16, 1302, 7), -(16, 1338, 7), -(16, 1339, 7), -(16, 517, 8), -(16, 1764, 8), -(16, 1806, 8), +(16, 541, 1), +(16, 542, 1), +(16, 543, 1), +(16, 544, 1), +(16, 545, 1), +(16, 546, 1), +(16, 547, 1), +(16, 548, 1), +(16, 549, 1), +(16, 550, 1), +(16, 551, 1), +(16, 552, 1), +(16, 553, 1), +(16, 554, 1), +(16, 555, 1), +(16, 556, 1), +(16, 12, 2), +(16, 15, 2), +(16, 558, 2), +(16, 559, 2), +(16, 560, 2), +(16, 561, 2), +(16, 562, 2), +(16, 135, 3), +(16, 136, 3), +(16, 557, 3), +(16, 313, 7), +(16, 314, 7), +(16, 535, 8), (16, 6, 50), -(16, 661, 50), -(16, 714, 50), (17, 13, 1), (17, 26, 1), -(17, 98, 1), -(17, 105, 1), -(17, 113, 1), -(17, 241, 1), -(17, 304, 1), -(17, 305, 1), -(17, 308, 1), -(17, 519, 1), -(17, 520, 1), -(17, 523, 1), -(17, 524, 1), -(17, 525, 1), -(17, 526, 1), -(17, 527, 1), -(17, 528, 1), -(17, 529, 1), -(17, 530, 1), -(17, 531, 1), -(17, 532, 1), -(17, 533, 1), -(17, 534, 1), -(17, 535, 1), +(17, 55, 1), +(17, 56, 1), +(17, 102, 1), +(17, 109, 1), +(17, 117, 1), +(17, 246, 1), +(17, 313, 1), +(17, 314, 1), +(17, 317, 1), (17, 536, 1), (17, 537, 1), (17, 538, 1), (17, 539, 1), (17, 540, 1), -(17, 668, 1), -(17, 681, 1), -(17, 721, 1), -(17, 729, 1), -(17, 731, 1), -(17, 736, 1), -(17, 742, 1), -(17, 859, 1), -(17, 866, 1), -(17, 874, 1), -(17, 899, 1), -(17, 906, 1), -(17, 910, 1), -(17, 916, 1), -(17, 1150, 1), -(17, 1178, 1), -(17, 1301, 1), -(17, 1302, 1), -(17, 1305, 1), -(17, 1338, 1), -(17, 1339, 1), -(17, 1342, 1), -(17, 1577, 1), -(17, 1766, 1), -(17, 1767, 1), -(17, 1770, 1), -(17, 1771, 1), -(17, 1772, 1), -(17, 1773, 1), -(17, 1774, 1), -(17, 1775, 1), -(17, 1776, 1), -(17, 1777, 1), -(17, 1778, 1), -(17, 1779, 1), -(17, 1780, 1), -(17, 1781, 1), -(17, 1782, 1), -(17, 1783, 1), -(17, 1784, 1), -(17, 1785, 1), -(17, 1786, 1), -(17, 1787, 1), -(17, 1808, 1), -(17, 1809, 1), -(17, 1812, 1), -(17, 1813, 1), -(17, 1814, 1), -(17, 1815, 1), -(17, 1816, 1), -(17, 1817, 1), -(17, 1818, 1), -(17, 1819, 1), -(17, 1820, 1), -(17, 1821, 1), -(17, 1822, 1), -(17, 1823, 1), -(17, 1824, 1), -(17, 1825, 1), -(17, 1826, 1), -(17, 1827, 1), -(17, 1828, 1), -(17, 1829, 1), -(17, 1830, 1), -(17, 1831, 1), -(17, 1832, 1), -(17, 1833, 1), -(17, 542, 2), -(17, 543, 2), -(17, 544, 2), -(17, 545, 2), -(17, 546, 2), -(17, 1789, 2), -(17, 1790, 2), -(17, 1791, 2), -(17, 1792, 2), -(17, 1793, 2), -(17, 1835, 2), -(17, 1836, 2), -(17, 1837, 2), -(17, 1838, 2), -(17, 1839, 2), -(17, 131, 3), -(17, 132, 3), -(17, 518, 3), -(17, 521, 3), -(17, 522, 3), -(17, 541, 3), -(17, 892, 3), -(17, 893, 3), -(17, 935, 3), -(17, 936, 3), -(17, 1765, 3), -(17, 1768, 3), -(17, 1769, 3), -(17, 1788, 3), -(17, 1807, 3), -(17, 1810, 3), -(17, 1811, 3), -(17, 1834, 3), -(17, 341, 6), -(17, 342, 6), -(17, 1380, 6), -(17, 1381, 6), -(17, 1417, 6), -(17, 1418, 6), -(17, 517, 8), -(17, 1764, 8), -(17, 1806, 8), +(17, 541, 1), +(17, 542, 1), +(17, 543, 1), +(17, 544, 1), +(17, 545, 1), +(17, 546, 1), +(17, 547, 1), +(17, 548, 1), +(17, 549, 1), +(17, 550, 1), +(17, 551, 1), +(17, 552, 1), +(17, 553, 1), +(17, 554, 1), +(17, 555, 1), +(17, 556, 1), +(17, 12, 2), +(17, 15, 2), +(17, 558, 2), +(17, 559, 2), +(17, 560, 2), +(17, 561, 2), +(17, 562, 2), +(17, 135, 3), +(17, 136, 3), +(17, 557, 3), +(17, 353, 6), +(17, 354, 6), +(17, 535, 8), (17, 6, 50), -(17, 661, 50), -(17, 714, 50), (18, 13, 1), (18, 26, 1), -(18, 98, 1), -(18, 105, 1), -(18, 113, 1), -(18, 241, 1), -(18, 304, 1), -(18, 305, 1), -(18, 308, 1), -(18, 519, 1), -(18, 520, 1), -(18, 523, 1), -(18, 524, 1), -(18, 525, 1), -(18, 526, 1), -(18, 527, 1), -(18, 528, 1), -(18, 529, 1), -(18, 530, 1), -(18, 531, 1), -(18, 532, 1), -(18, 533, 1), -(18, 534, 1), -(18, 535, 1), +(18, 55, 1), +(18, 56, 1), +(18, 102, 1), +(18, 109, 1), +(18, 117, 1), +(18, 246, 1), +(18, 313, 1), +(18, 314, 1), +(18, 317, 1), (18, 536, 1), (18, 537, 1), (18, 538, 1), (18, 539, 1), (18, 540, 1), -(18, 668, 1), -(18, 681, 1), -(18, 721, 1), -(18, 729, 1), -(18, 731, 1), -(18, 736, 1), -(18, 742, 1), -(18, 859, 1), -(18, 866, 1), -(18, 874, 1), -(18, 899, 1), -(18, 906, 1), -(18, 910, 1), -(18, 916, 1), -(18, 1150, 1), -(18, 1178, 1), -(18, 1301, 1), -(18, 1302, 1), -(18, 1305, 1), -(18, 1338, 1), -(18, 1339, 1), -(18, 1342, 1), -(18, 1577, 1), -(18, 1766, 1), -(18, 1767, 1), -(18, 1770, 1), -(18, 1771, 1), -(18, 1772, 1), -(18, 1773, 1), -(18, 1774, 1), -(18, 1775, 1), -(18, 1776, 1), -(18, 1777, 1), -(18, 1778, 1), -(18, 1779, 1), -(18, 1780, 1), -(18, 1781, 1), -(18, 1782, 1), -(18, 1783, 1), -(18, 1784, 1), -(18, 1785, 1), -(18, 1786, 1), -(18, 1787, 1), -(18, 1808, 1), -(18, 1809, 1), -(18, 1812, 1), -(18, 1813, 1), -(18, 1814, 1), -(18, 1815, 1), -(18, 1816, 1), -(18, 1817, 1), -(18, 1818, 1), -(18, 1819, 1), -(18, 1820, 1), -(18, 1821, 1), -(18, 1822, 1), -(18, 1823, 1), -(18, 1824, 1), -(18, 1825, 1), -(18, 1826, 1), -(18, 1827, 1), -(18, 1828, 1), -(18, 1829, 1), -(18, 1830, 1), -(18, 1831, 1), -(18, 1832, 1), -(18, 1833, 1), -(18, 542, 2), -(18, 543, 2), -(18, 544, 2), -(18, 545, 2), -(18, 546, 2), -(18, 1789, 2), -(18, 1790, 2), -(18, 1791, 2), -(18, 1792, 2), -(18, 1793, 2), -(18, 1835, 2), -(18, 1836, 2), -(18, 1837, 2), -(18, 1838, 2), -(18, 1839, 2), -(18, 131, 3), -(18, 132, 3), -(18, 518, 3), -(18, 521, 3), -(18, 522, 3), -(18, 541, 3), -(18, 892, 3), -(18, 893, 3), -(18, 935, 3), -(18, 936, 3), -(18, 1765, 3), -(18, 1768, 3), -(18, 1769, 3), -(18, 1788, 3), -(18, 1807, 3), -(18, 1810, 3), -(18, 1811, 3), -(18, 1834, 3), +(18, 541, 1), +(18, 542, 1), +(18, 543, 1), +(18, 544, 1), +(18, 545, 1), +(18, 546, 1), +(18, 547, 1), +(18, 548, 1), +(18, 549, 1), +(18, 550, 1), +(18, 551, 1), +(18, 552, 1), +(18, 553, 1), +(18, 554, 1), +(18, 555, 1), +(18, 556, 1), +(18, 12, 2), +(18, 15, 2), +(18, 558, 2), +(18, 559, 2), +(18, 560, 2), +(18, 561, 2), +(18, 562, 2), +(18, 135, 3), +(18, 136, 3), +(18, 557, 3), (18, 1, 6), -(18, 656, 6), -(18, 709, 6), -(18, 517, 8), -(18, 1764, 8), -(18, 1806, 8), +(18, 535, 8), (18, 6, 50), -(18, 661, 50), -(18, 714, 50), (19, 53, 1), -(19, 227, 1), -(19, 279, 1), -(19, 647, 1), -(19, 648, 1), -(19, 649, 1), -(19, 650, 1), -(19, 651, 1), -(19, 652, 1), -(19, 653, 1), -(19, 654, 1), -(19, 655, 1), -(19, 708, 1), -(19, 731, 1), -(19, 742, 1), -(19, 910, 1), -(19, 1136, 1), -(19, 1161, 1), -(19, 1163, 1), -(19, 1245, 1), -(19, 1273, 1), -(19, 1577, 1), -(19, 2050, 1), -(19, 2051, 1), -(19, 2052, 1), -(19, 2053, 1), -(19, 2054, 1), -(19, 2055, 1), -(19, 2056, 1), -(19, 2057, 1), -(19, 2058, 1), -(19, 2070, 1), -(19, 2071, 1), -(19, 2072, 1), -(19, 2073, 1), -(19, 2074, 1), -(19, 2075, 1), -(19, 2076, 1), -(19, 2077, 1), -(19, 2078, 1), +(19, 140, 1), +(19, 232, 1), +(19, 287, 1), +(19, 671, 1), +(19, 672, 1), +(19, 673, 1), +(19, 674, 1), +(19, 675, 1), +(19, 676, 1), +(19, 677, 1), +(19, 678, 1), +(19, 679, 1), +(19, 248, 2), (19, 25, 3), (19, 26, 3), -(19, 226, 3), -(19, 241, 3), -(19, 242, 3), -(19, 680, 3), -(19, 681, 3), -(19, 735, 3), -(19, 736, 3), -(19, 1135, 3), -(19, 1150, 3), -(19, 1151, 3), -(19, 1162, 3), -(19, 1178, 3), -(19, 1179, 3), -(19, 646, 6), -(19, 2049, 6), -(19, 2069, 6), -(19, 225, 8), -(19, 1134, 8), -(19, 1160, 8), -(19, 6, 10), -(19, 661, 10), -(19, 714, 10); +(19, 246, 3), +(19, 247, 3), +(19, 670, 6), +(19, 231, 8), +(19, 6, 10); DROP TABLE IF EXISTS `ps_search_word`; CREATE TABLE `ps_search_word` ( `id_word` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_lang` int(10) unsigned NOT NULL, `word` varchar(30) NOT NULL, PRIMARY KEY (`id_word`), UNIQUE KEY `id_lang` (`id_lang`,`id_shop`,`word`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_search_word` (`id_word`, `id_shop`, `id_lang`, `word`) VALUES -(655, 1, 1, '---'), -(236, 1, 1, '043kg'), -(55, 1, 1, '100'), -(518, 1, 1, '120'), -(523, 1, 1, '16x22cm'), -(227, 1, 1, '325ml'), -(312, 1, 1, '32x32cm'), -(133, 1, 1, '40x60cm'), -(134, 1, 1, '60x90cm'), -(135, 1, 1, '80x120cm'), -(232, 1, 1, '82cm'), -(234, 1, 1, '95cm'), -(242, 1, 1, 'accessories'), -(276, 1, 1, 'add'), -(138, 1, 1, 'adventure'), -(111, 1, 1, 'aesthethic'), -(314, 1, 1, 'armchair'), -(130, 1, 1, 'art'), -(319, 1, 1, 'atmosphere'), -(311, 1, 1, 'back'), -(342, 1, 1, 'bear'), -(315, 1, 1, 'bed'), -(139, 1, 1, 'begins'), -(98, 1, 1, 'best'), -(540, 1, 1, 'binding'), +(679, 1, 1, '---'), +(241, 1, 1, '043kg'), +(58, 1, 1, '100'), +(536, 1, 1, '120'), +(539, 1, 1, '16x22cm'), +(232, 1, 1, '325ml'), +(321, 1, 1, '32x32cm'), +(137, 1, 1, '40x60cm'), +(138, 1, 1, '60x90cm'), +(139, 1, 1, '80x120cm'), +(237, 1, 1, '82cm'), +(239, 1, 1, '95cm'), +(247, 1, 1, 'accessories'), +(284, 1, 1, 'add'), +(143, 1, 1, 'adventure'), +(115, 1, 1, 'aesthethic'), +(323, 1, 1, 'armchair'), +(134, 1, 1, 'art'), +(328, 1, 1, 'atmosphere'), +(320, 1, 1, 'back'), +(354, 1, 1, 'bear'), +(324, 1, 1, 'bed'), +(144, 1, 1, 'begins'), +(102, 1, 1, 'best'), +(556, 1, 1, 'binding'), (52, 1, 1, 'black'), -(341, 1, 1, 'brown'), -(56, 1, 1, 'brushed'), -(522, 1, 1, 'cardboard'), -(226, 1, 1, 'ceramic'), -(654, 1, 1, 'characters'), +(353, 1, 1, 'brown'), +(59, 1, 1, 'brushed'), +(56, 1, 1, 'cardboard'), +(140, 1, 1, 'ceramic'), +(678, 1, 1, 'characters'), (39, 1, 1, 'chino'), -(649, 1, 1, 'choice'), +(673, 1, 1, 'choice'), (30, 1, 1, 'classic'), -(252, 1, 1, 'coffee'), +(259, 1, 1, 'coffee'), (28, 1, 1, 'collection'), (47, 1, 1, 'color'), (32, 1, 1, 'colorful'), -(100, 1, 1, 'come'), -(59, 1, 1, 'comfort'), -(422, 1, 1, 'commercial'), -(254, 1, 1, 'conquer'), -(132, 1, 1, 'corner'), +(104, 1, 1, 'come'), +(62, 1, 1, 'comfort'), +(440, 1, 1, 'commercial'), +(261, 1, 1, 'conquer'), +(136, 1, 1, 'corner'), (18, 1, 1, 'cotton'), -(308, 1, 1, 'cover'), -(316, 1, 1, 'create'), -(427, 1, 1, 'creative'), -(251, 1, 1, 'cup'), +(317, 1, 1, 'cover'), +(325, 1, 1, 'create'), +(445, 1, 1, 'creative'), +(258, 1, 1, 'cup'), (23, 1, 1, 'curiosity'), -(306, 1, 1, 'cushion'), -(426, 1, 1, 'custom'), -(646, 1, 1, 'customizable'), -(647, 1, 1, 'customize'), -(183, 1, 1, 'day'), +(315, 1, 1, 'cushion'), +(444, 1, 1, 'custom'), +(670, 1, 1, 'customizable'), +(671, 1, 1, 'customize'), +(188, 1, 1, 'day'), (21, 1, 1, 'delicacy'), (6, 1, 1, 'demo'), -(125, 1, 1, 'depth'), +(129, 1, 1, 'depth'), (26, 1, 1, 'design'), -(116, 1, 1, 'desk'), -(233, 1, 1, 'diameter'), -(237, 1, 1, 'dishwasher'), -(240, 1, 1, 'dishwasher-proo'), -(239, 1, 1, 'dishwasherproof'), -(545, 1, 1, 'doted'), -(538, 1, 1, 'double'), -(418, 1, 1, 'download'), -(530, 1, 1, 'endearing'), +(120, 1, 1, 'desk'), +(238, 1, 1, 'diameter'), +(242, 1, 1, 'dishwasher'), +(245, 1, 1, 'dishwasher-proo'), +(244, 1, 1, 'dishwasherproof'), +(560, 1, 1, 'doted'), +(554, 1, 1, 'double'), +(436, 1, 1, 'download'), +(248, 1, 1, 'eco'), +(546, 1, 1, 'endearing'), (22, 1, 1, 'evokes'), (46, 1, 1, 'exceptional'), (14, 1, 1, 'extra'), (29, 1, 1, 'features'), -(534, 1, 1, 'feel'), -(324, 1, 1, 'filling'), -(140, 1, 1, 'finish'), +(550, 1, 1, 'feel'), +(333, 1, 1, 'filling'), +(145, 1, 1, 'finish'), (8, 1, 1, 'fit'), -(416, 1, 1, 'format'), -(305, 1, 1, 'fox'), -(122, 1, 1, 'frame'), -(101, 1, 1, 'framed'), -(108, 1, 1, 'give'), -(182, 1, 1, 'good'), -(131, 1, 1, 'graphic'), -(415, 1, 1, 'graphics'), -(115, 1, 1, 'great'), -(537, 1, 1, 'gsm'), +(434, 1, 1, 'format'), +(314, 1, 1, 'fox'), +(126, 1, 1, 'frame'), +(105, 1, 1, 'framed'), +(112, 1, 1, 'give'), +(187, 1, 1, 'good'), +(135, 1, 1, 'graphic'), +(433, 1, 1, 'graphics'), +(119, 1, 1, 'great'), +(553, 1, 1, 'gsm'), (49, 1, 1, 'guaranteed'), -(520, 1, 1, 'hard'), -(235, 1, 1, 'height'), -(241, 1, 1, 'home'), +(538, 1, 1, 'hard'), +(240, 1, 1, 'height'), +(246, 1, 1, 'home'), (1, 1, 1, 'hummingbird'), -(325, 1, 1, 'hypoallergenic'), -(527, 1, 1, 'ideas'), -(429, 1, 1, 'illustration'), -(526, 1, 1, 'ingenious'), -(57, 1, 1, 'inner'), +(334, 1, 1, 'hypoallergenic'), +(543, 1, 1, 'ideas'), +(447, 1, 1, 'illustration'), +(542, 1, 1, 'ingenious'), +(60, 1, 1, 'inner'), (34, 1, 1, 'inspired'), -(320, 1, 1, 'inspires'), -(309, 1, 1, 'invisible'), +(329, 1, 1, 'inspires'), +(318, 1, 1, 'invisible'), (36, 1, 1, 'japanese'), (40, 1, 1, 'jeans'), (24, 1, 1, 'joy'), (20, 1, 1, 'lightness'), -(535, 1, 1, 'like'), -(435, 1, 1, 'limitation'), +(551, 1, 1, 'like'), +(453, 1, 1, 'limitation'), (15, 1, 1, 'long'), -(114, 1, 1, 'look'), -(322, 1, 1, 'machine'), +(118, 1, 1, 'look'), +(331, 1, 1, 'machine'), (13, 1, 1, 'made'), -(533, 1, 1, 'make'), -(531, 1, 1, 'manufacturing'), -(104, 1, 1, 'matt'), -(652, 1, 1, 'maximum'), +(549, 1, 1, 'make'), +(547, 1, 1, 'manufacturing'), +(108, 1, 1, 'matt'), +(676, 1, 1, 'maximum'), +(335, 1, 1, 'meal'), (51, 1, 1, 'men'), -(650, 1, 1, 'message'), -(317, 1, 1, 'modern'), -(279, 1, 1, 'mood'), -(278, 1, 1, 'morning'), -(304, 1, 1, 'mountain'), -(225, 1, 1, 'mug'), +(674, 1, 1, 'message'), +(326, 1, 1, 'modern'), +(287, 1, 1, 'mood'), +(286, 1, 1, 'morning'), +(313, 1, 1, 'mountain'), +(231, 1, 1, 'mug'), (10, 1, 1, 'neckline'), -(421, 1, 1, 'non'), -(425, 1, 1, 'non-commercial'), -(424, 1, 1, 'noncommercial'), -(517, 1, 1, 'notebook'), -(653, 1, 1, 'number'), -(119, 1, 1, 'office'), -(117, 1, 1, 'open'), -(128, 1, 1, 'open-space'), -(126, 1, 1, 'openspace'), -(112, 1, 1, 'optimistic'), -(524, 1, 1, 'option'), +(439, 1, 1, 'non'), +(443, 1, 1, 'non-commercial'), +(442, 1, 1, 'noncommercial'), +(535, 1, 1, 'notebook'), +(677, 1, 1, 'number'), +(123, 1, 1, 'office'), +(121, 1, 1, 'open'), +(132, 1, 1, 'open-space'), +(130, 1, 1, 'openspace'), +(116, 1, 1, 'optimistic'), +(540, 1, 1, 'option'), (37, 1, 1, 'origamis'), (50, 1, 1, 'overtime'), -(504, 1, 1, 'pack'), -(546, 1, 1, 'pages'), -(120, 1, 1, 'painted'), -(105, 1, 1, 'paper'), -(124, 1, 1, 'partout'), -(123, 1, 1, 'passe'), -(129, 1, 1, 'passe-partout'), -(127, 1, 1, 'passepartout'), +(522, 1, 1, 'pack'), +(124, 1, 1, 'painted'), +(109, 1, 1, 'paper'), +(128, 1, 1, 'partout'), +(127, 1, 1, 'passe'), +(133, 1, 1, 'passe-partout'), +(131, 1, 1, 'passepartout'), (33, 1, 1, 'patterns'), -(419, 1, 1, 'personal'), +(437, 1, 1, 'personal'), (17, 1, 1, 'pima'), -(543, 1, 1, 'plain'), -(326, 1, 1, 'polyester'), +(558, 1, 1, 'plain'), +(54, 1, 1, 'polyester'), (27, 1, 1, 'polyfaune'), -(230, 1, 1, 'positive'), -(102, 1, 1, 'poster'), +(235, 1, 1, 'positive'), +(106, 1, 1, 'poster'), (2, 1, 1, 'printed'), (43, 1, 1, 'printing'), -(420, 1, 1, 'private'), +(438, 1, 1, 'private'), (44, 1, 1, 'process'), (31, 1, 1, 'products'), -(428, 1, 1, 'project'), -(238, 1, 1, 'proof'), +(446, 1, 1, 'project'), +(243, 1, 1, 'proof'), (45, 1, 1, 'provides'), -(431, 1, 1, 'purpose'), -(532, 1, 1, 'quality'), -(651, 1, 1, 'quote'), -(521, 1, 1, 'recycled'), +(449, 1, 1, 'purpose'), +(548, 1, 1, 'quality'), +(675, 1, 1, 'quote'), +(55, 1, 1, 'recycled'), (7, 1, 1, 'regular'), -(321, 1, 1, 'relaxation'), -(307, 1, 1, 'removable'), +(330, 1, 1, 'relaxation'), +(316, 1, 1, 'removable'), (48, 1, 1, 'rendering'), -(229, 1, 1, 'right'), -(103, 1, 1, 'rigid'), +(234, 1, 1, 'right'), +(107, 1, 1, 'rigid'), (9, 1, 1, 'round'), -(542, 1, 1, 'ruled'), -(253, 1, 1, 'set'), -(519, 1, 1, 'sheets'), +(561, 1, 1, 'ruled'), +(260, 1, 1, 'set'), +(537, 1, 1, 'sheets'), (3, 1, 1, 'shirt'), (11, 1, 1, 'short'), -(58, 1, 1, 'side'), -(434, 1, 1, 'size'), +(61, 1, 1, 'side'), +(452, 1, 1, 'size'), (12, 1, 1, 'sleeves'), -(106, 1, 1, 'smooth'), -(313, 1, 1, 'sofa'), -(118, 1, 1, 'space'), -(539, 1, 1, 'spiral'), -(544, 1, 1, 'squarred'), +(110, 1, 1, 'smooth'), +(322, 1, 1, 'sofa'), +(122, 1, 1, 'space'), +(555, 1, 1, 'spiral'), +(559, 1, 1, 'squarred'), (16, 1, 1, 'staple'), -(228, 1, 1, 'start'), -(541, 1, 1, 'stationery'), +(233, 1, 1, 'start'), +(557, 1, 1, 'stationery'), (25, 1, 1, 'studio'), (41, 1, 1, 'sublimation'), -(432, 1, 1, 'support'), -(107, 1, 1, 'surface'), -(417, 1, 1, 'svg'), -(54, 1, 1, 'sweater'), +(450, 1, 1, 'support'), +(111, 1, 1, 'surface'), +(435, 1, 1, 'svg'), +(57, 1, 1, 'sweater'), (19, 1, 1, 'symbol'), (5, 1, 1, 't-shirt'), -(648, 1, 1, 'text'), +(672, 1, 1, 'text'), (42, 1, 1, 'textile'), -(231, 1, 1, 'thought'), -(181, 1, 1, 'today'), -(277, 1, 1, 'touch'), +(236, 1, 1, 'thought'), +(186, 1, 1, 'today'), +(285, 1, 1, 'touch'), (35, 1, 1, 'traditional'), -(529, 1, 1, 'traveling'), +(545, 1, 1, 'traveling'), (4, 1, 1, 'tshirt'), -(423, 1, 1, 'use'), -(430, 1, 1, 'used'), -(414, 1, 1, 'vector'), -(110, 1, 1, 'voice'), -(109, 1, 1, 'walls'), -(323, 1, 1, 'washable'), +(441, 1, 1, 'use'), +(448, 1, 1, 'used'), +(432, 1, 1, 'vector'), +(114, 1, 1, 'voice'), +(113, 1, 1, 'walls'), +(332, 1, 1, 'washable'), (38, 1, 1, 'wear'), (53, 1, 1, 'white'), -(113, 1, 1, 'will'), -(433, 1, 1, 'without'), -(60, 1, 1, 'women'), -(121, 1, 1, 'wooden'), -(528, 1, 1, 'work'), -(525, 1, 1, 'write'), -(536, 1, 1, 'writing'), -(99, 1, 1, 'yet'), -(318, 1, 1, 'zen'), -(310, 1, 1, 'zip'), -(2058, 2, 1, '---'), -(1145, 2, 1, '043kg'), -(767, 2, 1, '100'), -(1765, 2, 1, '120'), -(1770, 2, 1, '16x22cm'), -(1136, 2, 1, '325ml'), -(1309, 2, 1, '32x32cm'), -(894, 2, 1, '40x60cm'), -(895, 2, 1, '60x90cm'), -(896, 2, 1, '80x120cm'), -(1141, 2, 1, '82cm'), -(1143, 2, 1, '95cm'), -(1151, 2, 1, 'accessories'), -(1242, 2, 1, 'add'), -(946, 2, 1, 'adventure'), -(872, 2, 1, 'aesthethic'), -(1311, 2, 1, 'armchair'), -(891, 2, 1, 'art'), -(1316, 2, 1, 'atmosphere'), -(1308, 2, 1, 'back'), -(1381, 2, 1, 'bear'), -(1312, 2, 1, 'bed'), -(947, 2, 1, 'begins'), -(859, 2, 1, 'best'), -(1787, 2, 1, 'binding'), -(707, 2, 1, 'black'), -(1380, 2, 1, 'brown'), -(768, 2, 1, 'brushed'), -(1769, 2, 1, 'cardboard'), -(1135, 2, 1, 'ceramic'), -(2057, 2, 1, 'characters'), -(694, 2, 1, 'chino'), -(2052, 2, 1, 'choice'), -(685, 2, 1, 'classic'), -(1190, 2, 1, 'coffee'), -(683, 2, 1, 'collection'), -(702, 2, 1, 'color'), -(687, 2, 1, 'colorful'), -(861, 2, 1, 'come'), -(771, 2, 1, 'comfort'), -(1544, 2, 1, 'commercial'), -(1192, 2, 1, 'conquer'), -(893, 2, 1, 'corner'), -(673, 2, 1, 'cotton'), -(1305, 2, 1, 'cover'), -(1313, 2, 1, 'create'), -(1549, 2, 1, 'creative'), -(1189, 2, 1, 'cup'), -(678, 2, 1, 'curiosity'), -(1303, 2, 1, 'cushion'), -(1548, 2, 1, 'custom'), -(2049, 2, 1, 'customizable'), -(2050, 2, 1, 'customize'), -(1041, 2, 1, 'day'), -(676, 2, 1, 'delicacy'), -(661, 2, 1, 'demo'), -(886, 2, 1, 'depth'), -(681, 2, 1, 'design'), -(877, 2, 1, 'desk'), -(1142, 2, 1, 'diameter'), -(1146, 2, 1, 'dishwasher'), -(1149, 2, 1, 'dishwasher-proo'), -(1148, 2, 1, 'dishwasherproof'), -(1792, 2, 1, 'doted'), -(1785, 2, 1, 'double'), -(1540, 2, 1, 'download'), -(1777, 2, 1, 'endearing'), -(677, 2, 1, 'evokes'), -(701, 2, 1, 'exceptional'), -(669, 2, 1, 'extra'), -(684, 2, 1, 'features'), -(1781, 2, 1, 'feel'), -(1321, 2, 1, 'filling'), -(948, 2, 1, 'finish'), -(663, 2, 1, 'fit'), -(1538, 2, 1, 'format'), -(1302, 2, 1, 'fox'), -(883, 2, 1, 'frame'), -(862, 2, 1, 'framed'), -(869, 2, 1, 'give'), -(1040, 2, 1, 'good'), -(892, 2, 1, 'graphic'), -(1537, 2, 1, 'graphics'), -(876, 2, 1, 'great'), -(1784, 2, 1, 'gsm'), -(704, 2, 1, 'guaranteed'), -(1767, 2, 1, 'hard'), -(1144, 2, 1, 'height'), -(1150, 2, 1, 'home'), -(656, 2, 1, 'hummingbird'), -(1322, 2, 1, 'hypoallergenic'), -(1774, 2, 1, 'ideas'), -(1551, 2, 1, 'illustration'), -(1773, 2, 1, 'ingenious'), -(769, 2, 1, 'inner'), -(689, 2, 1, 'inspired'), -(1317, 2, 1, 'inspires'), -(1306, 2, 1, 'invisible'), -(691, 2, 1, 'japanese'), -(695, 2, 1, 'jeans'), -(679, 2, 1, 'joy'), -(675, 2, 1, 'lightness'), -(1782, 2, 1, 'like'), -(1557, 2, 1, 'limitation'), -(670, 2, 1, 'long'), -(875, 2, 1, 'look'), -(1319, 2, 1, 'machine'), -(668, 2, 1, 'made'), -(1780, 2, 1, 'make'), -(1778, 2, 1, 'manufacturing'), -(865, 2, 1, 'matt'), -(2055, 2, 1, 'maximum'), -(706, 2, 1, 'men'), -(2053, 2, 1, 'message'), -(1314, 2, 1, 'modern'), -(1245, 2, 1, 'mood'), -(1244, 2, 1, 'morning'), -(1301, 2, 1, 'mountain'), -(1134, 2, 1, 'mug'), -(665, 2, 1, 'neckline'), -(1543, 2, 1, 'non'), -(1547, 2, 1, 'non-commercial'), -(1546, 2, 1, 'noncommercial'), -(1764, 2, 1, 'notebook'), -(2056, 2, 1, 'number'), -(880, 2, 1, 'office'), -(878, 2, 1, 'open'), -(889, 2, 1, 'open-space'), -(887, 2, 1, 'openspace'), -(873, 2, 1, 'optimistic'), -(1771, 2, 1, 'option'), -(692, 2, 1, 'origamis'), -(705, 2, 1, 'overtime'), -(1737, 2, 1, 'pack'), -(1793, 2, 1, 'pages'), -(881, 2, 1, 'painted'), -(866, 2, 1, 'paper'), -(885, 2, 1, 'partout'), -(884, 2, 1, 'passe'), -(890, 2, 1, 'passe-partout'), -(888, 2, 1, 'passepartout'), -(688, 2, 1, 'patterns'), -(1541, 2, 1, 'personal'), -(672, 2, 1, 'pima'), -(1790, 2, 1, 'plain'), -(1323, 2, 1, 'polyester'), -(682, 2, 1, 'polyfaune'), -(1139, 2, 1, 'positive'), -(863, 2, 1, 'poster'), -(657, 2, 1, 'printed'), -(698, 2, 1, 'printing'), -(1542, 2, 1, 'private'), -(699, 2, 1, 'process'), -(686, 2, 1, 'products'), -(1550, 2, 1, 'project'), -(1147, 2, 1, 'proof'), -(700, 2, 1, 'provides'), -(1553, 2, 1, 'purpose'), -(1779, 2, 1, 'quality'), -(2054, 2, 1, 'quote'), -(1768, 2, 1, 'recycled'), -(662, 2, 1, 'regular'), -(1318, 2, 1, 'relaxation'), -(1304, 2, 1, 'removable'), -(703, 2, 1, 'rendering'), -(1138, 2, 1, 'right'), -(864, 2, 1, 'rigid'), -(664, 2, 1, 'round'), -(1789, 2, 1, 'ruled'), -(1191, 2, 1, 'set'), -(1766, 2, 1, 'sheets'), -(658, 2, 1, 'shirt'), -(666, 2, 1, 'short'), -(770, 2, 1, 'side'), -(1556, 2, 1, 'size'), -(667, 2, 1, 'sleeves'), -(867, 2, 1, 'smooth'), -(1310, 2, 1, 'sofa'), -(879, 2, 1, 'space'), -(1786, 2, 1, 'spiral'), -(1791, 2, 1, 'squarred'), -(671, 2, 1, 'staple'), -(1137, 2, 1, 'start'), -(1788, 2, 1, 'stationery'), -(680, 2, 1, 'studio'), -(696, 2, 1, 'sublimation'), -(1554, 2, 1, 'support'), -(868, 2, 1, 'surface'), -(1539, 2, 1, 'svg'), -(766, 2, 1, 'sweater'), -(674, 2, 1, 'symbol'), -(660, 2, 1, 't-shirt'), -(2051, 2, 1, 'text'), -(697, 2, 1, 'textile'), -(1140, 2, 1, 'thought'), -(1039, 2, 1, 'today'), -(1243, 2, 1, 'touch'), -(690, 2, 1, 'traditional'), -(1776, 2, 1, 'traveling'), -(659, 2, 1, 'tshirt'), -(1545, 2, 1, 'use'), -(1552, 2, 1, 'used'), -(1536, 2, 1, 'vector'), -(871, 2, 1, 'voice'), -(870, 2, 1, 'walls'), -(1320, 2, 1, 'washable'), -(693, 2, 1, 'wear'), -(708, 2, 1, 'white'), -(874, 2, 1, 'will'), -(1555, 2, 1, 'without'), -(772, 2, 1, 'women'), -(882, 2, 1, 'wooden'), -(1775, 2, 1, 'work'), -(1772, 2, 1, 'write'), -(1783, 2, 1, 'writing'), -(860, 2, 1, 'yet'), -(1315, 2, 1, 'zen'), -(1307, 2, 1, 'zip'), -(2078, 2, 2, '---'), -(1173, 2, 2, '043kg'), -(811, 2, 2, '100'), -(1807, 2, 2, '120'), -(1812, 2, 2, '16x22cm'), -(1163, 2, 2, '325ml'), -(1346, 2, 2, '32x32cm'), -(937, 2, 2, '40x60cm'), -(938, 2, 2, '60x90cm'), -(939, 2, 2, '80x120cm'), -(1169, 2, 2, '82cm'), -(1171, 2, 2, '95cm'), -(1179, 2, 2, 'accessories'), -(1270, 2, 2, 'add'), -(989, 2, 2, 'adventure'), -(914, 2, 2, 'aesthethic'), -(729, 2, 2, 'and'), -(1586, 2, 2, 'any'), -(1348, 2, 2, 'armchair'), -(934, 2, 2, 'art'), -(1353, 2, 2, 'atmosphere'), -(1345, 2, 2, 'back'), -(765, 2, 2, 'baumwolle'), -(1418, 2, 2, 'bear'), -(1349, 2, 2, 'bed'), -(990, 2, 2, 'begins'), -(899, 2, 2, 'best'), -(1833, 2, 2, 'binding'), -(1417, 2, 2, 'brown'), -(812, 2, 2, 'brushed'), -(1583, 2, 2, 'can'), -(1811, 2, 2, 'cardboard'), -(1162, 2, 2, 'ceramic'), -(2077, 2, 2, 'characters'), -(750, 2, 2, 'chino'), -(2072, 2, 2, 'choice'), -(740, 2, 2, 'classic'), -(1215, 2, 2, 'coffee'), -(738, 2, 2, 'collection'), -(758, 2, 2, 'color'), -(743, 2, 2, 'colorful'), -(901, 2, 2, 'come'), -(816, 2, 2, 'comfort'), -(1573, 2, 2, 'commercial'), -(1218, 2, 2, 'conquer'), -(936, 2, 2, 'corner'), -(726, 2, 2, 'cotton'), -(1342, 2, 2, 'cover'), -(1350, 2, 2, 'create'), -(1580, 2, 2, 'creative'), -(1214, 2, 2, 'cup'), -(733, 2, 2, 'curiosity'), -(1340, 2, 2, 'cushion'), -(1579, 2, 2, 'custom'), -(2069, 2, 2, 'customizable'), -(2070, 2, 2, 'customize'), -(1085, 2, 2, 'day'), -(730, 2, 2, 'delicacy'), -(714, 2, 2, 'demo'), -(929, 2, 2, 'depth'), -(736, 2, 2, 'design'), -(919, 2, 2, 'desk'), -(1170, 2, 2, 'diameter'), -(1174, 2, 2, 'dishwasher'), -(1177, 2, 2, 'dishwasher-proo'), -(1176, 2, 2, 'dishwasherproof'), -(1838, 2, 2, 'doted'), -(1831, 2, 2, 'double'), -(1815, 2, 2, 'down'), -(1569, 2, 2, 'download'), -(1823, 2, 2, 'endearing'), -(732, 2, 2, 'evokes'), -(757, 2, 2, 'exceptional'), -(722, 2, 2, 'extra'), -(739, 2, 2, 'features'), -(1827, 2, 2, 'feel'), -(1359, 2, 2, 'filling'), -(991, 2, 2, 'finish'), -(716, 2, 2, 'fit'), -(815, 2, 2, 'for'), -(1567, 2, 2, 'format'), -(1339, 2, 2, 'fox'), -(925, 2, 2, 'frame'), -(902, 2, 2, 'framed'), -(909, 2, 2, 'give'), -(1084, 2, 2, 'good'), -(935, 2, 2, 'graphic'), -(1566, 2, 2, 'graphics'), -(918, 2, 2, 'great'), -(1830, 2, 2, 'gsm'), -(760, 2, 2, 'guaranteed'), -(1809, 2, 2, 'hard'), -(1578, 2, 2, 'have'), -(1172, 2, 2, 'height'), -(1178, 2, 2, 'home'), -(709, 2, 2, 'hummingbird'), -(1360, 2, 2, 'hypoallergenic'), -(1818, 2, 2, 'ideas'), -(1582, 2, 2, 'illustration'), -(1817, 2, 2, 'ingenious'), -(813, 2, 2, 'inner'), -(745, 2, 2, 'inspired'), -(1355, 2, 2, 'inspires'), -(1343, 2, 2, 'invisible'), -(1822, 2, 2, 'its'), -(747, 2, 2, 'japanese'), -(751, 2, 2, 'jeans'), -(734, 2, 2, 'joy'), -(728, 2, 2, 'lightness'), -(1828, 2, 2, 'like'), -(1590, 2, 2, 'limitation'), -(723, 2, 2, 'long'), -(917, 2, 2, 'look'), -(1357, 2, 2, 'machine'), -(721, 2, 2, 'made'), -(1826, 2, 2, 'make'), -(1824, 2, 2, 'manufacturing'), -(905, 2, 2, 'matt'), -(2075, 2, 2, 'maximum'), -(762, 2, 2, 'men'), -(2073, 2, 2, 'message'), -(1351, 2, 2, 'modern'), -(1273, 2, 2, 'mood'), -(928, 2, 2, 'more'), -(1272, 2, 2, 'morning'), -(1816, 2, 2, 'most'), -(1338, 2, 2, 'mountain'), -(1160, 2, 2, 'mug'), -(718, 2, 2, 'neckline'), -(1572, 2, 2, 'non'), -(1576, 2, 2, 'non-commercial'), -(1575, 2, 2, 'noncommercial'), -(1806, 2, 2, 'notebook'), -(2076, 2, 2, 'number'), -(1165, 2, 2, 'off'), -(922, 2, 2, 'office'), -(920, 2, 2, 'open'), -(932, 2, 2, 'open-space'), -(930, 2, 2, 'openspace'), -(915, 2, 2, 'optimistic'), -(1813, 2, 2, 'option'), -(748, 2, 2, 'origamis'), -(1217, 2, 2, 'out'), -(761, 2, 2, 'overtime'), -(1750, 2, 2, 'pack'), -(1839, 2, 2, 'pages'), -(923, 2, 2, 'painted'), -(906, 2, 2, 'paper'), -(927, 2, 2, 'partout'), -(926, 2, 2, 'passe'), -(933, 2, 2, 'passe-partout'), -(931, 2, 2, 'passepartout'), -(744, 2, 2, 'patterns'), -(1570, 2, 2, 'personal'), -(725, 2, 2, 'pima'), -(1836, 2, 2, 'plain'), -(1361, 2, 2, 'polyester'), -(737, 2, 2, 'polyfaune'), -(1167, 2, 2, 'positive'), -(903, 2, 2, 'poster'), -(710, 2, 2, 'printed'), -(754, 2, 2, 'printing'), -(1571, 2, 2, 'private'), -(755, 2, 2, 'process'), -(741, 2, 2, 'products'), -(1581, 2, 2, 'project'), -(1175, 2, 2, 'proof'), -(756, 2, 2, 'provides'), -(1585, 2, 2, 'purpose'), -(1825, 2, 2, 'quality'), -(2074, 2, 2, 'quote'), -(1810, 2, 2, 'recycled'), -(715, 2, 2, 'regular'), -(1356, 2, 2, 'relaxation'), -(1341, 2, 2, 'removable'), -(759, 2, 2, 'rendering'), -(1166, 2, 2, 'right'), -(904, 2, 2, 'rigid'), -(717, 2, 2, 'round'), -(1835, 2, 2, 'ruled'), -(763, 2, 2, 'schwarz'), -(1216, 2, 2, 'set'), -(1808, 2, 2, 'sheets'), -(711, 2, 2, 'shirt'), -(719, 2, 2, 'short'), -(814, 2, 2, 'side'), -(1589, 2, 2, 'size'), -(720, 2, 2, 'sleeves'), -(907, 2, 2, 'smooth'), -(1347, 2, 2, 'sofa'), -(921, 2, 2, 'space'), -(1832, 2, 2, 'spiral'), -(1837, 2, 2, 'squarred'), -(724, 2, 2, 'staple'), -(1164, 2, 2, 'start'), -(1834, 2, 2, 'stationery'), -(735, 2, 2, 'studio'), -(752, 2, 2, 'sublimation'), -(1587, 2, 2, 'support'), -(908, 2, 2, 'surface'), -(1568, 2, 2, 'svg'), -(810, 2, 2, 'sweater'), -(727, 2, 2, 'symbol'), -(713, 2, 2, 't-shirt'), -(2071, 2, 2, 'text'), -(753, 2, 2, 'textile'), -(1354, 2, 2, 'that'), -(731, 2, 2, 'the'), -(913, 2, 2, 'this'), -(1168, 2, 2, 'thought'), -(1083, 2, 2, 'today'), -(1271, 2, 2, 'touch'), -(746, 2, 2, 'traditional'), -(1821, 2, 2, 'traveling'), -(712, 2, 2, 'tshirt'), -(1574, 2, 2, 'use'), -(1584, 2, 2, 'used'), -(1565, 2, 2, 'vector'), -(912, 2, 2, 'voice'), -(911, 2, 2, 'walls'), -(1358, 2, 2, 'washable'), -(749, 2, 2, 'wear'), -(764, 2, 2, 'weiss'), -(1820, 2, 2, 'when'), -(1161, 2, 2, 'white'), -(916, 2, 2, 'will'), -(742, 2, 2, 'with'), -(1588, 2, 2, 'without'), -(817, 2, 2, 'women'), -(924, 2, 2, 'wooden'), -(1819, 2, 2, 'work'), -(1814, 2, 2, 'write'), -(1829, 2, 2, 'writing'), -(900, 2, 2, 'yet'), -(1577, 2, 2, 'you'), -(910, 2, 2, 'your'), -(1352, 2, 2, 'zen'), -(1344, 2, 2, 'zip'); +(117, 1, 1, 'will'), +(451, 1, 1, 'without'), +(63, 1, 1, 'women'), +(125, 1, 1, 'wooden'), +(562, 1, 1, 'wool'), +(544, 1, 1, 'work'), +(541, 1, 1, 'write'), +(552, 1, 1, 'writing'), +(103, 1, 1, 'yet'), +(327, 1, 1, 'zen'), +(319, 1, 1, 'zip'); DROP TABLE IF EXISTS `ps_shop`; CREATE TABLE `ps_shop` ( @@ -17784,8 +12239,7 @@ CREATE TABLE `ps_shop` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `ps_shop` (`id_shop`, `id_shop_group`, `name`, `color`, `id_category`, `theme_name`, `active`, `deleted`) VALUES -(1, 1, 'PrestaShop', '', 2, 'classic', 1, 0), -(2, 1, 'SHOP2', '#007992', 2, 'classic', 1, 0); +(1, 1, 'PrestaShop', '', 2, 'classic', 1, 0); DROP TABLE IF EXISTS `ps_shop_group`; CREATE TABLE `ps_shop_group` ( @@ -17815,11 +12269,10 @@ CREATE TABLE `ps_shop_url` ( `active` tinyint(1) NOT NULL, PRIMARY KEY (`id_shop_url`), KEY `IDX_279F19DA274A50A0` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1), -(2, 2, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', 'shop2/', 1, 1); +(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( @@ -17832,7 +12285,7 @@ CREATE TABLE `ps_smarty_cache` ( KEY `name` (`name`), KEY `cache_id` (`cache_id`), KEY `modified` (`modified`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_smarty_last_flush`; @@ -17840,7 +12293,7 @@ CREATE TABLE `ps_smarty_last_flush` ( `type` enum('compile','template') NOT NULL, `last_flush` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`type`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_smarty_lazy_cache`; @@ -17851,17 +12304,17 @@ CREATE TABLE `ps_smarty_lazy_cache` ( `filepath` varchar(255) NOT NULL DEFAULT '', `last_update` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', PRIMARY KEY (`template_hash`,`cache_id`,`compile_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_specific_price`; CREATE TABLE `ps_specific_price` ( `id_specific_price` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_specific_price_rule` int(10) unsigned NOT NULL, - `id_cart` int(10) unsigned NOT NULL, + `id_specific_price_rule` int(11) unsigned NOT NULL, + `id_cart` int(11) unsigned NOT NULL, `id_product` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', - `id_shop_group` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', + `id_shop_group` int(11) unsigned NOT NULL, `id_currency` int(10) unsigned NOT NULL, `id_country` int(10) unsigned NOT NULL, `id_group` int(10) unsigned NOT NULL, @@ -17885,7 +12338,7 @@ CREATE TABLE `ps_specific_price` ( KEY `id_customer` (`id_customer`), KEY `from` (`from`), KEY `to` (`to`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_specific_price` (`id_specific_price`, `id_specific_price_rule`, `id_cart`, `id_product`, `id_shop`, `id_shop_group`, `id_currency`, `id_country`, `id_group`, `id_customer`, `id_product_attribute`, `price`, `from_quantity`, `reduction`, `reduction_tax`, `reduction_type`, `from`, `to`) VALUES (1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, -1.000000, 1, 0.200000, 1, 'percentage', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -17898,14 +12351,14 @@ CREATE TABLE `ps_specific_price_priority` ( `priority` varchar(80) NOT NULL, PRIMARY KEY (`id_specific_price_priority`,`id_product`), UNIQUE KEY `id_product` (`id_product`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_specific_price_rule`; CREATE TABLE `ps_specific_price_rule` ( `id_specific_price_rule` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(255) NOT NULL, - `id_shop` int(10) unsigned NOT NULL DEFAULT '1', + `id_shop` int(11) unsigned NOT NULL DEFAULT '1', `id_currency` int(10) unsigned NOT NULL, `id_country` int(10) unsigned NOT NULL, `id_group` int(10) unsigned NOT NULL, @@ -17918,42 +12371,42 @@ CREATE TABLE `ps_specific_price_rule` ( `to` datetime NOT NULL, PRIMARY KEY (`id_specific_price_rule`), KEY `id_product` (`id_shop`,`id_currency`,`id_country`,`id_group`,`from_quantity`,`from`,`to`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_specific_price_rule_condition`; CREATE TABLE `ps_specific_price_rule_condition` ( - `id_specific_price_rule_condition` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_specific_price_rule_condition_group` int(10) unsigned NOT NULL, + `id_specific_price_rule_condition` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_specific_price_rule_condition_group` int(11) unsigned NOT NULL, `type` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`id_specific_price_rule_condition`), KEY `id_specific_price_rule_condition_group` (`id_specific_price_rule_condition_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_specific_price_rule_condition_group`; CREATE TABLE `ps_specific_price_rule_condition_group` ( - `id_specific_price_rule_condition_group` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_specific_price_rule` int(10) unsigned NOT NULL, + `id_specific_price_rule_condition_group` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_specific_price_rule` int(11) unsigned NOT NULL, PRIMARY KEY (`id_specific_price_rule_condition_group`,`id_specific_price_rule`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_state`; CREATE TABLE `ps_state` ( `id_state` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_country` int(10) unsigned NOT NULL, - `id_zone` int(10) unsigned NOT NULL, + `id_country` int(11) unsigned NOT NULL, + `id_zone` int(11) unsigned NOT NULL, `name` varchar(80) NOT NULL, `iso_code` varchar(7) NOT NULL, - `tax_behavior` smallint(6) NOT NULL DEFAULT '0', + `tax_behavior` smallint(1) NOT NULL DEFAULT '0', `active` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id_state`), KEY `id_country` (`id_country`), KEY `name` (`name`), KEY `id_zone` (`id_zone`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_state` (`id_state`, `id_country`, `id_zone`, `name`, `iso_code`, `tax_behavior`, `active`) VALUES (1, 21, 2, 'AA', 'AA', 0, 1), @@ -18327,7 +12780,7 @@ CREATE TABLE `ps_statssearch` ( `id_shop` int(10) unsigned NOT NULL DEFAULT '1', `id_shop_group` int(10) unsigned NOT NULL DEFAULT '1', `keywords` varchar(255) NOT NULL, - `results` int(11) NOT NULL DEFAULT '0', + `results` int(6) NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, PRIMARY KEY (`id_statssearch`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; @@ -18335,37 +12788,37 @@ CREATE TABLE `ps_statssearch` ( DROP TABLE IF EXISTS `ps_stock`; CREATE TABLE `ps_stock` ( - `id_stock` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_warehouse` int(10) unsigned NOT NULL, - `id_product` int(10) unsigned NOT NULL, - `id_product_attribute` int(10) unsigned NOT NULL, + `id_stock` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_warehouse` int(11) unsigned NOT NULL, + `id_product` int(11) unsigned NOT NULL, + `id_product_attribute` int(11) unsigned NOT NULL, `reference` varchar(64) NOT NULL, `ean13` varchar(13) DEFAULT NULL, `isbn` varchar(32) DEFAULT NULL, `upc` varchar(12) DEFAULT NULL, `mpn` varchar(40) DEFAULT NULL, - `physical_quantity` int(10) unsigned NOT NULL, - `usable_quantity` int(10) unsigned NOT NULL, + `physical_quantity` int(11) unsigned NOT NULL, + `usable_quantity` int(11) unsigned NOT NULL, `price_te` decimal(20,6) DEFAULT '0.000000', PRIMARY KEY (`id_stock`), KEY `id_warehouse` (`id_warehouse`), KEY `id_product` (`id_product`), KEY `id_product_attribute` (`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_stock_available`; CREATE TABLE `ps_stock_available` ( - `id_stock_available` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_product` int(10) unsigned NOT NULL, - `id_product_attribute` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, - `id_shop_group` int(10) unsigned NOT NULL, - `quantity` int(11) NOT NULL DEFAULT '0', + `id_stock_available` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_product` int(11) unsigned NOT NULL, + `id_product_attribute` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, + `id_shop_group` int(11) unsigned NOT NULL, + `quantity` int(10) NOT NULL DEFAULT '0', `physical_quantity` int(11) NOT NULL DEFAULT '0', `reserved_quantity` int(11) NOT NULL DEFAULT '0', - `depends_on_stock` tinyint(3) unsigned NOT NULL DEFAULT '0', - `out_of_stock` tinyint(3) unsigned NOT NULL DEFAULT '0', + `depends_on_stock` tinyint(1) unsigned NOT NULL DEFAULT '0', + `out_of_stock` tinyint(1) unsigned NOT NULL DEFAULT '0', `location` varchar(255) NOT NULL DEFAULT '', PRIMARY KEY (`id_stock_available`), UNIQUE KEY `product_sqlstock` (`id_product`,`id_product_attribute`,`id_shop`,`id_shop_group`), @@ -18373,13 +12826,13 @@ CREATE TABLE `ps_stock_available` ( KEY `id_shop_group` (`id_shop_group`), KEY `id_product` (`id_product`), KEY `id_product_attribute` (`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_stock_available` (`id_stock_available`, `id_product`, `id_product_attribute`, `id_shop`, `id_shop_group`, `quantity`, `physical_quantity`, `reserved_quantity`, `depends_on_stock`, `out_of_stock`, `location`) VALUES (1, 1, 0, 1, 0, 2400, 0, 0, 0, 2, ''), (2, 2, 0, 1, 0, 2100, 0, 0, 0, 2, ''), -(3, 3, 0, 1, 0, 1497, 1497, 0, 0, 2, ''), -(4, 4, 0, 1, 0, 1500, 0, 0, 0, 2, ''), +(3, 3, 0, 1, 0, 1500, 0, 0, 0, 2, ''), +(4, 4, 0, 1, 0, 1496, 1496, 0, 0, 2, ''), (5, 5, 0, 1, 0, 900, 0, 0, 0, 2, ''), (6, 6, 0, 1, 0, 300, 0, 0, 0, 2, ''), (7, 7, 0, 1, 0, 300, 0, 0, 0, 2, ''), @@ -18407,12 +12860,12 @@ INSERT INTO `ps_stock_available` (`id_stock_available`, `id_product`, `id_produc (29, 2, 10, 1, 0, 300, 0, 0, 0, 2, ''), (30, 2, 11, 1, 0, 300, 0, 0, 0, 2, ''), (31, 2, 12, 1, 0, 300, 0, 0, 0, 2, ''), -(32, 3, 13, 1, 0, 897, 900, 3, 0, 2, ''), -(33, 3, 14, 1, 0, 300, 300, 0, 0, 2, ''), -(34, 3, 15, 1, 0, 300, 300, 0, 0, 2, ''), -(35, 4, 16, 1, 0, 900, 0, 0, 0, 2, ''), -(36, 4, 17, 1, 0, 300, 0, 0, 0, 2, ''), -(37, 4, 18, 1, 0, 300, 0, 0, 0, 2, ''), +(32, 3, 13, 1, 0, 900, 0, 0, 0, 2, ''), +(33, 3, 14, 1, 0, 300, 0, 0, 0, 2, ''), +(34, 3, 15, 1, 0, 300, 0, 0, 0, 2, ''), +(35, 4, 16, 1, 0, 896, 900, 4, 0, 2, ''), +(36, 4, 17, 1, 0, 300, 300, 0, 0, 2, ''), +(37, 4, 18, 1, 0, 300, 302, 2, 0, 2, ''), (38, 5, 19, 1, 0, 300, 0, 0, 0, 2, ''), (39, 5, 20, 1, 0, 300, 0, 0, 0, 2, ''), (40, 5, 21, 1, 0, 300, 0, 0, 0, 2, ''), @@ -18433,65 +12886,7 @@ INSERT INTO `ps_stock_available` (`id_stock_available`, `id_product`, `id_produc (55, 18, 36, 1, 0, 300, 0, 0, 0, 2, ''), (56, 18, 37, 1, 0, 300, 0, 0, 0, 2, ''), (57, 18, 38, 1, 0, 300, 0, 0, 0, 2, ''), -(58, 18, 39, 1, 0, 300, 0, 0, 0, 2, ''), -(59, 1, 0, 2, 0, 2400, 0, 0, 0, 2, ''), -(60, 2, 0, 2, 0, 2072, 2072, 0, 0, 2, ''), -(61, 3, 0, 2, 0, 1500, 0, 0, 0, 2, ''), -(62, 4, 0, 2, 0, 1500, 0, 0, 0, 2, ''), -(63, 5, 0, 2, 0, 900, 0, 0, 0, 2, ''), -(64, 6, 0, 2, 0, 300, 0, 0, 0, 2, ''), -(65, 7, 0, 2, 0, 300, 0, 0, 0, 2, ''), -(66, 8, 0, 2, 0, 300, 0, 0, 0, 2, ''), -(67, 9, 0, 2, 0, 600, 0, 0, 0, 2, ''), -(68, 10, 0, 2, 0, 600, 0, 0, 0, 2, ''), -(69, 11, 0, 2, 0, 600, 0, 0, 0, 2, ''), -(70, 12, 0, 2, 0, 300, 0, 0, 0, 1, ''), -(71, 13, 0, 2, 0, 300, 0, 0, 0, 1, ''), -(72, 14, 0, 2, 0, 300, 0, 0, 0, 1, ''), -(73, 15, 0, 2, 0, 100, 0, 0, 0, 2, ''), -(74, 16, 0, 2, 0, 1200, 0, 0, 0, 2, ''), -(75, 17, 0, 2, 0, 1200, 0, 0, 0, 2, ''), -(76, 18, 0, 2, 0, 1200, 0, 0, 0, 2, ''), -(77, 19, 0, 2, 0, 300, 0, 0, 0, 2, ''), -(78, 1, 1, 2, 0, 300, 0, 0, 0, 2, ''), -(79, 1, 2, 2, 0, 300, 0, 0, 0, 2, ''), -(80, 1, 3, 2, 0, 300, 0, 0, 0, 2, ''), -(81, 1, 4, 2, 0, 300, 0, 0, 0, 2, ''), -(82, 1, 5, 2, 0, 300, 0, 0, 0, 2, ''), -(83, 1, 6, 2, 0, 300, 0, 0, 0, 2, ''), -(84, 1, 7, 2, 0, 300, 0, 0, 0, 2, ''), -(85, 1, 8, 2, 0, 300, 0, 0, 0, 2, ''), -(86, 2, 9, 2, 0, 1172, 1200, 28, 0, 2, ''), -(87, 2, 10, 2, 0, 300, 300, 0, 0, 2, ''), -(88, 2, 11, 2, 0, 300, 300, 0, 0, 2, ''), -(89, 2, 12, 2, 0, 300, 300, 0, 0, 2, ''), -(90, 3, 13, 2, 0, 900, 0, 0, 0, 2, ''), -(91, 3, 14, 2, 0, 300, 0, 0, 0, 2, ''), -(92, 3, 15, 2, 0, 300, 0, 0, 0, 2, ''), -(93, 4, 16, 2, 0, 900, 0, 0, 0, 2, ''), -(94, 4, 17, 2, 0, 300, 0, 0, 0, 2, ''), -(95, 4, 18, 2, 0, 300, 0, 0, 0, 2, ''), -(96, 5, 19, 2, 0, 300, 0, 0, 0, 2, ''), -(97, 5, 20, 2, 0, 300, 0, 0, 0, 2, ''), -(98, 5, 21, 2, 0, 300, 0, 0, 0, 2, ''), -(99, 9, 22, 2, 0, 300, 0, 0, 0, 2, ''), -(100, 9, 23, 2, 0, 300, 0, 0, 0, 2, ''), -(101, 10, 24, 2, 0, 300, 0, 0, 0, 2, ''), -(102, 10, 25, 2, 0, 300, 0, 0, 0, 2, ''), -(103, 11, 26, 2, 0, 300, 0, 0, 0, 2, ''), -(104, 11, 27, 2, 0, 300, 0, 0, 0, 2, ''), -(105, 16, 28, 2, 0, 300, 0, 0, 0, 2, ''), -(106, 16, 29, 2, 0, 300, 0, 0, 0, 2, ''), -(107, 16, 30, 2, 0, 300, 0, 0, 0, 2, ''), -(108, 16, 31, 2, 0, 300, 0, 0, 0, 2, ''), -(109, 17, 32, 2, 0, 300, 0, 0, 0, 2, ''), -(110, 17, 33, 2, 0, 300, 0, 0, 0, 2, ''), -(111, 17, 34, 2, 0, 300, 0, 0, 0, 2, ''), -(112, 17, 35, 2, 0, 300, 0, 0, 0, 2, ''), -(113, 18, 36, 2, 0, 300, 0, 0, 0, 2, ''), -(114, 18, 37, 2, 0, 300, 0, 0, 0, 2, ''), -(115, 18, 38, 2, 0, 300, 0, 0, 0, 2, ''), -(116, 18, 39, 2, 0, 300, 0, 0, 0, 2, ''); +(58, 18, 39, 1, 0, 300, 0, 0, 0, 2, ''); DROP TABLE IF EXISTS `ps_stock_mvt`; CREATE TABLE `ps_stock_mvt` ( @@ -18518,46 +12913,46 @@ CREATE TABLE `ps_stock_mvt` ( DROP TABLE IF EXISTS `ps_stock_mvt_reason`; CREATE TABLE `ps_stock_mvt_reason` ( - `id_stock_mvt_reason` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_stock_mvt_reason` int(11) unsigned NOT NULL AUTO_INCREMENT, `sign` tinyint(1) NOT NULL DEFAULT '1', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_stock_mvt_reason`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_stock_mvt_reason` (`id_stock_mvt_reason`, `sign`, `date_add`, `date_upd`, `deleted`) VALUES -(1, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(2, -1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(3, -1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(4, -1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(5, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(6, -1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(7, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(8, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(9, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(10, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(11, 1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0), -(12, -1, '2023-05-02 12:16:56', '2023-05-02 12:16:56', 0); +(1, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(2, -1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(3, -1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(4, -1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(5, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(6, -1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(7, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(8, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(9, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(10, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(11, 1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0), +(12, -1, '2023-08-28 13:26:18', '2023-08-28 13:26:18', 0); DROP TABLE IF EXISTS `ps_stock_mvt_reason_lang`; CREATE TABLE `ps_stock_mvt_reason_lang` ( - `id_stock_mvt_reason` int(10) unsigned NOT NULL, - `id_lang` int(10) unsigned NOT NULL, - `name` varchar(255) NOT NULL, + `id_stock_mvt_reason` int(11) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, + `name` varchar(255) CHARACTER SET utf8 NOT NULL, PRIMARY KEY (`id_stock_mvt_reason`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_stock_mvt_reason_lang` (`id_stock_mvt_reason`, `id_lang`, `name`) VALUES (1, 1, 'Increase'), -(1, 2, 'Erhöhung'), -(1, 3, 'Verhoog'), +(1, 2, 'Verhoog'), +(1, 3, 'Erhöhung'), (2, 1, 'Decrease'), -(2, 2, 'Reduzierung'), -(2, 3, 'Verlaag'), +(2, 2, 'Verlaag'), +(2, 3, 'Reduzierung'), (3, 1, 'Customer Order'), -(3, 2, 'Bestellung'), -(3, 3, 'Klantbestelling'), +(3, 2, 'Klantbestelling'), +(3, 3, 'Bestellung'), (4, 1, 'Regulation following an inventory of stock'), (4, 2, 'Regulation following an inventory of stock'), (4, 3, 'Regulation following an inventory of stock'), @@ -18565,20 +12960,20 @@ INSERT INTO `ps_stock_mvt_reason_lang` (`id_stock_mvt_reason`, `id_lang`, `name` (5, 2, 'Regulation following an inventory of stock'), (5, 3, 'Regulation following an inventory of stock'), (6, 1, 'Transfer to another warehouse'), -(6, 2, 'Übertragung in anderes Lager'), -(6, 3, 'Naar een ander magazijn verplaatsen'), +(6, 2, 'Naar een ander magazijn verplaatsen'), +(6, 3, 'Übertragung in anderes Lager'), (7, 1, 'Transfer from another warehouse'), -(7, 2, 'Übertragung von anderem Lager'), -(7, 3, 'Van een ander magazijn verplaatsen'), +(7, 2, 'Van een ander magazijn verplaatsen'), +(7, 3, 'Übertragung von anderem Lager'), (8, 1, 'Supply Order'), -(8, 2, 'Lieferbestellung'), -(8, 3, 'Bestelling'), +(8, 2, 'Bestelling'), +(8, 3, 'Lieferbestellung'), (9, 1, 'Customer Order'), -(9, 2, 'Bestellung'), -(9, 3, 'Klantbestelling'), +(9, 2, 'Klantbestelling'), +(9, 3, 'Bestellung'), (10, 1, 'Product return'), -(10, 2, 'Product return'), -(10, 3, 'Product return'), +(10, 2, 'Productretour'), +(10, 3, 'Warenrücksendung'), (11, 1, 'Employee Edition'), (11, 2, 'Employee Edition'), (11, 3, 'Employee Edition'), @@ -18598,30 +12993,30 @@ CREATE TABLE `ps_store` ( `phone` varchar(16) DEFAULT NULL, `fax` varchar(16) DEFAULT NULL, `email` varchar(255) DEFAULT NULL, - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_store`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_store` (`id_store`, `id_country`, `id_state`, `city`, `postcode`, `latitude`, `longitude`, `phone`, `fax`, `email`, `active`, `date_add`, `date_upd`) VALUES -(1, 21, 12, 'Miami', '33135', 25.76500500, -80.24379700, '', '', '', 1, '2023-05-02 12:18:40', '2023-05-02 12:18:40'), -(2, 21, 12, 'Miami', '33304', 26.13793600, -80.13943500, '', '', '', 1, '2023-05-02 12:18:40', '2023-05-02 12:18:40'), -(3, 21, 12, 'Miami', '33026', 26.00998700, -80.29447200, '', '', '', 1, '2023-05-02 12:18:40', '2023-05-02 12:18:40'), -(4, 21, 12, 'Miami', '33133', 25.73629600, -80.24479700, '', '', '', 1, '2023-05-02 12:18:40', '2023-05-02 12:18:40'), -(5, 21, 12, 'Miami', '33181', 25.88674000, -80.16329200, '', '', '', 1, '2023-05-02 12:18:40', '2023-05-02 12:18:40'); +(1, 21, 12, 'Miami', '33135', 25.76500500, -80.24379700, '', '', '', 1, '2023-08-28 13:28:05', '2023-08-28 13:28:05'), +(2, 21, 12, 'Miami', '33304', 26.13793600, -80.13943500, '', '', '', 1, '2023-08-28 13:28:05', '2023-08-28 13:28:05'), +(3, 21, 12, 'Miami', '33026', 26.00998700, -80.29447200, '', '', '', 1, '2023-08-28 13:28:05', '2023-08-28 13:28:05'), +(4, 21, 12, 'Miami', '33133', 25.73629600, -80.24479700, '', '', '', 1, '2023-08-28 13:28:05', '2023-08-28 13:28:05'), +(5, 21, 12, 'Miami', '33181', 25.88674000, -80.16329200, '', '', '', 1, '2023-08-28 13:28:05', '2023-08-28 13:28:05'); DROP TABLE IF EXISTS `ps_store_lang`; CREATE TABLE `ps_store_lang` ( - `id_store` int(10) unsigned NOT NULL, - `id_lang` int(10) unsigned NOT NULL, + `id_store` int(11) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, `name` varchar(255) NOT NULL, `address1` varchar(255) NOT NULL, `address2` varchar(255) DEFAULT NULL, `hours` text, `note` text, PRIMARY KEY (`id_store`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_store_lang` (`id_store`, `id_lang`, `name`, `address1`, `address2`, `hours`, `note`) VALUES (1, 1, 'Dade County', '3030 SW 8th St Miami', '', ' [[\"09:00AM - 07:00PM\"],[\"09:00AM - 07:00PM\"],[\"09:00AM - 07:00PM\"],[\"09:00AM - 07:00PM\"],[\"09:00AM - 07:00PM\"],[\"10:00AM - 04:00PM\"],[\"10:00AM - 04:00PM\"]]', ''), @@ -18642,23 +13037,18 @@ INSERT INTO `ps_store_lang` (`id_store`, `id_lang`, `name`, `address1`, `address DROP TABLE IF EXISTS `ps_store_shop`; CREATE TABLE `ps_store_shop` ( - `id_store` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_store` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_store`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_store_shop` (`id_store`, `id_shop`) VALUES (1, 1), (2, 1), (3, 1), (4, 1), -(5, 1), -(1, 2), -(2, 2), -(3, 2), -(4, 2), -(5, 2); +(5, 1); DROP TABLE IF EXISTS `ps_supplier`; CREATE TABLE `ps_supplier` ( @@ -18668,11 +13058,11 @@ CREATE TABLE `ps_supplier` ( `date_upd` datetime NOT NULL, `active` tinyint(1) NOT NULL DEFAULT '0', PRIMARY KEY (`id_supplier`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_supplier` (`id_supplier`, `name`, `date_add`, `date_upd`, `active`) VALUES -(1, 'Fashion supplier', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1), -(2, 'Accessories supplier', '2023-05-02 12:18:38', '2023-05-02 12:18:38', 1); +(1, 'Fashion supplier', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1), +(2, 'Accessories supplier', '2023-08-28 13:28:03', '2023-08-28 13:28:03', 1); DROP TABLE IF EXISTS `ps_supplier_lang`; CREATE TABLE `ps_supplier_lang` ( @@ -18683,7 +13073,7 @@ CREATE TABLE `ps_supplier_lang` ( `meta_keywords` varchar(255) DEFAULT NULL, `meta_description` varchar(512) DEFAULT NULL, PRIMARY KEY (`id_supplier`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_supplier_lang` (`id_supplier`, `id_lang`, `description`, `meta_title`, `meta_keywords`, `meta_description`) VALUES (1, 1, '', '', '', ''), @@ -18695,28 +13085,26 @@ INSERT INTO `ps_supplier_lang` (`id_supplier`, `id_lang`, `description`, `meta_t DROP TABLE IF EXISTS `ps_supplier_shop`; CREATE TABLE `ps_supplier_shop` ( - `id_supplier` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_supplier` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_supplier`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_supplier_shop` (`id_supplier`, `id_shop`) VALUES (1, 1), -(2, 1), -(1, 2), -(2, 2); +(2, 1); DROP TABLE IF EXISTS `ps_supply_order`; CREATE TABLE `ps_supply_order` ( - `id_supply_order` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_supplier` int(10) unsigned NOT NULL, + `id_supply_order` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_supplier` int(11) unsigned NOT NULL, `supplier_name` varchar(64) NOT NULL, - `id_lang` int(10) unsigned NOT NULL, - `id_warehouse` int(10) unsigned NOT NULL, - `id_supply_order_state` int(10) unsigned NOT NULL, - `id_currency` int(10) unsigned NOT NULL, - `id_ref_currency` int(10) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, + `id_warehouse` int(11) unsigned NOT NULL, + `id_supply_order_state` int(11) unsigned NOT NULL, + `id_currency` int(11) unsigned NOT NULL, + `id_ref_currency` int(11) unsigned NOT NULL, `reference` varchar(64) NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, @@ -18732,16 +13120,16 @@ CREATE TABLE `ps_supply_order` ( KEY `id_supplier` (`id_supplier`), KEY `id_warehouse` (`id_warehouse`), KEY `reference` (`reference`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_supply_order_detail`; CREATE TABLE `ps_supply_order_detail` ( - `id_supply_order_detail` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_supply_order` int(10) unsigned NOT NULL, - `id_currency` int(10) unsigned NOT NULL, - `id_product` int(10) unsigned NOT NULL, - `id_product_attribute` int(10) unsigned NOT NULL, + `id_supply_order_detail` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_supply_order` int(11) unsigned NOT NULL, + `id_currency` int(11) unsigned NOT NULL, + `id_product` int(11) unsigned NOT NULL, + `id_product_attribute` int(11) unsigned NOT NULL, `reference` varchar(64) NOT NULL, `supplier_reference` varchar(64) NOT NULL, `name` varchar(128) NOT NULL, @@ -18751,8 +13139,8 @@ CREATE TABLE `ps_supply_order_detail` ( `mpn` varchar(40) DEFAULT NULL, `exchange_rate` decimal(20,6) DEFAULT '0.000000', `unit_price_te` decimal(20,6) DEFAULT '0.000000', - `quantity_expected` int(10) unsigned NOT NULL, - `quantity_received` int(10) unsigned NOT NULL, + `quantity_expected` int(11) unsigned NOT NULL, + `quantity_received` int(11) unsigned NOT NULL, `price_te` decimal(20,6) DEFAULT '0.000000', `discount_rate` decimal(20,6) DEFAULT '0.000000', `discount_value_te` decimal(20,6) DEFAULT '0.000000', @@ -18766,44 +13154,44 @@ CREATE TABLE `ps_supply_order_detail` ( KEY `id_supply_order` (`id_supply_order`,`id_product`), KEY `id_product_attribute` (`id_product_attribute`), KEY `id_product_product_attribute` (`id_product`,`id_product_attribute`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_supply_order_history`; CREATE TABLE `ps_supply_order_history` ( - `id_supply_order_history` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_supply_order` int(10) unsigned NOT NULL, - `id_employee` int(10) unsigned NOT NULL, + `id_supply_order_history` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_supply_order` int(11) unsigned NOT NULL, + `id_employee` int(11) unsigned NOT NULL, `employee_lastname` varchar(255) DEFAULT '', `employee_firstname` varchar(255) DEFAULT '', - `id_state` int(10) unsigned NOT NULL, + `id_state` int(11) unsigned NOT NULL, `date_add` datetime NOT NULL, PRIMARY KEY (`id_supply_order_history`), KEY `id_supply_order` (`id_supply_order`), KEY `id_employee` (`id_employee`), KEY `id_state` (`id_state`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_supply_order_receipt_history`; CREATE TABLE `ps_supply_order_receipt_history` ( - `id_supply_order_receipt_history` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_supply_order_detail` int(10) unsigned NOT NULL, - `id_employee` int(10) unsigned NOT NULL, + `id_supply_order_receipt_history` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_supply_order_detail` int(11) unsigned NOT NULL, + `id_employee` int(11) unsigned NOT NULL, `employee_lastname` varchar(255) DEFAULT '', `employee_firstname` varchar(255) DEFAULT '', - `id_supply_order_state` int(10) unsigned NOT NULL, - `quantity` int(10) unsigned NOT NULL, + `id_supply_order_state` int(11) unsigned NOT NULL, + `quantity` int(11) unsigned NOT NULL, `date_add` datetime NOT NULL, PRIMARY KEY (`id_supply_order_receipt_history`), KEY `id_supply_order_detail` (`id_supply_order_detail`), KEY `id_supply_order_state` (`id_supply_order_state`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_supply_order_state`; CREATE TABLE `ps_supply_order_state` ( - `id_supply_order_state` int(10) unsigned NOT NULL AUTO_INCREMENT, + `id_supply_order_state` int(11) unsigned NOT NULL AUTO_INCREMENT, `delivery_note` tinyint(1) NOT NULL DEFAULT '0', `editable` tinyint(1) NOT NULL DEFAULT '0', `receipt_state` tinyint(1) NOT NULL DEFAULT '0', @@ -18811,7 +13199,7 @@ CREATE TABLE `ps_supply_order_state` ( `enclosed` tinyint(1) NOT NULL DEFAULT '0', `color` varchar(32) DEFAULT NULL, PRIMARY KEY (`id_supply_order_state`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_supply_order_state` (`id_supply_order_state`, `delivery_note`, `editable`, `receipt_state`, `pending_receipt`, `enclosed`, `color`) VALUES (1, 0, 1, 0, 0, 0, '#faab00'), @@ -18823,31 +13211,31 @@ INSERT INTO `ps_supply_order_state` (`id_supply_order_state`, `delivery_note`, ` DROP TABLE IF EXISTS `ps_supply_order_state_lang`; CREATE TABLE `ps_supply_order_state_lang` ( - `id_supply_order_state` int(10) unsigned NOT NULL, - `id_lang` int(10) unsigned NOT NULL, + `id_supply_order_state` int(11) unsigned NOT NULL, + `id_lang` int(11) unsigned NOT NULL, `name` varchar(128) DEFAULT NULL, PRIMARY KEY (`id_supply_order_state`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_supply_order_state_lang` (`id_supply_order_state`, `id_lang`, `name`) VALUES (1, 1, '1 - Creation in progress'), -(1, 2, '1 - In Bearbeitung'), -(1, 3, '1 - Bezig met aanmaken'), +(1, 2, '1 - Bezig met aanmaken'), +(1, 3, '1 - In Bearbeitung'), (2, 1, '2 - Order validated'), -(2, 2, '2 - Bestellung geprüft'), -(2, 3, '2 - Bestelling bevestigd'), +(2, 2, '2 - Bestelling bevestigd'), +(2, 3, '2 - Bestellung geprüft'), (3, 1, '3 - Pending receipt'), -(3, 2, '3 - Warten auf Rechnung'), -(3, 3, '3 - In afwachting van ontvangst'), +(3, 2, '3 - In afwachting van ontvangst'), +(3, 3, '3 - Warten auf Rechnung'), (4, 1, '4 - Order received in part'), -(4, 2, '4 - Teillieferung erhalten'), -(4, 3, '4 - Bestelling gedeeltelijk ontvangen'), +(4, 2, '4 - Bestelling gedeeltelijk ontvangen'), +(4, 3, '4 - Teillieferung erhalten'), (5, 1, '5 - Order received completely'), -(5, 2, '5 - Lieferung erhalten'), -(5, 3, '5 - Bestelling geheel ontvangen'), +(5, 2, '5 - Bestelling geheel ontvangen'), +(5, 3, '5 - Lieferung erhalten'), (6, 1, '6 - Order canceled'), -(6, 2, '6 - Bestellung storniert'), -(6, 3, '6 - Bestelling geannuleerd'); +(6, 2, '6 - Bestelling geannuleerd'), +(6, 3, '6 - Bestellung storniert'); DROP TABLE IF EXISTS `ps_tab`; CREATE TABLE `ps_tab` ( @@ -18909,7 +13297,7 @@ INSERT INTO `ps_tab` (`id_tab`, `id_parent`, `position`, `module`, `class_name`, (41, 39, 1, NULL, 'AdminModulesNotifications', '', 1, 1, '', 'Alerts', 'Admin.Navigation.Menu'), (42, 39, 2, NULL, 'AdminModulesUpdates', '', 1, 1, '', 'Updates', 'Admin.Navigation.Menu'), (43, 37, 2, NULL, 'AdminParentThemes', '', 1, 1, 'desktop_mac', 'Design', 'Admin.Navigation.Menu'), -(44, 125, 1, '', 'AdminThemes', '', 1, 1, '', 'Theme & Logo', 'Admin.Navigation.Menu'), +(44, 124, 1, '', 'AdminThemes', '', 1, 1, '', 'Theme & Logo', 'Admin.Navigation.Menu'), (45, 43, 1, NULL, 'AdminParentMailTheme', '', 1, 1, '', 'Email Theme', 'Admin.Navigation.Menu'), (46, 45, 0, NULL, 'AdminMailTheme', '', 1, 1, '', 'Email Theme', 'Admin.Navigation.Menu'), (47, 43, 2, NULL, 'AdminCmsContent', '', 1, 1, '', 'Pages', 'Admin.Navigation.Menu'), @@ -18989,10 +13377,10 @@ INSERT INTO `ps_tab` (`id_tab`, `id_parent`, `position`, `module`, `class_name`, (121, 119, 2, 'blockwishlist', 'WishlistStatisticsAdminController', '', 1, 1, '', NULL, NULL), (122, -1, 2, 'psgdpr', 'AdminAjaxPsgdpr', '', 1, 1, '', NULL, NULL), (123, -1, 3, 'psgdpr', 'AdminDownloadInvoicesPsgdpr', '', 1, 1, '', NULL, NULL), -(124, -1, 4, 'dashgoals', 'AdminDashgoals', '', 1, 1, '', NULL, NULL), -(125, 43, 0, '', 'AdminThemesParent', '', 1, 1, '', 'Theme & Logo', 'Admin.Navigation.Menu'), -(126, 125, 2, 'ps_themecusto', 'AdminPsThemeCustoConfiguration', '', 1, 1, '', NULL, NULL), -(127, 125, 3, 'ps_themecusto', 'AdminPsThemeCustoAdvanced', '', 1, 1, '', NULL, NULL); +(124, 43, 0, '', 'AdminThemesParent', '', 1, 1, '', 'Theme & Logo', 'Admin.Navigation.Menu'), +(125, 124, 2, 'ps_themecusto', 'AdminPsThemeCustoConfiguration', '', 1, 1, '', NULL, NULL), +(126, 124, 3, 'ps_themecusto', 'AdminPsThemeCustoAdvanced', '', 1, 1, '', NULL, NULL), +(127, -1, 4, 'dashgoals', 'AdminDashgoals', '', 1, 1, '', NULL, NULL); DROP TABLE IF EXISTS `ps_tab_lang`; CREATE TABLE `ps_tab_lang` ( @@ -19006,347 +13394,347 @@ CREATE TABLE `ps_tab_lang` ( INSERT INTO `ps_tab_lang` (`id_tab`, `id_lang`, `name`) VALUES (1, 1, 'Dashboard'), -(1, 2, 'Übersicht'), -(1, 3, 'Dashboard'), +(1, 2, 'Dashboard'), +(1, 3, 'Übersicht'), (2, 1, 'Sell'), -(2, 2, 'Verkauf'), -(2, 3, 'Verkopen'), +(2, 2, 'Verkopen'), +(2, 3, 'Verkauf'), (3, 1, 'Orders'), -(3, 2, 'Bestellungen'), -(3, 3, 'Bestellingen'), +(3, 2, 'Bestellingen'), +(3, 3, 'Bestellungen'), (4, 1, 'Orders'), -(4, 2, 'Bestellungen'), -(4, 3, 'Bestellingen'), +(4, 2, 'Bestellingen'), +(4, 3, 'Bestellungen'), (5, 1, 'Invoices'), -(5, 2, 'Rechnungen'), -(5, 3, 'Facturen'), +(5, 2, 'Facturen'), +(5, 3, 'Rechnungen'), (6, 1, 'Credit Slips'), -(6, 2, 'Rechnungskorrekturen'), -(6, 3, 'Creditnota\'s'), +(6, 2, 'Creditnota\'s'), +(6, 3, 'Rechnungskorrekturen'), (7, 1, 'Delivery Slips'), -(7, 2, 'Lieferscheine'), -(7, 3, 'Pakbonnen'), +(7, 2, 'Pakbonnen'), +(7, 3, 'Lieferscheine'), (8, 1, 'Shopping Carts'), -(8, 2, 'Warenkörbe'), -(8, 3, 'Winkelwagens'), +(8, 2, 'Winkelwagens'), +(8, 3, 'Warenkörbe'), (9, 1, 'Catalog'), -(9, 2, 'Katalog'), -(9, 3, 'Catalogus'), +(9, 2, 'Catalogus'), +(9, 3, 'Katalog'), (10, 1, 'Products'), -(10, 2, 'Artikel'), -(10, 3, 'Producten'), +(10, 2, 'Producten'), +(10, 3, 'Artikel'), (11, 1, 'Categories'), -(11, 2, 'Kategorien'), -(11, 3, 'Categorieën'), +(11, 2, 'Categorieën'), +(11, 3, 'Kategorien'), (12, 1, 'Monitoring'), -(12, 2, 'Kontrollübersicht'), -(12, 3, 'Monitoring'), +(12, 2, 'Monitoring'), +(12, 3, 'Kontrollübersicht'), (13, 1, 'Attributes & Features'), -(13, 2, 'Varianten & Eigenschaften'), -(13, 3, 'Kenmerken en functies'), +(13, 2, 'Kenmerken en functies'), +(13, 3, 'Varianten & Eigenschaften'), (14, 1, 'Attributes'), -(14, 2, 'Varianten'), -(14, 3, 'Attributen'), +(14, 2, 'Attributen'), +(14, 3, 'Varianten'), (15, 1, 'Features'), -(15, 2, 'Eigenschaften'), -(15, 3, 'Functies'), +(15, 2, 'Functies'), +(15, 3, 'Eigenschaften'), (16, 1, 'Brands & Suppliers'), -(16, 2, 'Marken & Lieferanten'), -(16, 3, 'Merken en leveranciers'), +(16, 2, 'Merken en leveranciers'), +(16, 3, 'Marken & Lieferanten'), (17, 1, 'Brands'), -(17, 2, 'Marken'), -(17, 3, 'Merken'), +(17, 2, 'Merken'), +(17, 3, 'Marken'), (18, 1, 'Suppliers'), -(18, 2, 'Lieferanten'), -(18, 3, 'Leveranciers'), +(18, 2, 'Leveranciers'), +(18, 3, 'Lieferanten'), (19, 1, 'Files'), -(19, 2, 'Dateien'), -(19, 3, 'Bestanden'), +(19, 2, 'Bestanden'), +(19, 3, 'Dateien'), (20, 1, 'Discounts'), -(20, 2, 'Rabatt'), -(20, 3, 'Kortingen'), +(20, 2, 'Kortingen'), +(20, 3, 'Rabatt'), (21, 1, 'Cart Rules'), -(21, 2, 'Warenkorb Preisregeln'), -(21, 3, 'Winkelwagenregels'), +(21, 2, 'Winkelwagenregels'), +(21, 3, 'Warenkorb Preisregeln'), (22, 1, 'Catalog Price Rules'), -(22, 2, 'Katalog Preisregeln'), -(22, 3, 'Catalogusprijsregels'), +(22, 2, 'Catalogusprijsregels'), +(22, 3, 'Katalog Preisregeln'), (23, 1, 'Stock'), -(23, 2, 'Lager'), -(23, 3, 'Voorraad'), +(23, 2, 'Voorraad'), +(23, 3, 'Lager'), (24, 1, 'Customers'), -(24, 2, 'Kunden'), -(24, 3, 'Klanten'), +(24, 2, 'Klanten'), +(24, 3, 'Kunden'), (25, 1, 'Customers'), -(25, 2, 'Kunden'), -(25, 3, 'Klanten'), +(25, 2, 'Klanten'), +(25, 3, 'Kunden'), (26, 1, 'Addresses'), (26, 2, 'Adressen'), (26, 3, 'Adressen'), (27, 1, 'Outstanding'), -(27, 2, 'Offene Posten'), -(27, 3, 'Openstaand'), +(27, 2, 'Openstaand'), +(27, 3, 'Offene Posten'), (28, 1, 'Customer Service'), -(28, 2, 'Kundenservice'), -(28, 3, 'Klantenservice'), +(28, 2, 'Klantenservice'), +(28, 3, 'Kundenservice'), (29, 1, 'Customer Service'), -(29, 2, 'Kundenservice'), -(29, 3, 'Klantenservice'), +(29, 2, 'Klantenservice'), +(29, 3, 'Kundenservice'), (30, 1, 'Order Messages'), -(30, 2, 'Bestellnachrichten'), -(30, 3, 'Bestellingsberichten'), +(30, 2, 'Bestellingsberichten'), +(30, 3, 'Bestellnachrichten'), (31, 1, 'Merchandise Returns'), -(31, 2, 'Warenrücksendungen'), -(31, 3, 'Retourzendingen'), +(31, 2, 'Retourzendingen'), +(31, 3, 'Warenrücksendungen'), (32, 1, 'Stats'), -(32, 2, 'Statistiken'), -(32, 3, 'Statistieken'), +(32, 2, 'Statistieken'), +(32, 3, 'Statistiken'), (34, 1, 'Warehouses'), -(34, 2, 'Lager'), -(34, 3, 'Magazijnen'), +(34, 2, 'Magazijnen'), +(34, 3, 'Lager'), (35, 1, 'Stock Management'), -(35, 2, 'Lagerverwaltung'), -(35, 3, 'Voorraadbeheer'), +(35, 2, 'Voorraadbeheer'), +(35, 3, 'Lagerverwaltung'), (37, 1, 'Improve'), -(37, 2, 'Optimierung'), -(37, 3, 'Verbeteren'), +(37, 2, 'Verbeteren'), +(37, 3, 'Optimierung'), (38, 1, 'Modules'), -(38, 2, 'Module'), -(38, 3, 'Modules'), +(38, 2, 'Modules'), +(38, 3, 'Module'), (39, 1, 'Module Manager'), -(39, 2, 'Modul-Verwaltung'), -(39, 3, 'Module manager'), +(39, 2, 'Module manager'), +(39, 3, 'Modul-Verwaltung'), (40, 1, 'Modules'), -(40, 2, 'Module'), -(40, 3, 'Modules'), +(40, 2, 'Modules'), +(40, 3, 'Module'), (41, 1, 'Alerts'), -(41, 2, 'Meldungen'), -(41, 3, 'Waarschuwingen'), +(41, 2, 'Waarschuwingen'), +(41, 3, 'Meldungen'), (42, 1, 'Updates'), -(42, 2, 'Aktualisierungen'), -(42, 3, 'Updates'), +(42, 2, 'Updates'), +(42, 3, 'Aktualisierungen'), (43, 1, 'Design'), (43, 2, 'Design'), (43, 3, 'Design'), (44, 1, 'Theme & Logo'), -(44, 2, 'Template und Logo'), -(44, 3, 'Thema en logo'), +(44, 2, 'Thema en logo'), +(44, 3, 'Template und Logo'), (45, 1, 'Email Theme'), -(45, 2, 'E-Mail-Theme'), -(45, 3, 'Email thema'), +(45, 2, 'Email thema'), +(45, 3, 'E-Mail-Theme'), (46, 1, 'Email Theme'), -(46, 2, 'E-Mail-Theme'), -(46, 3, 'Email thema'), +(46, 2, 'Email thema'), +(46, 3, 'E-Mail-Theme'), (47, 1, 'Pages'), -(47, 2, 'Seiten'), -(47, 3, 'Pagina\'s'), +(47, 2, 'Pagina\'s'), +(47, 3, 'Seiten'), (48, 1, 'Positions'), -(48, 2, 'Positionen'), -(48, 3, 'Posities'), +(48, 2, 'Posities'), +(48, 3, 'Positionen'), (49, 1, 'Image Settings'), -(49, 2, 'Bilder'), -(49, 3, 'Afbeeldingsinstellingen'), +(49, 2, 'Afbeeldingsinstellingen'), +(49, 3, 'Bilder'), (50, 1, 'Shipping'), -(50, 2, 'Versand'), -(50, 3, 'Verzending'), +(50, 2, 'Verzending'), +(50, 3, 'Versand'), (51, 1, 'Carriers'), -(51, 2, 'Versanddienste'), -(51, 3, 'Vervoerders'), +(51, 2, 'Vervoerders'), +(51, 3, 'Versanddienste'), (52, 1, 'Preferences'), -(52, 2, 'Voreinstellungen'), -(52, 3, 'Instellingen'), +(52, 2, 'Instellingen'), +(52, 3, 'Voreinstellungen'), (53, 1, 'Payment'), -(53, 2, 'Zahlung'), -(53, 3, 'Betaling'), +(53, 2, 'Betaling'), +(53, 3, 'Zahlung'), (54, 1, 'Payment Methods'), -(54, 2, 'Zahlungsarten'), -(54, 3, 'Betaalmethoden'), +(54, 2, 'Betaalmethoden'), +(54, 3, 'Zahlungsarten'), (55, 1, 'Preferences'), -(55, 2, 'Voreinstellungen'), -(55, 3, 'Instellingen'), +(55, 2, 'Instellingen'), +(55, 3, 'Voreinstellungen'), (56, 1, 'International'), -(56, 2, 'International'), -(56, 3, 'Internationaal'), +(56, 2, 'Internationaal'), +(56, 3, 'International'), (57, 1, 'Localization'), -(57, 2, 'Lokalisierung'), -(57, 3, 'Lokalisatie'), +(57, 2, 'Lokalisatie'), +(57, 3, 'Lokalisierung'), (58, 1, 'Localization'), -(58, 2, 'Lokalisierung'), -(58, 3, 'Lokalisatie'), +(58, 2, 'Lokalisatie'), +(58, 3, 'Lokalisierung'), (59, 1, 'Languages'), -(59, 2, 'Sprachen'), -(59, 3, 'Talen'), +(59, 2, 'Talen'), +(59, 3, 'Sprachen'), (60, 1, 'Currencies'), -(60, 2, 'Währungen'), -(60, 3, 'Valuta\'s'), +(60, 2, 'Valuta\'s'), +(60, 3, 'Währungen'), (61, 1, 'Geolocation'), -(61, 2, 'Geotargeting'), -(61, 3, 'Geolocatie'), +(61, 2, 'Geolocatie'), +(61, 3, 'Geotargeting'), (62, 1, 'Locations'), -(62, 2, 'Länder & Gebiete'), -(62, 3, 'Locaties'), +(62, 2, 'Locaties'), +(62, 3, 'Länder & Gebiete'), (63, 1, 'Zones'), -(63, 2, 'Gebiete'), -(63, 3, 'Zones'), +(63, 2, 'Zones'), +(63, 3, 'Gebiete'), (64, 1, 'Countries'), -(64, 2, 'Länder'), -(64, 3, 'Landen'), +(64, 2, 'Landen'), +(64, 3, 'Länder'), (65, 1, 'States'), -(65, 2, 'Bundesländer'), -(65, 3, 'Provincies'), +(65, 2, 'Provincies'), +(65, 3, 'Bundesländer'), (66, 1, 'Taxes'), -(66, 2, 'Steuersätze'), -(66, 3, 'BTW'), +(66, 2, 'BTW'), +(66, 3, 'Steuersätze'), (67, 1, 'Taxes'), -(67, 2, 'Steuersätze'), -(67, 3, 'BTW'), +(67, 2, 'BTW'), +(67, 3, 'Steuersätze'), (68, 1, 'Tax Rules'), -(68, 2, 'Steuerregeln'), -(68, 3, 'Belastingregel'), +(68, 2, 'Belastingregel'), +(68, 3, 'Steuerregeln'), (69, 1, 'Translations'), -(69, 2, 'Übersetzungen'), -(69, 3, 'Vertalingen'), +(69, 2, 'Vertalingen'), +(69, 3, 'Übersetzungen'), (70, 1, 'Configure'), -(70, 2, 'Einstellungen'), -(70, 3, 'Configureer'), +(70, 2, 'Configureer'), +(70, 3, 'Einstellungen'), (71, 1, 'Shop Parameters'), -(71, 2, 'Shop-Einstellungen'), -(71, 3, 'Winkelinstellingen'), +(71, 2, 'Winkelinstellingen'), +(71, 3, 'Shop-Einstellungen'), (72, 1, 'General'), -(72, 2, 'Allgemein'), -(72, 3, 'Algemeen'), +(72, 2, 'Algemeen'), +(72, 3, 'Allgemein'), (73, 1, 'General'), -(73, 2, 'Allgemein'), -(73, 3, 'Algemeen'), +(73, 2, 'Algemeen'), +(73, 3, 'Allgemein'), (74, 1, 'Maintenance'), -(74, 2, 'Wartung'), -(74, 3, 'Onderhoud'), +(74, 2, 'Onderhoud'), +(74, 3, 'Wartung'), (75, 1, 'Order Settings'), -(75, 2, 'Bestellungen'), -(75, 3, 'Bestellingsinstellingen'), +(75, 2, 'Bestellingsinstellingen'), +(75, 3, 'Bestellungen'), (76, 1, 'Order Settings'), -(76, 2, 'Bestellungen'), -(76, 3, 'Bestellingsinstellingen'), +(76, 2, 'Bestellingsinstellingen'), +(76, 3, 'Bestellungen'), (77, 1, 'Statuses'), -(77, 2, 'Status'), -(77, 3, 'Statussen'), +(77, 2, 'Statussen'), +(77, 3, 'Status'), (78, 1, 'Product Settings'), -(78, 2, 'Artikel'), -(78, 3, 'Producten'), +(78, 2, 'Producten'), +(78, 3, 'Artikel'), (79, 1, 'Customer Settings'), -(79, 2, 'Benutzerdefinierte Einstellungen'), -(79, 3, 'Klantinstellingen'), +(79, 2, 'Klantinstellingen'), +(79, 3, 'Benutzerdefinierte Einstellungen'), (80, 1, 'Customer Settings'), -(80, 2, 'Benutzerdefinierte Einstellungen'), -(80, 3, 'Klantinstellingen'), +(80, 2, 'Klantinstellingen'), +(80, 3, 'Benutzerdefinierte Einstellungen'), (81, 1, 'Groups'), -(81, 2, 'Gruppen'), -(81, 3, 'Groepen'), +(81, 2, 'Groepen'), +(81, 3, 'Gruppen'), (82, 1, 'Titles'), -(82, 2, 'Bezeichnung'), -(82, 3, 'Sociale titels'), +(82, 2, 'Sociale titels'), +(82, 3, 'Bezeichnung'), (83, 1, 'Contact'), -(83, 2, 'Kontakt'), -(83, 3, 'Contact'), +(83, 2, 'Contact'), +(83, 3, 'Kontakt'), (84, 1, 'Contacts'), -(84, 2, 'Kontakte'), -(84, 3, 'Contactpersonen'), +(84, 2, 'Contactpersonen'), +(84, 3, 'Kontakte'), (85, 1, 'Stores'), -(85, 2, 'Shops'), -(85, 3, 'Winkels'), +(85, 2, 'Winkels'), +(85, 3, 'Shops'), (86, 1, 'Traffic & SEO'), -(86, 2, 'Traffic & SEO'), -(86, 3, 'Verkeer en SEO'), +(86, 2, 'Verkeer en SEO'), +(86, 3, 'Traffic & SEO'), (87, 1, 'SEO & URLs'), -(87, 2, 'SEO & URLs'), -(87, 3, 'SEO & URL\'s'), +(87, 2, 'SEO & URL\'s'), +(87, 3, 'SEO & URLs'), (88, 1, 'Search Engines'), -(88, 2, 'Suchmaschinen'), -(88, 3, 'Zoekmachines'), +(88, 2, 'Zoekmachines'), +(88, 3, 'Suchmaschinen'), (89, 1, 'Search'), -(89, 2, 'Suche'), -(89, 3, 'Zoeken'), +(89, 2, 'Zoeken'), +(89, 3, 'Suche'), (90, 1, 'Search'), -(90, 2, 'Suche'), -(90, 3, 'Zoeken'), +(90, 2, 'Zoeken'), +(90, 3, 'Suche'), (91, 1, 'Tags'), -(91, 2, 'Stichwörter'), -(91, 3, 'Tags'), +(91, 2, 'Tags'), +(91, 3, 'Stichwörter'), (92, 1, 'Advanced Parameters'), -(92, 2, 'Erweiterte Einstellungen'), -(92, 3, 'Geavanceerde instellingen'), +(92, 2, 'Geavanceerde instellingen'), +(92, 3, 'Erweiterte Einstellungen'), (93, 1, 'Information'), -(93, 2, 'Informationen'), -(93, 3, 'Informatie'), +(93, 2, 'Informatie'), +(93, 3, 'Informationen'), (94, 1, 'Performance'), -(94, 2, 'Leistung'), -(94, 3, 'Prestaties'), +(94, 2, 'Prestaties'), +(94, 3, 'Leistung'), (95, 1, 'Administration'), -(95, 2, 'Verwaltung'), -(95, 3, 'Administratie'), +(95, 2, 'Administratie'), +(95, 3, 'Verwaltung'), (96, 1, 'E-mail'), (96, 2, 'E-mail'), (96, 3, 'E-mail'), (97, 1, 'Import'), -(97, 2, 'Importieren'), -(97, 3, 'Importeren'), +(97, 2, 'Importeren'), +(97, 3, 'Importieren'), (98, 1, 'Team'), -(98, 2, 'Benutzerrechte'), -(98, 3, 'Medewerkers'), +(98, 2, 'Medewerkers'), +(98, 3, 'Benutzerrechte'), (99, 1, 'Employees'), -(99, 2, 'Mitarbeiter'), -(99, 3, 'Medewerkers'), +(99, 2, 'Medewerkers'), +(99, 3, 'Mitarbeiter'), (100, 1, 'Profiles'), -(100, 2, 'Profile'), -(100, 3, 'Profielen'), +(100, 2, 'Profielen'), +(100, 3, 'Profile'), (101, 1, 'Permissions'), -(101, 2, 'Berechtigungen'), -(101, 3, 'Permissies'), +(101, 2, 'Permissies'), +(101, 3, 'Berechtigungen'), (102, 1, 'Database'), -(102, 2, 'Datenbank'), -(102, 3, 'Database'), +(102, 2, 'Database'), +(102, 3, 'Datenbank'), (103, 1, 'SQL Manager'), -(103, 2, 'SQL-Abfragen'), -(103, 3, 'SQL-beheer'), +(103, 2, 'SQL-beheer'), +(103, 3, 'SQL-Abfragen'), (104, 1, 'DB Backup'), -(104, 2, 'Datenbank-Backup'), -(104, 3, 'DB-backup'), +(104, 2, 'DB-backup'), +(104, 3, 'Datenbank-Backup'), (105, 1, 'Logs'), -(105, 2, 'Log-Dateien'), -(105, 3, 'Logboeken'), +(105, 2, 'Logboeken'), +(105, 3, 'Log-Dateien'), (106, 1, 'Webservice'), (106, 2, 'Webservice'), (106, 3, 'Webservice'), (107, 1, 'Multistore'), -(107, 2, 'Multishop'), -(107, 3, 'Multistore'), +(107, 2, 'Multistore'), +(107, 3, 'Multishop'), (108, 1, 'Multistore'), -(108, 2, 'Multishop'), -(108, 3, 'Multistore'), +(108, 2, 'Multistore'), +(108, 3, 'Multishop'), (109, 1, 'New & Experimental Features'), -(109, 2, 'New & Experimental Features'), -(109, 3, 'Nieuwe en experimentele functies'), +(109, 2, 'Nieuwe en experimentele functies'), +(109, 3, 'Neue & experimentelle Funktionen'), (110, 1, 'Security'), -(110, 2, 'Security'), +(110, 2, 'Beveiliging'), (110, 3, 'Security'), (111, 1, 'Security'), -(111, 2, 'Security'), +(111, 2, 'Beveiliging'), (111, 3, 'Security'), (112, 1, 'Employee Sessions'), -(112, 2, 'Employee Sessions'), +(112, 2, 'Werknemer sessies'), (112, 3, 'Employee Sessions'), (113, 1, 'Customer Sessions'), -(113, 2, 'Customer Sessions'), +(113, 2, 'Klantensessies'), (113, 3, 'Customer Sessions'), (114, 1, 'Quick Access'), -(114, 2, 'Schnellzugriff'), -(114, 3, 'Snelle toegang'), +(114, 2, 'Snelle toegang'), +(114, 3, 'Schnellzugriff'), (115, 1, 'More'), -(115, 2, 'Mehr'), -(115, 3, 'Meer'), +(115, 2, 'Meer'), +(115, 3, 'Mehr'), (117, 1, 'Link List'), -(117, 2, 'Link List'), -(117, 3, 'Link List'), +(117, 2, 'Linklijst'), +(117, 3, 'Linkliste'), (118, 1, 'AdminBlockListing'), (118, 2, 'AdminBlockListing'), (118, 3, 'AdminBlockListing'), @@ -19354,8 +13742,8 @@ INSERT INTO `ps_tab_lang` (`id_tab`, `id_lang`, `name`) VALUES (119, 2, 'Wishlist Module'), (119, 3, 'Wishlist Module'), (120, 1, 'Configuration'), -(120, 2, 'Einstellungen'), -(120, 3, 'Configuratie'), +(120, 2, 'Configuratie'), +(120, 3, 'Einstellungen'), (121, 1, 'Statistics'), (121, 2, 'Statistics'), (121, 3, 'Statistics'), @@ -19365,18 +13753,18 @@ INSERT INTO `ps_tab_lang` (`id_tab`, `id_lang`, `name`) VALUES (123, 1, 'Official GDPR compliance'), (123, 2, 'Official GDPR compliance'), (123, 3, 'Official GDPR compliance'), -(124, 1, 'Dashgoals'), -(124, 2, 'Dashgoals'), -(124, 3, 'Dashgoals'), -(125, 1, 'Theme & Logo'), -(125, 2, 'Template und Logo'), -(125, 3, 'Thema en logo'), -(126, 1, 'Pages Configuration'), -(126, 2, 'Pages Configuration'), -(126, 3, 'Pages Configuration'), -(127, 1, 'Advanced Customization'), -(127, 2, 'Advanced Customization'), -(127, 3, 'Advanced Customization'); +(124, 1, 'Theme & Logo'), +(124, 2, 'Thema en logo'), +(124, 3, 'Template und Logo'), +(125, 1, 'Pages Configuration'), +(125, 2, 'Pages Configuration'), +(125, 3, 'Pages Configuration'), +(126, 1, 'Advanced Customization'), +(126, 2, 'Advanced Customization'), +(126, 3, 'Advanced Customization'), +(127, 1, 'Dashgoals'), +(127, 2, 'Dashgoals'), +(127, 3, 'Dashgoals'); DROP TABLE IF EXISTS `ps_tab_module_preference`; CREATE TABLE `ps_tab_module_preference` ( @@ -19386,7 +13774,7 @@ CREATE TABLE `ps_tab_module_preference` ( `module` varchar(191) NOT NULL, PRIMARY KEY (`id_tab_module_preference`), UNIQUE KEY `employee_module` (`id_employee`,`id_tab`,`module`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_tag`; @@ -19397,7 +13785,7 @@ CREATE TABLE `ps_tag` ( PRIMARY KEY (`id_tag`), KEY `tag_name` (`name`), KEY `id_lang` (`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_tag_count`; @@ -19405,54 +13793,54 @@ CREATE TABLE `ps_tag_count` ( `id_group` int(10) unsigned NOT NULL DEFAULT '0', `id_tag` int(10) unsigned NOT NULL DEFAULT '0', `id_lang` int(10) unsigned NOT NULL DEFAULT '0', - `id_shop` int(10) unsigned NOT NULL DEFAULT '0', + `id_shop` int(11) unsigned NOT NULL DEFAULT '0', `counter` int(10) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_group`,`id_tag`), KEY `id_group` (`id_group`,`id_lang`,`id_shop`,`counter`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_tax`; CREATE TABLE `ps_tax` ( `id_tax` int(10) unsigned NOT NULL AUTO_INCREMENT, `rate` decimal(10,3) NOT NULL, - `active` tinyint(3) unsigned NOT NULL DEFAULT '1', - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '1', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_tax`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_tax` (`id_tax`, `rate`, `active`, `deleted`) VALUES -(1, 19.000, 1, 0), -(2, 7.000, 1, 0), +(1, 21.000, 1, 0), +(2, 9.000, 1, 0), (3, 20.000, 1, 0), (4, 21.000, 1, 0), (5, 20.000, 1, 0), (6, 19.000, 1, 0), (7, 21.000, 1, 0), -(8, 25.000, 1, 0), -(9, 20.000, 1, 0), -(10, 21.000, 1, 0), -(11, 24.000, 1, 0), -(12, 20.000, 1, 0), +(8, 19.000, 1, 0), +(9, 25.000, 1, 0), +(10, 20.000, 1, 0), +(11, 21.000, 1, 0), +(12, 24.000, 1, 0), (13, 20.000, 1, 0), -(14, 24.000, 1, 0), -(15, 25.000, 1, 0), -(16, 27.000, 1, 0), -(17, 23.000, 1, 0), -(18, 22.000, 1, 0), -(19, 21.000, 1, 0), -(20, 17.000, 1, 0), -(21, 21.000, 1, 0), -(22, 20.000, 1, 0), -(23, 18.000, 1, 0), -(24, 21.000, 1, 0), +(14, 20.000, 1, 0), +(15, 24.000, 1, 0), +(16, 25.000, 1, 0), +(17, 27.000, 1, 0), +(18, 23.000, 1, 0), +(19, 22.000, 1, 0), +(20, 21.000, 1, 0), +(21, 17.000, 1, 0), +(22, 21.000, 1, 0), +(23, 20.000, 1, 0), +(24, 18.000, 1, 0), (25, 23.000, 1, 0), (26, 23.000, 1, 0), (27, 19.000, 1, 0), (28, 25.000, 1, 0), (29, 22.000, 1, 0), (30, 20.000, 1, 0), -(31, 9.000, 1, 0); +(31, 7.000, 1, 0); DROP TABLE IF EXISTS `ps_tax_lang`; CREATE TABLE `ps_tax_lang` ( @@ -19460,15 +13848,15 @@ CREATE TABLE `ps_tax_lang` ( `id_lang` int(10) unsigned NOT NULL, `name` varchar(32) NOT NULL, PRIMARY KEY (`id_tax`,`id_lang`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_tax_lang` (`id_tax`, `id_lang`, `name`) VALUES -(1, 1, 'MwSt. DE 19%'), -(1, 2, 'MwSt. DE 19%'), -(1, 3, 'MwSt. DE 19%'), -(2, 1, 'MwSt. DE 7%'), -(2, 2, 'MwSt. DE 7%'), -(2, 3, 'MwSt. DE 7%'), +(1, 1, 'BTW NL 21%'), +(1, 2, 'BTW NL 21%'), +(1, 3, 'BTW NL 21%'), +(2, 1, 'BTW NL 9%'), +(2, 2, 'BTW NL 9%'), +(2, 3, 'BTW NL 9%'), (3, 1, 'USt. AT 20%'), (3, 2, 'USt. AT 20%'), (3, 3, 'USt. AT 20%'), @@ -19484,57 +13872,57 @@ INSERT INTO `ps_tax_lang` (`id_tax`, `id_lang`, `name`) VALUES (7, 1, 'DPH CZ 21%'), (7, 2, 'DPH CZ 21%'), (7, 3, 'DPH CZ 21%'), -(8, 1, 'moms DK 25%'), -(8, 2, 'moms DK 25%'), -(8, 3, 'moms DK 25%'), -(9, 1, 'km EE 20%'), -(9, 2, 'km EE 20%'), -(9, 3, 'km EE 20%'), -(10, 1, 'IVA ES 21%'), -(10, 2, 'IVA ES 21%'), -(10, 3, 'IVA ES 21%'), -(11, 1, 'ALV FI 24%'), -(11, 2, 'ALV FI 24%'), -(11, 3, 'ALV FI 24%'), -(12, 1, 'TVA FR 20%'), -(12, 2, 'TVA FR 20%'), -(12, 3, 'TVA FR 20%'), -(13, 1, 'VAT UK 20%'), -(13, 2, 'VAT UK 20%'), -(13, 3, 'VAT UK 20%'), -(14, 1, 'ΦΠΑ GR 24%'), -(14, 2, 'ΦΠΑ GR 24%'), -(14, 3, 'ΦΠΑ GR 24%'), -(15, 1, 'Croatia PDV 25%'), -(15, 2, 'Croatia PDV 25%'), -(15, 3, 'Croatia PDV 25%'), -(16, 1, 'ÁFA HU 27%'), -(16, 2, 'ÁFA HU 27%'), -(16, 3, 'ÁFA HU 27%'), -(17, 1, 'VAT IE 23%'), -(17, 2, 'VAT IE 23%'), -(17, 3, 'VAT IE 23%'), -(18, 1, 'IVA IT 22%'), -(18, 2, 'IVA IT 22%'), -(18, 3, 'IVA IT 22%'), -(19, 1, 'PVM LT 21%'), -(19, 2, 'PVM LT 21%'), -(19, 3, 'PVM LT 21%'), -(20, 1, 'TVA LU 17%'), -(20, 2, 'TVA LU 17%'), -(20, 3, 'TVA LU 17%'), -(21, 1, 'PVN LV 21%'), -(21, 2, 'PVN LV 21%'), -(21, 3, 'PVN LV 21%'), -(22, 1, 'TVA MC 20%'), -(22, 2, 'TVA MC 20%'), -(22, 3, 'TVA MC 20%'), -(23, 1, 'VAT MT 18%'), -(23, 2, 'VAT MT 18%'), -(23, 3, 'VAT MT 18%'), -(24, 1, 'BTW NL 21%'), -(24, 2, 'BTW NL 21%'), -(24, 3, 'BTW NL 21%'), +(8, 1, 'MwSt. DE 19%'), +(8, 2, 'MwSt. DE 19%'), +(8, 3, 'MwSt. DE 19%'), +(9, 1, 'moms DK 25%'), +(9, 2, 'moms DK 25%'), +(9, 3, 'moms DK 25%'), +(10, 1, 'km EE 20%'), +(10, 2, 'km EE 20%'), +(10, 3, 'km EE 20%'), +(11, 1, 'IVA ES 21%'), +(11, 2, 'IVA ES 21%'), +(11, 3, 'IVA ES 21%'), +(12, 1, 'ALV FI 24%'), +(12, 2, 'ALV FI 24%'), +(12, 3, 'ALV FI 24%'), +(13, 1, 'TVA FR 20%'), +(13, 2, 'TVA FR 20%'), +(13, 3, 'TVA FR 20%'), +(14, 1, 'VAT UK 20%'), +(14, 2, 'VAT UK 20%'), +(14, 3, 'VAT UK 20%'), +(15, 1, 'ΦΠΑ GR 24%'), +(15, 2, 'ΦΠΑ GR 24%'), +(15, 3, 'ΦΠΑ GR 24%'), +(16, 1, 'Croatia PDV 25%'), +(16, 2, 'Croatia PDV 25%'), +(16, 3, 'Croatia PDV 25%'), +(17, 1, 'ÁFA HU 27%'), +(17, 2, 'ÁFA HU 27%'), +(17, 3, 'ÁFA HU 27%'), +(18, 1, 'VAT IE 23%'), +(18, 2, 'VAT IE 23%'), +(18, 3, 'VAT IE 23%'), +(19, 1, 'IVA IT 22%'), +(19, 2, 'IVA IT 22%'), +(19, 3, 'IVA IT 22%'), +(20, 1, 'PVM LT 21%'), +(20, 2, 'PVM LT 21%'), +(20, 3, 'PVM LT 21%'), +(21, 1, 'TVA LU 17%'), +(21, 2, 'TVA LU 17%'), +(21, 3, 'TVA LU 17%'), +(22, 1, 'PVN LV 21%'), +(22, 2, 'PVN LV 21%'), +(22, 3, 'PVN LV 21%'), +(23, 1, 'TVA MC 20%'), +(23, 2, 'TVA MC 20%'), +(23, 3, 'TVA MC 20%'), +(24, 1, 'VAT MT 18%'), +(24, 2, 'VAT MT 18%'), +(24, 3, 'VAT MT 18%'), (25, 1, 'PTU PL 23%'), (25, 2, 'PTU PL 23%'), (25, 3, 'PTU PL 23%'), @@ -19553,9 +13941,9 @@ INSERT INTO `ps_tax_lang` (`id_tax`, `id_lang`, `name`) VALUES (30, 1, 'DPH SK 20%'), (30, 2, 'DPH SK 20%'), (30, 3, 'DPH SK 20%'), -(31, 1, 'BTW NL 9%'), -(31, 2, 'BTW NL 9%'), -(31, 3, 'BTW NL 9%'); +(31, 1, 'MwSt. DE 7%'), +(31, 2, 'MwSt. DE 7%'), +(31, 3, 'MwSt. DE 7%'); DROP TABLE IF EXISTS `ps_tax_rule`; CREATE TABLE `ps_tax_rule` ( @@ -19572,7 +13960,7 @@ CREATE TABLE `ps_tax_rule` ( KEY `id_tax_rules_group` (`id_tax_rules_group`), KEY `id_tax` (`id_tax`), KEY `category_getproducts` (`id_tax_rules_group`,`id_country`,`id_state`,`zipcode_from`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_tax_rule` (`id_tax_rule`, `id_tax_rules_group`, `id_country`, `id_state`, `zipcode_from`, `zipcode_to`, `id_tax`, `behavior`, `description`) VALUES (1, 1, 3, 0, '0', '0', 1, 0, ''), @@ -19691,64 +14079,64 @@ INSERT INTO `ps_tax_rule` (`id_tax_rule`, `id_tax_rules_group`, `id_country`, `i (114, 4, 7, 0, '0', '0', 2, 0, ''), (115, 4, 18, 0, '0', '0', 2, 0, ''), (116, 4, 17, 0, '0', '0', 2, 0, ''), -(117, 5, 1, 0, '0', '0', 1, 0, ''), +(117, 5, 13, 0, '0', '0', 1, 0, ''), (118, 5, 2, 0, '0', '0', 3, 0, ''), (119, 5, 3, 0, '0', '0', 4, 0, ''), (120, 5, 233, 0, '0', '0', 5, 0, ''), (121, 5, 76, 0, '0', '0', 6, 0, ''), (122, 5, 16, 0, '0', '0', 7, 0, ''), -(123, 5, 20, 0, '0', '0', 8, 0, ''), -(124, 5, 86, 0, '0', '0', 9, 0, ''), -(125, 5, 6, 0, '0', '0', 10, 0, ''), -(126, 5, 7, 0, '0', '0', 11, 0, ''), -(127, 5, 8, 0, '0', '0', 12, 0, ''), -(128, 5, 17, 0, '0', '0', 13, 0, ''), -(129, 5, 9, 0, '0', '0', 14, 0, ''), -(130, 5, 74, 0, '0', '0', 15, 0, ''), -(131, 5, 142, 0, '0', '0', 16, 0, ''), -(132, 5, 26, 0, '0', '0', 17, 0, ''), -(133, 5, 10, 0, '0', '0', 18, 0, ''), -(134, 5, 130, 0, '0', '0', 19, 0, ''), -(135, 5, 12, 0, '0', '0', 20, 0, ''), -(136, 5, 124, 0, '0', '0', 21, 0, ''), -(137, 5, 147, 0, '0', '0', 22, 0, ''), -(138, 5, 138, 0, '0', '0', 23, 0, ''), -(139, 5, 13, 0, '0', '0', 24, 0, ''), +(123, 5, 1, 0, '0', '0', 8, 0, ''), +(124, 5, 20, 0, '0', '0', 9, 0, ''), +(125, 5, 86, 0, '0', '0', 10, 0, ''), +(126, 5, 6, 0, '0', '0', 11, 0, ''), +(127, 5, 7, 0, '0', '0', 12, 0, ''), +(128, 5, 8, 0, '0', '0', 13, 0, ''), +(129, 5, 17, 0, '0', '0', 14, 0, ''), +(130, 5, 9, 0, '0', '0', 15, 0, ''), +(131, 5, 74, 0, '0', '0', 16, 0, ''), +(132, 5, 142, 0, '0', '0', 17, 0, ''), +(133, 5, 26, 0, '0', '0', 18, 0, ''), +(134, 5, 10, 0, '0', '0', 19, 0, ''), +(135, 5, 130, 0, '0', '0', 20, 0, ''), +(136, 5, 12, 0, '0', '0', 21, 0, ''), +(137, 5, 124, 0, '0', '0', 22, 0, ''), +(138, 5, 147, 0, '0', '0', 23, 0, ''), +(139, 5, 138, 0, '0', '0', 24, 0, ''), (140, 5, 14, 0, '0', '0', 25, 0, ''), (141, 5, 15, 0, '0', '0', 26, 0, ''), (142, 5, 36, 0, '0', '0', 27, 0, ''), (143, 5, 18, 0, '0', '0', 28, 0, ''), (144, 5, 191, 0, '0', '0', 29, 0, ''), (145, 5, 37, 0, '0', '0', 30, 0, ''), -(146, 6, 3, 0, '0', '0', 24, 0, ''), -(147, 6, 233, 0, '0', '0', 24, 0, ''), -(148, 6, 16, 0, '0', '0', 24, 0, ''), -(149, 6, 20, 0, '0', '0', 24, 0, ''), -(150, 6, 1, 0, '0', '0', 24, 0, ''), -(151, 6, 86, 0, '0', '0', 24, 0, ''), -(152, 6, 9, 0, '0', '0', 24, 0, ''), -(153, 6, 74, 0, '0', '0', 24, 0, ''), -(154, 6, 6, 0, '0', '0', 24, 0, ''), -(155, 6, 8, 0, '0', '0', 24, 0, ''), -(156, 6, 147, 0, '0', '0', 24, 0, ''), -(157, 6, 26, 0, '0', '0', 24, 0, ''), -(158, 6, 10, 0, '0', '0', 24, 0, ''), -(159, 6, 76, 0, '0', '0', 24, 0, ''), -(160, 6, 124, 0, '0', '0', 24, 0, ''), -(161, 6, 130, 0, '0', '0', 24, 0, ''), -(162, 6, 12, 0, '0', '0', 24, 0, ''), -(163, 6, 142, 0, '0', '0', 24, 0, ''), -(164, 6, 138, 0, '0', '0', 24, 0, ''), -(165, 6, 13, 0, '0', '0', 24, 0, ''), -(166, 6, 2, 0, '0', '0', 24, 0, ''), -(167, 6, 14, 0, '0', '0', 24, 0, ''), -(168, 6, 15, 0, '0', '0', 24, 0, ''), -(169, 6, 36, 0, '0', '0', 24, 0, ''), -(170, 6, 191, 0, '0', '0', 24, 0, ''), -(171, 6, 37, 0, '0', '0', 24, 0, ''), -(172, 6, 7, 0, '0', '0', 24, 0, ''), -(173, 6, 18, 0, '0', '0', 24, 0, ''), -(174, 6, 17, 0, '0', '0', 24, 0, ''), +(146, 6, 3, 0, '0', '0', 8, 0, ''), +(147, 6, 233, 0, '0', '0', 8, 0, ''), +(148, 6, 16, 0, '0', '0', 8, 0, ''), +(149, 6, 20, 0, '0', '0', 8, 0, ''), +(150, 6, 1, 0, '0', '0', 8, 0, ''), +(151, 6, 86, 0, '0', '0', 8, 0, ''), +(152, 6, 9, 0, '0', '0', 8, 0, ''), +(153, 6, 74, 0, '0', '0', 8, 0, ''), +(154, 6, 6, 0, '0', '0', 8, 0, ''), +(155, 6, 8, 0, '0', '0', 8, 0, ''), +(156, 6, 147, 0, '0', '0', 8, 0, ''), +(157, 6, 26, 0, '0', '0', 8, 0, ''), +(158, 6, 10, 0, '0', '0', 8, 0, ''), +(159, 6, 76, 0, '0', '0', 8, 0, ''), +(160, 6, 124, 0, '0', '0', 8, 0, ''), +(161, 6, 130, 0, '0', '0', 8, 0, ''), +(162, 6, 12, 0, '0', '0', 8, 0, ''), +(163, 6, 142, 0, '0', '0', 8, 0, ''), +(164, 6, 138, 0, '0', '0', 8, 0, ''), +(165, 6, 13, 0, '0', '0', 8, 0, ''), +(166, 6, 2, 0, '0', '0', 8, 0, ''), +(167, 6, 14, 0, '0', '0', 8, 0, ''), +(168, 6, 15, 0, '0', '0', 8, 0, ''), +(169, 6, 36, 0, '0', '0', 8, 0, ''), +(170, 6, 191, 0, '0', '0', 8, 0, ''), +(171, 6, 37, 0, '0', '0', 8, 0, ''), +(172, 6, 7, 0, '0', '0', 8, 0, ''), +(173, 6, 18, 0, '0', '0', 8, 0, ''), +(174, 6, 17, 0, '0', '0', 8, 0, ''), (175, 7, 3, 0, '0', '0', 31, 0, ''), (176, 7, 233, 0, '0', '0', 31, 0, ''), (177, 7, 16, 0, '0', '0', 31, 0, ''), @@ -19842,30 +14230,30 @@ CREATE TABLE `ps_tax_rules_group` ( `id_tax_rules_group` int(11) NOT NULL AUTO_INCREMENT, `name` varchar(50) NOT NULL, `active` int(11) NOT NULL, - `deleted` tinyint(3) unsigned NOT NULL, + `deleted` tinyint(1) unsigned NOT NULL, `date_add` datetime NOT NULL, `date_upd` datetime NOT NULL, PRIMARY KEY (`id_tax_rules_group`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_tax_rules_group` (`id_tax_rules_group`, `name`, `active`, `deleted`, `date_add`, `date_upd`) VALUES -(1, 'DE Standard Rate (19%)', 1, 0, '2023-05-08 16:58:27', '2023-05-08 16:58:27'), -(2, 'DE Reduced Rate (7%)', 1, 0, '2023-05-08 16:58:28', '2023-05-08 16:58:28'), -(3, 'DE Foodstuff Rate (7%)', 1, 0, '2023-05-08 16:58:28', '2023-05-08 16:58:28'), -(4, 'DE Books Rate (7%)', 1, 0, '2023-05-08 16:58:28', '2023-05-08 16:58:28'), -(5, 'EU VAT For Virtual Products', 1, 0, '2023-05-08 16:58:28', '2023-05-08 16:58:28'), -(6, 'NL Standard Rate (21%)', 1, 0, '2023-05-15 10:30:54', '2023-05-15 10:30:54'), -(7, 'NL Reduced Rate (9%)', 1, 0, '2023-05-15 10:30:54', '2023-05-15 10:30:54'), -(8, 'NL Foodstuff Rate (9%)', 1, 0, '2023-05-15 10:30:54', '2023-05-15 10:30:54'), -(9, 'NL Books Rate (9%)', 1, 0, '2023-05-15 10:30:54', '2023-05-15 10:30:54'); +(1, 'NL Standard Rate (21%)', 1, 0, '2023-08-28 13:46:53', '2023-08-28 13:46:53'), +(2, 'NL Reduced Rate (9%)', 1, 0, '2023-08-28 13:46:54', '2023-08-28 13:46:54'), +(3, 'NL Foodstuff Rate (9%)', 1, 0, '2023-08-28 13:46:54', '2023-08-28 13:46:54'), +(4, 'NL Books Rate (9%)', 1, 0, '2023-08-28 13:46:54', '2023-08-28 13:46:54'), +(5, 'EU VAT For Virtual Products', 1, 0, '2023-08-28 13:46:54', '2023-08-28 13:46:54'), +(6, 'DE Standard Rate (19%)', 1, 0, '2023-08-28 13:47:43', '2023-08-28 13:47:43'), +(7, 'DE Reduced Rate (7%)', 1, 0, '2023-08-28 13:47:43', '2023-08-28 13:47:43'), +(8, 'DE Foodstuff Rate (7%)', 1, 0, '2023-08-28 13:47:43', '2023-08-28 13:47:43'), +(9, 'DE Books Rate (7%)', 1, 0, '2023-08-28 13:47:43', '2023-08-28 13:47:43'); DROP TABLE IF EXISTS `ps_tax_rules_group_shop`; CREATE TABLE `ps_tax_rules_group_shop` ( - `id_tax_rules_group` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_tax_rules_group` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_tax_rules_group`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_tax_rules_group_shop` (`id_tax_rules_group`, `id_shop`) VALUES (1, 1), @@ -19876,23 +14264,14 @@ INSERT INTO `ps_tax_rules_group_shop` (`id_tax_rules_group`, `id_shop`) VALUES (6, 1), (7, 1), (8, 1), -(9, 1), -(1, 2), -(2, 2), -(3, 2), -(4, 2), -(5, 2), -(6, 2), -(7, 2), -(8, 2), -(9, 2); +(9, 1); DROP TABLE IF EXISTS `ps_timezone`; CREATE TABLE `ps_timezone` ( `id_timezone` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(32) NOT NULL, PRIMARY KEY (`id_timezone`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_timezone` (`id_timezone`, `name`) VALUES (1, 'Africa/Abidjan'), @@ -20472,48 +14851,48 @@ CREATE TABLE `ps_translation` ( DROP TABLE IF EXISTS `ps_warehouse`; CREATE TABLE `ps_warehouse` ( - `id_warehouse` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_currency` int(10) unsigned NOT NULL, - `id_address` int(10) unsigned NOT NULL, - `id_employee` int(10) unsigned NOT NULL, + `id_warehouse` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_currency` int(11) unsigned NOT NULL, + `id_address` int(11) unsigned NOT NULL, + `id_employee` int(11) unsigned NOT NULL, `reference` varchar(64) DEFAULT NULL, `name` varchar(45) NOT NULL, `management_type` enum('WA','FIFO','LIFO') NOT NULL DEFAULT 'WA', - `deleted` tinyint(3) unsigned NOT NULL DEFAULT '0', + `deleted` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_warehouse`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_warehouse_carrier`; CREATE TABLE `ps_warehouse_carrier` ( - `id_carrier` int(10) unsigned NOT NULL, - `id_warehouse` int(10) unsigned NOT NULL, + `id_carrier` int(11) unsigned NOT NULL, + `id_warehouse` int(11) unsigned NOT NULL, PRIMARY KEY (`id_warehouse`,`id_carrier`), KEY `id_warehouse` (`id_warehouse`), KEY `id_carrier` (`id_carrier`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_warehouse_product_location`; CREATE TABLE `ps_warehouse_product_location` ( - `id_warehouse_product_location` int(10) unsigned NOT NULL AUTO_INCREMENT, - `id_product` int(10) unsigned NOT NULL, - `id_product_attribute` int(10) unsigned NOT NULL, - `id_warehouse` int(10) unsigned NOT NULL, + `id_warehouse_product_location` int(11) unsigned NOT NULL AUTO_INCREMENT, + `id_product` int(11) unsigned NOT NULL, + `id_product_attribute` int(11) unsigned NOT NULL, + `id_warehouse` int(11) unsigned NOT NULL, `location` varchar(64) DEFAULT NULL, PRIMARY KEY (`id_warehouse_product_location`), UNIQUE KEY `id_product` (`id_product`,`id_product_attribute`,`id_warehouse`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_warehouse_shop`; CREATE TABLE `ps_warehouse_shop` ( - `id_shop` int(10) unsigned NOT NULL, - `id_warehouse` int(10) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, + `id_warehouse` int(11) unsigned NOT NULL, PRIMARY KEY (`id_warehouse`,`id_shop`), KEY `id_warehouse` (`id_warehouse`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_webservice_account`; @@ -20522,21 +14901,21 @@ CREATE TABLE `ps_webservice_account` ( `key` varchar(32) NOT NULL, `description` text, `class_name` varchar(50) NOT NULL DEFAULT 'WebserviceRequest', - `is_module` tinyint(4) NOT NULL DEFAULT '0', + `is_module` tinyint(2) NOT NULL DEFAULT '0', `module_name` varchar(50) DEFAULT NULL, - `active` tinyint(4) NOT NULL, + `active` tinyint(2) NOT NULL, PRIMARY KEY (`id_webservice_account`), KEY `key` (`key`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_webservice_account_shop`; CREATE TABLE `ps_webservice_account_shop` ( - `id_webservice_account` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_webservice_account` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_webservice_account`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_webservice_permission`; @@ -20550,7 +14929,7 @@ CREATE TABLE `ps_webservice_permission` ( KEY `resource` (`resource`), KEY `method` (`method`), KEY `id_webservice_account` (`id_webservice_account`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; DROP TABLE IF EXISTS `ps_web_browser`; @@ -20558,7 +14937,7 @@ CREATE TABLE `ps_web_browser` ( `id_web_browser` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) DEFAULT NULL, PRIMARY KEY (`id_web_browser`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_web_browser` (`id_web_browser`, `name`) VALUES (1, 'Safari'), @@ -20589,12 +14968,11 @@ CREATE TABLE `ps_wishlist` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_wishlist` (`id_wishlist`, `id_customer`, `id_shop`, `id_shop_group`, `token`, `name`, `counter`, `date_add`, `date_upd`, `default`) VALUES -(1, 3, 2, 1, '2694983583C98885', 'My wishlist', NULL, '2023-05-08 17:09:52', '2023-05-08 17:09:52', 1), -(2, 4, 1, 1, 'B06388034434E779', 'My wishlist', NULL, '2023-08-28 11:54:31', '2023-08-28 11:54:31', 1); +(1, 3, 1, 1, 'B9E5965B932F0105', 'My wishlist', NULL, '2023-08-28 13:48:31', '2023-08-28 13:48:31', 1); DROP TABLE IF EXISTS `ps_wishlist_product`; CREATE TABLE `ps_wishlist_product` ( - `id_wishlist_product` int(11) NOT NULL AUTO_INCREMENT, + `id_wishlist_product` int(10) NOT NULL AUTO_INCREMENT, `id_wishlist` int(10) unsigned NOT NULL, `id_product` int(10) unsigned NOT NULL, `id_product_attribute` int(10) unsigned NOT NULL, @@ -20617,9 +14995,9 @@ DROP TABLE IF EXISTS `ps_zone`; CREATE TABLE `ps_zone` ( `id_zone` int(10) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) NOT NULL, - `active` tinyint(3) unsigned NOT NULL DEFAULT '0', + `active` tinyint(1) unsigned NOT NULL DEFAULT '0', PRIMARY KEY (`id_zone`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_zone` (`id_zone`, `name`, `active`) VALUES (1, 'Europe', 1), @@ -20633,11 +15011,11 @@ INSERT INTO `ps_zone` (`id_zone`, `name`, `active`) VALUES DROP TABLE IF EXISTS `ps_zone_shop`; CREATE TABLE `ps_zone_shop` ( - `id_zone` int(10) unsigned NOT NULL, - `id_shop` int(10) unsigned NOT NULL, + `id_zone` int(11) unsigned NOT NULL, + `id_shop` int(11) unsigned NOT NULL, PRIMARY KEY (`id_zone`,`id_shop`), KEY `id_shop` (`id_shop`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_zone_shop` (`id_zone`, `id_shop`) VALUES (1, 1), @@ -20647,14 +15025,6 @@ INSERT INTO `ps_zone_shop` (`id_zone`, `id_shop`) VALUES (5, 1), (6, 1), (7, 1), -(8, 1), -(1, 2), -(2, 2), -(3, 2), -(4, 2), -(5, 2), -(6, 2), -(7, 2), -(8, 2); +(8, 1); --- 2023-08-28 10:01:11 +-- 2023-08-28 11:52:01 From 50164d3e894db4d34f533a5dee0be8d6699aa66b Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 15:25:02 +0300 Subject: [PATCH 055/109] ps8 small typo fixes --- cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 2 +- .../e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js | 2 +- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 2 +- cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index ecedea9b3..02695d3fa 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -8,7 +8,7 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') cy.get('#login-form [type="submit"]').eq(0).click({force:true}) cy.get('#history-link > .link-item').click() diff --git a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js index 55f132902..47926e18e 100755 --- a/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps8/02_mollie.ps8.EnablingPaymentsOrdersAPI.specs.js @@ -8,7 +8,7 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') cy.get('#login-form [type="submit"]').eq(0).click({force:true}) cy.get('#history-link > .link-item').click() diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index 66c527ba7..630bbc41c 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -40,7 +40,7 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') cy.get('#login-form [type="submit"]').eq(0).click({force:true}) cy.get('#history-link > .link-item').click() diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js index 86861f788..6c82166f7 100755 --- a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js +++ b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js @@ -8,7 +8,7 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) cy.get('#submit_login').click().wait(1000).as('Connection successsful') cy.visit('/en/my-account') - cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') cy.get('#login-form [type="submit"]').eq(0).click({force:true}) cy.get('#history-link > .link-item').click() From 1efbbdf920297fad01a80ddf5a06cf32ab3700bb Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 28 Aug 2023 15:51:19 +0300 Subject: [PATCH 056/109] Update 03_mollie.ps8.PaymentTests.js --- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index 630bbc41c..78a49bc3b 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -314,7 +314,7 @@ it('C339355: 18 Check if customerId is passed during the 2nd payment using Singl it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it('C339357: 20 IN3 Checkouting [Orders API]', () => { +it.only('C339357: 20 IN3 Checkouting [Orders API]', () => { // wip cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() From be2c8d2513534ac70b45368f3c13085d5046c87d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 10:29:54 +0300 Subject: [PATCH 057/109] cypress updates --- cypress.config.js | 12 ++++++++++++ package-lock.json | 32 ++++++++++++++++---------------- package.json | 2 +- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/cypress.config.js b/cypress.config.js index a15ae6978..f0968a738 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -16,6 +16,18 @@ module.exports = defineConfig({ // We've imported your old cypress plugins here. // You may want to clean this up later by importing these. setupNodeEvents(on, config) { + on('after:spec', (spec, results) => { + if (results && results.video) { + // Do we have failures for any retry attempts? + const failures = results.tests.some((test) => + test.attempts.some((attempt) => attempt.state === 'failed') + ) + if (!failures) { + // delete the video if the spec passed and no tests retried + fs.unlinkSync(results.video) + } + } + }) require('./cypress/plugins/index.js')(on, config) require("cypress-fail-fast/plugin")(on, config); require('cypress-terminal-report/src/installLogsPrinter')(on); diff --git a/package-lock.json b/package-lock.json index 5ef0a14da..4a31dbbbd 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^12.17.4", + "cypress": "^13.1.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", @@ -28,9 +28,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -706,13 +706,13 @@ } }, "node_modules/cypress": { - "version": "12.17.4", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", - "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", + "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", @@ -760,7 +760,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": "^14.0.0 || ^16.0.0 || >=18.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress-fail-fast": { @@ -2270,9 +2270,9 @@ "optional": true }, "@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", + "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -2796,12 +2796,12 @@ } }, "cypress": { - "version": "12.17.4", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", - "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", + "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", "dev": true, "requires": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", diff --git a/package.json b/package.json index e0a19bd71..a0d5365cf 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { - "cypress": "^12.17.4", + "cypress": "^13.1.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", From 6b654d4517c7a3ff64d259b9e7d2d7a1c2f2e495 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 11:43:24 +0300 Subject: [PATCH 058/109] Update 03_mollie.ps1784.PaymentTests.js --- cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index 1a1dfdbf3..1f2cf8f28 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -1150,7 +1150,7 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why +it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why cy.OrderRefundingPartialPaymentsAPI() }); }) From 98a6708521e19a97a65c319b4e7938d6b50cb48e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 12:18:45 +0300 Subject: [PATCH 059/109] Update cypress.config.js --- cypress.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/cypress.config.js b/cypress.config.js index f0968a738..f43293bee 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -8,7 +8,6 @@ module.exports = defineConfig({ defaultCommandTimeout: 15000, projectId: 'xb89dr', retries: 3, - videoUploadOnPasses: false, videoCompression: 8, viewportHeight: 1080, viewportWidth: 1920, From 8d85a20357a74884da89fb2b87c4b13661cf4de5 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 12:31:54 +0300 Subject: [PATCH 060/109] adding ps8.0.5 docker build --- .docker/Dockerfile.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile.8 b/.docker/Dockerfile.8 index 375883396..d85cab112 100755 --- a/.docker/Dockerfile.8 +++ b/.docker/Dockerfile.8 @@ -1,4 +1,4 @@ -FROM prestashop/prestashop:8.0.1-apache +FROM prestashop/prestashop:8.0.5-apache RUN cd /usr/local/etc/php/conf.d/ && \ echo 'memory_limit = 4096M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini From e56704272befbf8aa3f68be9089d5cf9352c8ebc Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 12:51:42 +0300 Subject: [PATCH 061/109] Update .htaccess8 --- .docker/.htaccess8 | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index b6776b88f..b1f21a2bf 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -37,39 +37,6 @@ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] - -#Domain: demoshop8debug.ngrok.io -RewriteRule . - [E=REWRITEBASE:/] -RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] - -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^shop2$ /shop2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^shop2/(.*) /$1 [L] - -# Images -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ -RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] -# AlphaImageLoader for IE and fancybox -RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] - # Dispatcher RewriteCond %{REQUEST_FILENAME} -s [OR] RewriteCond %{REQUEST_FILENAME} -l [OR] From 1604077b47697889c68be306debdcbed26c9ba67 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 14:36:23 +0300 Subject: [PATCH 062/109] Update 03_mollie.ps8.PaymentTests.js --- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index 78a49bc3b..f855d2028 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -314,7 +314,7 @@ it('C339355: 18 Check if customerId is passed during the 2nd payment using Singl it('C339356: 19 Credit Card Order BO Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it.only('C339357: 20 IN3 Checkouting [Orders API]', () => { // wip +it('C339357: 20 IN3 Checkouting [Orders API]', () => { // wip cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('NL').click() @@ -346,20 +346,17 @@ it.skip('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { - cy.visit('/de/') - cy.contains('Hummingbird printed sweater').click() - cy.get('[class="btn btn-primary add-to-cart"]').click() - cy.get('.cart-content-btn > .btn-primary').click() - cy.get('.text-sm-center > .btn').click() + cy.visit('/en/index.php?controller=history') + cy.contains('Reorder').click() + cy.visit('/en/cart?action=show') + cy.get('[class="js-cart-line-product-quantity form-control"]').clear().type('200') + cy.contains('Proceed to checkout').click() cy.contains('NL').click() //Billing country LT, DE etc. cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() //Payment method choosing cy.contains('in3').should('not.exist') - cy.get('.logo').click() - cy.get('.blockcart').click() - cy.get('.remove-from-cart > .material-icons').click() }) it('C339360: 23 IN3 Checking that IN3 logo exists OK [Orders API]', () => { cy.visit('/admin1/') @@ -777,13 +774,16 @@ it('C339383: 48 Credit Card Checkouting [Payments API]', () => { it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }) -it('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { +it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { // possibly a PS8 issue, that Cart is celaning the cookies... cy.clearCookies() //Payments API item cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) cy.get('[class="h3 product-title"]').eq(0).click() cy.get('.add > .btn').click() cy.get('.cart-content-btn > .btn-primary').click() + cy.wait(2000) + cy.visit('/en/') + cy.get('.blockcart').click() cy.get('.text-sm-center > .btn').click() // Creating random user all the time cy.get(':nth-child(1) > .custom-radio > input').check() From 8d2d13bf2a680fc255a624678f96ca8289e529b4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 14:39:46 +0300 Subject: [PATCH 063/109] Update 03_mollie.ps8.PaymentTests.js --- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index f855d2028..edb1bee2f 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -828,7 +828,7 @@ it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { // p cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { +it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { cy.clearCookies() //Payments API item cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) @@ -1122,7 +1122,7 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why +it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why cy.OrderRefundingPartialPaymentsAPI() }) }) From 1ebe2972cf0c475a1fc387f59c1f769058790c3b Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 14:40:29 +0300 Subject: [PATCH 064/109] ps1784 debug mode disabling --- .docker/.htaccess1784 | 44 +++++++-------- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.1784.yml | 2 +- docker-compose.e2e.1784.yml | 2 +- tests/seed/database/prestashop_1784_2.sql | 68 +++++++++++------------ 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1784 index 1db9638d9..3be87fcb8 100755 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1784 @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1784debug.ngrok.io +#Domain: demoshop1784.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1784debug.ngrok.io +#Domain: demoshop1784.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index fe3d85f7c..5db5cc8be 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -20,7 +20,7 @@ jobs: subdomain: 'demoshop1784debug' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784debug.ngrok.io' + url: 'https://demoshop1784.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - prestashop: 'PS8' diff --git a/docker-compose.1784.yml b/docker-compose.1784.yml index 7523dd711..4bfa923c9 100755 --- a/docker-compose.1784.yml +++ b/docker-compose.1784.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1784debug.ngrok.io:8002 + PS_DOMAIN: demoshop1784.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.e2e.1784.yml b/docker-compose.e2e.1784.yml index 9da5f92c6..76715f054 100644 --- a/docker-compose.e2e.1784.yml +++ b/docker-compose.e2e.1784.yml @@ -6,7 +6,7 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1784debug.ngrok.io + - CYPRESS_baseUrl=https://demoshop1784.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 entrypoint: cypress run --spec "**/cypress/integration/ps1784/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index 719d1941e..ad281f977 100755 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -3971,8 +3971,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4652,36 +4652,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1784debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1784debug.ngrok.io/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1784debug.ngrok.io/__/', 'demoshop1784debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1784.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1784.ngrok.io/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1784.ngrok.io/__/', 'demoshop1784.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -24103,8 +24103,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 0630989f71ef529df19438b6c0d276cbc6766d73 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 14:40:55 +0300 Subject: [PATCH 065/109] ps8 debug mode disabling --- .docker/.htaccess8 | 20 +++---- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 90 ++++++++++++++-------------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index b1f21a2bf..a615ef0a4 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,29 +10,29 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8debug.ngrok.io +#Domain: demoshop8ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 5db5cc8be..d8d21fa83 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8debug.ngrok.io' + url: 'https://demoshop8ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 72da1c1b6..c7ce07be3 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -36,7 +36,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8debug.ngrok.io:8142 + PS_DOMAIN: demoshop8ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 93eb8894c..06b66346d 100755 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3053,8 +3053,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3425,37 +3425,37 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-08-28 13:41:41'), -(2, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), -(3, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), -(4, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), -(5, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), -(6, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), -(7, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), -(8, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), -(9, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), -(10, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), -(11, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:03'), -(12, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), -(13, 2, 'http://demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8debug.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), -(14, 2, 'http://demoshop8debug.ngrok.io/en/registration', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:30'), -(15, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), -(16, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:48:44'), -(17, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), -(18, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:49:11'), -(19, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), -(20, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:50:35'), -(21, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), -(22, 2, 'http://demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8debug.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), -(23, 2, 'http://demoshop8debug.ngrok.io/en/cart?action=show', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:50'), -(24, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:52'), -(25, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:55'), -(26, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), -(27, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), -(28, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:51:14'), -(29, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), -(30, 2, 'http://demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), -(31, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); +(1, 2, '', 'demoshop8ngrok.io/', '', '2023-08-28 13:41:41'), +(2, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), +(3, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), +(4, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), +(5, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), +(6, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), +(7, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), +(8, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), +(9, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), +(10, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), +(11, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/en/', '', '2023-08-28 13:48:03'), +(12, 2, 'http://demoshop8ngrok.io/en/', 'demoshop8ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), +(13, 2, 'http://demoshop8ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8ngrok.io/en/registration', '', '2023-08-28 13:48:09'), +(14, 2, 'http://demoshop8ngrok.io/en/registration', 'demoshop8ngrok.io/en/', '', '2023-08-28 13:48:30'), +(15, 2, 'http://demoshop8ngrok.io/en/', 'demoshop8ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), +(16, 2, 'http://demoshop8ngrok.io/en/my-account', 'demoshop8ngrok.io/en/address', '', '2023-08-28 13:48:44'), +(17, 2, 'http://demoshop8ngrok.io/en/address', 'demoshop8ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), +(18, 2, 'http://demoshop8ngrok.io/en/addresses', 'demoshop8ngrok.io/en/address', '', '2023-08-28 13:49:11'), +(19, 2, 'http://demoshop8ngrok.io/en/address', 'demoshop8ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), +(20, 2, 'http://demoshop8ngrok.io/en/addresses', 'demoshop8ngrok.io/en/', '', '2023-08-28 13:50:35'), +(21, 2, 'http://demoshop8ngrok.io/en/', 'demoshop8ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), +(22, 2, 'http://demoshop8ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), +(23, 2, 'http://demoshop8ngrok.io/en/cart?action=show', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:50:50'), +(24, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:50:52'), +(25, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:50:55'), +(26, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), +(27, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), +(28, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:51:14'), +(29, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), +(30, 2, 'http://demoshop8ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), +(31, 2, 'http://demoshop8ngrok.io/en/my-account', 'demoshop8ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -10243,17 +10243,17 @@ CREATE TABLE `ps_pagenotfound` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES -(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), -(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); +(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), +(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -12272,7 +12272,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8ngrok.io', 'demoshop8ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From a20f6883be05f690144e2093836415bc40f27c01 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 15:47:44 +0300 Subject: [PATCH 066/109] small update --- ...ie.ps8.Subscriptions.WIP.js => 04_mollie.ps8.Subscriptions.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cypress/e2e/ps8/{04_mollie.ps8.Subscriptions.WIP.js => 04_mollie.ps8.Subscriptions.js} (100%) diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js similarity index 100% rename from cypress/e2e/ps8/04_mollie.ps8.Subscriptions.WIP.js rename to cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js From 96ea420528135baa118ab1577c17f0e286c18024 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 15:55:41 +0300 Subject: [PATCH 067/109] small typo fix --- .docker/.htaccess8 | 20 +++---- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 90 ++++++++++++++-------------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index a615ef0a4..d7343aab0 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,29 +10,29 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8ngrok.io +#Domain: demoshop8.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index d8d21fa83..d0dcbe2a3 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8ngrok.io' + url: 'https://demoshop8.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index c7ce07be3..af308d9dd 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -36,7 +36,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8ngrok.io:8142 + PS_DOMAIN: demoshop8.ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 06b66346d..0b7db8dc9 100755 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3053,8 +3053,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3425,37 +3425,37 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8ngrok.io/', '', '2023-08-28 13:41:41'), -(2, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), -(3, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), -(4, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), -(5, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), -(6, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), -(7, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), -(8, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), -(9, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), -(10, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), -(11, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/en/', '', '2023-08-28 13:48:03'), -(12, 2, 'http://demoshop8ngrok.io/en/', 'demoshop8ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), -(13, 2, 'http://demoshop8ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8ngrok.io/en/registration', '', '2023-08-28 13:48:09'), -(14, 2, 'http://demoshop8ngrok.io/en/registration', 'demoshop8ngrok.io/en/', '', '2023-08-28 13:48:30'), -(15, 2, 'http://demoshop8ngrok.io/en/', 'demoshop8ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), -(16, 2, 'http://demoshop8ngrok.io/en/my-account', 'demoshop8ngrok.io/en/address', '', '2023-08-28 13:48:44'), -(17, 2, 'http://demoshop8ngrok.io/en/address', 'demoshop8ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), -(18, 2, 'http://demoshop8ngrok.io/en/addresses', 'demoshop8ngrok.io/en/address', '', '2023-08-28 13:49:11'), -(19, 2, 'http://demoshop8ngrok.io/en/address', 'demoshop8ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), -(20, 2, 'http://demoshop8ngrok.io/en/addresses', 'demoshop8ngrok.io/en/', '', '2023-08-28 13:50:35'), -(21, 2, 'http://demoshop8ngrok.io/en/', 'demoshop8ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), -(22, 2, 'http://demoshop8ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), -(23, 2, 'http://demoshop8ngrok.io/en/cart?action=show', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:50:50'), -(24, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:50:52'), -(25, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:50:55'), -(26, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), -(27, 2, 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), -(28, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order', '', '2023-08-28 13:51:14'), -(29, 2, 'http://demoshop8ngrok.io/en/order', 'demoshop8ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), -(30, 2, 'http://demoshop8ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), -(31, 2, 'http://demoshop8ngrok.io/en/my-account', 'demoshop8ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); +(1, 2, '', 'demoshop8.ngrok.io/', '', '2023-08-28 13:41:41'), +(2, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), +(3, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), +(4, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), +(5, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), +(6, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), +(7, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), +(8, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), +(9, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), +(10, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), +(11, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:48:03'), +(12, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), +(13, 2, 'http://demoshop8.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), +(14, 2, 'http://demoshop8.ngrok.io/en/registration', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:48:30'), +(15, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), +(16, 2, 'http://demoshop8.ngrok.io/en/my-account', 'demoshop8.ngrok.io/en/address', '', '2023-08-28 13:48:44'), +(17, 2, 'http://demoshop8.ngrok.io/en/address', 'demoshop8.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), +(18, 2, 'http://demoshop8.ngrok.io/en/addresses', 'demoshop8.ngrok.io/en/address', '', '2023-08-28 13:49:11'), +(19, 2, 'http://demoshop8.ngrok.io/en/address', 'demoshop8.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), +(20, 2, 'http://demoshop8.ngrok.io/en/addresses', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:50:35'), +(21, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), +(22, 2, 'http://demoshop8.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), +(23, 2, 'http://demoshop8.ngrok.io/en/cart?action=show', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:50'), +(24, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:52'), +(25, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:55'), +(26, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), +(27, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), +(28, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:51:14'), +(29, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), +(30, 2, 'http://demoshop8.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), +(31, 2, 'http://demoshop8.ngrok.io/en/my-account', 'demoshop8.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -10243,17 +10243,17 @@ CREATE TABLE `ps_pagenotfound` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES -(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), -(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); +(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), +(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -12272,7 +12272,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8ngrok.io', 'demoshop8ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 3a380f177d28cebcb63dc2edc7e1394224ea513a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 16:02:34 +0300 Subject: [PATCH 068/109] Update E2E_On_PR.yml --- .github/workflows/E2E_On_PR.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index d0dcbe2a3..218873e4a 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -17,7 +17,7 @@ jobs: include: - prestashop: 'PS1784' make: 'make e2eh1784' - subdomain: 'demoshop1784debug' + subdomain: 'demoshop1784' port: '8002' yml: 'docker-compose.1784.yml' url: 'https://demoshop1784.ngrok.io' @@ -25,7 +25,7 @@ jobs: TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' - subdomain: 'demoshop8debug' + subdomain: 'demoshop8' port: '8142' yml: 'docker-compose.8.yml' url: 'https://demoshop8.ngrok.io' From 22e2a5e552007e0b863b7721be11a8bd2090da22 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 16:17:24 +0300 Subject: [PATCH 069/109] adding random branch string ending --- .github/workflows/E2E_On_PR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 218873e4a..0ed68b6af 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -2,7 +2,7 @@ name: Cypress E2E Automation [develop branch] on: pull_request: types: [opened, reopened] - branches: [develop] + branches: [develop, develop**, develop-**] concurrency: group: ${{ github.workflow }}-${{ github.ref }} From 3481517b3b632e8dc259eb8ef383f17cc7712c33 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 4 Sep 2023 16:19:18 +0300 Subject: [PATCH 070/109] Update upgrading_check.yml --- .github/workflows/upgrading_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/upgrading_check.yml b/.github/workflows/upgrading_check.yml index d5f36c6e0..6771b5af8 100644 --- a/.github/workflows/upgrading_check.yml +++ b/.github/workflows/upgrading_check.yml @@ -2,7 +2,7 @@ name: Module upgrade / downgrade testing (last version > v.5.2.0 > `develop` ver on: pull_request: types: [opened, reopened] - branches: [develop] + branches: [develop, develop**, develop-**] jobs: Module-upgrading-check: runs-on: ubuntu-latest From 25812d3967fd5f1c5d15f38de0908fa88da590ff Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 5 Sep 2023 09:20:52 +0300 Subject: [PATCH 071/109] Update cypress.config.js --- cypress.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/cypress.config.js b/cypress.config.js index f43293bee..ec232ae77 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -1,6 +1,7 @@ const { defineConfig } = require('cypress') module.exports = defineConfig({ + video: true, chromeWebSecurity: false, experimentalMemoryManagement: true, experimentalSourceRewriting: true, From a73abb54460b0fa6121f12974f28a5e5a205c18a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 5 Sep 2023 10:04:33 +0300 Subject: [PATCH 072/109] selector updates --- .../e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js | 2 +- cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js index 7ef59bad0..21e81926f 100755 --- a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js @@ -83,7 +83,7 @@ it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end comp cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[id="MOLLIE_PAYMENTSCREEN_LOCALE"]').should('be.visible') cy.get('[id="MOLLIE_SEND_ORDER_CONFIRMATION"]').should('be.visible') - cy.get('[id="MOLLIE_KLARNA_INVOICE_ON"]').should('be.visible') + cy.get('[id="MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS"]').should('be.visible') cy.get('[class="help-block"]').should('be.visible') cy.get('[id="MOLLIE_STATUS_AWAITING"]').should('be.visible') cy.get('[id="MOLLIE_STATUS_PAID"]').should('be.visible') diff --git a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js index 02695d3fa..2eefcb415 100755 --- a/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps8/01_mollie.ps8.ModuleConfiguration.specs.js @@ -53,7 +53,7 @@ it('C339339: Checking the Advanced Settings tab, verifying the Front-end compone cy.get('[href="#advanced_settings"]').click({force:true}) cy.get('[id="MOLLIE_PAYMENTSCREEN_LOCALE"]').should('be.visible') cy.get('[id="MOLLIE_SEND_ORDER_CONFIRMATION"]').should('be.visible') - cy.get('[id="MOLLIE_KLARNA_INVOICE_ON"]').should('be.visible') + cy.get('[id="MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS"]').should('be.visible') cy.get('[class="help-block"]').should('be.visible') cy.get('[id="MOLLIE_STATUS_AWAITING"]').should('be.visible') cy.get('[id="MOLLIE_STATUS_PAID"]').should('be.visible') From c5223a541b853042514a17cb06fd2d8b06829922 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 5 Sep 2023 10:43:55 +0300 Subject: [PATCH 073/109] updating the testrail extension by Chris --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a31dbbbd..4e88982ee 100755 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", - "cypress-testrail": "^2.7.1", + "cypress-testrail": "^2.8.0", "human-signals": "^3.0.1" } }, @@ -818,9 +818,9 @@ } }, "node_modules/cypress-testrail": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.7.1.tgz", - "integrity": "sha512-cF+TB6IcRcXQRgqdtay9n56zvciXWqJSCgSH/CHO9g5MLGAVAhjomh0rs8o4ntxGk430Gi0ITfHUp5I2JANEYw==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.0.tgz", + "integrity": "sha512-cM0v0mj47wEd6KhaaWjU+c11kaw3va6zsStLVmUK0LT1NKtK7iZWq5bafPVroCVLjfz0JCtAp2GFjVkLSv1X1Q==", "dev": true, "dependencies": { "await-to-js": "^3.0.0", @@ -2889,9 +2889,9 @@ } }, "cypress-testrail": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.7.1.tgz", - "integrity": "sha512-cF+TB6IcRcXQRgqdtay9n56zvciXWqJSCgSH/CHO9g5MLGAVAhjomh0rs8o4ntxGk430Gi0ITfHUp5I2JANEYw==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.0.tgz", + "integrity": "sha512-cM0v0mj47wEd6KhaaWjU+c11kaw3va6zsStLVmUK0LT1NKtK7iZWq5bafPVroCVLjfz0JCtAp2GFjVkLSv1X1Q==", "dev": true, "requires": { "await-to-js": "^3.0.0", diff --git a/package.json b/package.json index a0d5365cf..87766630c 100755 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", - "cypress-testrail": "^2.7.1", + "cypress-testrail": "^2.8.0", "human-signals": "^3.0.1" } } From 18ddcfa438923355b75fc5f9c6e27ff857cf950e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 5 Sep 2023 17:11:08 +0300 Subject: [PATCH 074/109] temporary disabling the error checking --- .../e2e/ps1784/03_mollie.ps1784.PaymentTests.js | 16 ++++++++-------- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js index 1f2cf8f28..9dd11430d 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js @@ -46,14 +46,14 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#history-link > .link-item').click() }) } -//Checking the console for errors -let windowConsoleError; -Cypress.on('window:before:load', (win) => { - windowConsoleError = cy.spy(win.console, 'error'); -}) -afterEach(() => { - expect(windowConsoleError).to.not.be.called; -}) +// //Checking the console for errors +// let windowConsoleError; +// Cypress.on('window:before:load', (win) => { +// windowConsoleError = cy.spy(win.console, 'error'); +// }) +// afterEach(() => { +// expect(windowConsoleError).to.not.be.called; +// }) describe('PS1784 Tests Suite', () => { beforeEach(() => { login('MollieBOFOLoggingIn') diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index edb1bee2f..715a540f7 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -46,14 +46,14 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#history-link > .link-item').click() }) } -//Checking the console for errors -let windowConsoleError; -Cypress.on('window:before:load', (win) => { - windowConsoleError = cy.spy(win.console, 'error'); -}) -afterEach(() => { - expect(windowConsoleError).to.not.be.called; -}) +// //Checking the console for errors +// let windowConsoleError; +// Cypress.on('window:before:load', (win) => { +// windowConsoleError = cy.spy(win.console, 'error'); +// }) +// afterEach(() => { +// expect(windowConsoleError).to.not.be.called; +// }) describe('PS8 Tests Suite', () => { beforeEach(() => { cy.viewport(1920,1080) From 3d7272f0a3cd3184b36b9be66a1dbd9f74b9d61a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Tue, 5 Sep 2023 17:31:14 +0300 Subject: [PATCH 075/109] increasing timeout for selectors --- cypress.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress.config.js b/cypress.config.js index ec232ae77..1d5bb9d6e 100755 --- a/cypress.config.js +++ b/cypress.config.js @@ -6,7 +6,7 @@ module.exports = defineConfig({ experimentalMemoryManagement: true, experimentalSourceRewriting: true, numTestsKeptInMemory: 0, - defaultCommandTimeout: 15000, + defaultCommandTimeout: 30000, projectId: 'xb89dr', retries: 3, videoCompression: 8, From 4fb6c9a89850768acab40372b31547f76ad2e74f Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 12:01:02 +0300 Subject: [PATCH 076/109] cypress-testrail extension fix --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e88982ee..4af6fb29f 100755 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", - "cypress-testrail": "^2.8.0", + "cypress-testrail": "^2.8.1", "human-signals": "^3.0.1" } }, @@ -818,9 +818,9 @@ } }, "node_modules/cypress-testrail": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.0.tgz", - "integrity": "sha512-cM0v0mj47wEd6KhaaWjU+c11kaw3va6zsStLVmUK0LT1NKtK7iZWq5bafPVroCVLjfz0JCtAp2GFjVkLSv1X1Q==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.1.tgz", + "integrity": "sha512-e3xMI5VzRia16LEdWg1wlfSmTuT0IZr7gqK2Zyfj+RYBfkGFx8nWsT1Kmm2FNFCTUL5dNTrHqgspM+c3K1fWuA==", "dev": true, "dependencies": { "await-to-js": "^3.0.0", @@ -2889,9 +2889,9 @@ } }, "cypress-testrail": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.0.tgz", - "integrity": "sha512-cM0v0mj47wEd6KhaaWjU+c11kaw3va6zsStLVmUK0LT1NKtK7iZWq5bafPVroCVLjfz0JCtAp2GFjVkLSv1X1Q==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.1.tgz", + "integrity": "sha512-e3xMI5VzRia16LEdWg1wlfSmTuT0IZr7gqK2Zyfj+RYBfkGFx8nWsT1Kmm2FNFCTUL5dNTrHqgspM+c3K1fWuA==", "dev": true, "requires": { "await-to-js": "^3.0.0", diff --git a/package.json b/package.json index 87766630c..75d24c1c3 100755 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.2", - "cypress-testrail": "^2.8.0", + "cypress-testrail": "^2.8.1", "human-signals": "^3.0.1" } } From 3839a44e06fd89368b6f421ea58b58f182003193 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:12:00 +0300 Subject: [PATCH 077/109] PIPRES-261: Mixed cart checkout for subscriptions (#803) * PIPRES-261: New order split into separate subscription order * csfixer * stan * improved validations * removed commented code * note fixes * test fix * stan fix * reduced redundant code --- controllers/front/ajax.php | 6 +- controllers/front/subscriptionWebhook.php | 2 +- controllers/front/webhook.php | 8 +- mollie.php | 5 -- src/Handler/ErrorHandler/ErrorHandler.php | 5 +- src/Handler/Order/OrderCreationHandler.php | 3 +- subscription/Exception/ExceptionCode.php | 4 + .../Exception/ProductValidationException.php | 10 --- ...SubscriptionProductValidationException.php | 1 - .../Factory/CreateSubscriptionDataFactory.php | 19 ++--- .../Handler/RecurringOrderHandler.php | 76 ++++++------------- .../Handler/SubscriptionCreationHandler.php | 29 +++++-- .../CanProductBeAddedToCartValidator.php | 49 +++--------- .../Validator/SubscriptionOrderValidator.php | 15 ++-- .../SubscriptionProductValidator.php | 1 + .../Factory/TestCreateSubscriptionData.php | 7 +- ... CanProductBeAddedToCartValidatorTest.php} | 15 ++-- ...php => SubscriptionOrderValidatorTest.php} | 10 ++- ...p => SubscriptionProductValidatorTest.php} | 9 ++- tests/Unit/Factory/SubscriptionDataTest.php | 14 ++-- 20 files changed, 118 insertions(+), 170 deletions(-) delete mode 100644 subscription/Exception/ProductValidationException.php rename tests/Integration/Subscription/Validator/{SubscriptionCartTest.php => CanProductBeAddedToCartValidatorTest.php} (93%) rename tests/Integration/Subscription/Validator/{SubscriptionOrderTest.php => SubscriptionOrderValidatorTest.php} (94%) rename tests/Integration/Subscription/Validator/{SubscriptionProductTest.php => SubscriptionProductValidatorTest.php} (93%) diff --git a/controllers/front/ajax.php b/controllers/front/ajax.php index 6c6ff8376..42a85cd38 100644 --- a/controllers/front/ajax.php +++ b/controllers/front/ajax.php @@ -16,7 +16,6 @@ use Mollie\Exception\FailedToProvidePaymentFeeException; use Mollie\Provider\PaymentFeeProviderInterface; use Mollie\Repository\CurrencyRepositoryInterface; -use Mollie\Subscription\Exception\ProductValidationException; use Mollie\Subscription\Exception\SubscriptionProductValidationException; use Mollie\Subscription\Validator\CanProductBeAddedToCartValidator; use Mollie\Utility\NumberUtility; @@ -192,12 +191,9 @@ private function validateProduct(): void try { $cartValidation->validate((int) $product['id_product_attribute']); - } catch (ProductValidationException $e) { - $productCanBeAdded = false; - $message = $this->module->l('Product cannot be added because you have subscription product in your cart', self::FILE_NAME); } catch (SubscriptionProductValidationException $e) { $productCanBeAdded = false; - $message = $this->module->l('Subscription product cannot be added if you have other products in your cart', self::FILE_NAME); + $message = $this->module->l('Please note: Only one subscription product can be added to the cart at a time.', self::FILE_NAME); } $this->ajaxRender( diff --git a/controllers/front/subscriptionWebhook.php b/controllers/front/subscriptionWebhook.php index e01c99c98..0fe91601f 100644 --- a/controllers/front/subscriptionWebhook.php +++ b/controllers/front/subscriptionWebhook.php @@ -64,7 +64,7 @@ protected function executeWebhook() try { $recurringOrderHandler->handle($transactionId); - } catch (Exception $exception) { + } catch (\Throwable $exception) { $errorHandler->handle($exception, null, false); $this->respond('failed', HttpStatusCode::HTTP_BAD_REQUEST); diff --git a/controllers/front/webhook.php b/controllers/front/webhook.php index 6b2e86d01..699298883 100644 --- a/controllers/front/webhook.php +++ b/controllers/front/webhook.php @@ -14,7 +14,6 @@ use Mollie\Config\Config; use Mollie\Controller\AbstractMollieController; use Mollie\Errors\Http\HttpStatusCode; -use Mollie\Exception\TransactionException; use Mollie\Handler\ErrorHandler\ErrorHandler; use Mollie\Service\TransactionService; use Mollie\Utility\TransactionUtility; @@ -73,6 +72,9 @@ protected function executeWebhook() /** @var TransactionService $transactionService */ $transactionService = $this->module->getService(TransactionService::class); + /** @var ErrorHandler $errorHandler */ + $errorHandler = $this->module->getService(ErrorHandler::class); + $transactionId = Tools::getValue('id'); if (!$transactionId) { $this->respond('failed', HttpStatusCode::HTTP_UNPROCESSABLE_ENTITY, 'Missing transaction id'); @@ -95,9 +97,7 @@ protected function executeWebhook() $cartId = $metaData->cart_id ?? 0; $this->setContext($cartId); $payment = $transactionService->processTransaction($transaction); - } catch (TransactionException $e) { - /** @var ErrorHandler $errorHandler */ - $errorHandler = $this->module->getService(ErrorHandler::class); + } catch (\Throwable $e) { $errorHandler->handle($e, $e->getCode(), false); $this->respond('failed', $e->getCode(), $e->getMessage()); } diff --git a/mollie.php b/mollie.php index 58e6542db..0b419b8d2 100755 --- a/mollie.php +++ b/mollie.php @@ -26,7 +26,6 @@ use Mollie\Repository\PaymentMethodRepositoryInterface; use Mollie\Service\ExceptionService; use Mollie\ServiceProvider\LeagueServiceContainerProvider; -use Mollie\Subscription\Exception\ProductValidationException; use Mollie\Subscription\Exception\SubscriptionProductValidationException; use Mollie\Subscription\Handler\CustomerAddressUpdateHandler; use Mollie\Subscription\Install\AttributeInstaller; @@ -999,10 +998,6 @@ public function hookActionCartUpdateQuantityBefore($params) } catch (SubscriptionProductValidationException $e) { $product = $this->makeProductNotOrderable($params['product']); - $params['product'] = $product; - } catch (ProductValidationException $e) { - $product = $this->makeProductNotOrderable($params['product']); - $params['product'] = $product; } } diff --git a/src/Handler/ErrorHandler/ErrorHandler.php b/src/Handler/ErrorHandler/ErrorHandler.php index ff701502c..e5c51bd69 100644 --- a/src/Handler/ErrorHandler/ErrorHandler.php +++ b/src/Handler/ErrorHandler/ErrorHandler.php @@ -13,7 +13,6 @@ namespace Mollie\Handler\ErrorHandler; use Configuration; -use Exception; use Mollie; use Mollie\Config\Config; use Mollie\Config\Env; @@ -94,9 +93,9 @@ public function __construct(Mollie $module, Env $env = null) } /** - * @throws Exception + * @throws \Throwable */ - public function handle(Exception $error, ?int $code = null, ?bool $throw = true): void + public function handle(\Throwable $error, ?int $code = null, ?bool $throw = true): void { $this->client->captureException($error, $this->exceptionContext); diff --git a/src/Handler/Order/OrderCreationHandler.php b/src/Handler/Order/OrderCreationHandler.php index 4f21ab40b..e09f39690 100644 --- a/src/Handler/Order/OrderCreationHandler.php +++ b/src/Handler/Order/OrderCreationHandler.php @@ -278,9 +278,10 @@ public function createBankTransferOrder($paymentData, Cart $cart) return $paymentData; } - private function createRecurringOrderEntity(Order $order, string $method) + private function createRecurringOrderEntity(Order $order, string $method): void { $cart = new Cart($order->id_cart); + if (!$this->subscriptionOrder->validate($cart)) { return; } diff --git a/subscription/Exception/ExceptionCode.php b/subscription/Exception/ExceptionCode.php index 2fabb1bcd..7820f0276 100644 --- a/subscription/Exception/ExceptionCode.php +++ b/subscription/Exception/ExceptionCode.php @@ -8,4 +8,8 @@ class ExceptionCode public const ORDER_FAILED_TO_CREATE_ORDER_PAYMENT_FEE = 1001; public const ORDER_FAILED_TO_UPDATE_ORDER_TOTAL_WITH_PAYMENT_FEE = 1002; + + //Cart error codes starts from 2000 + + public const CART_ALREADY_HAS_SUBSCRIPTION_PRODUCT = 2001; } diff --git a/subscription/Exception/ProductValidationException.php b/subscription/Exception/ProductValidationException.php deleted file mode 100644 index 52b90e556..000000000 --- a/subscription/Exception/ProductValidationException.php +++ /dev/null @@ -1,10 +0,0 @@ -module = $module; } - public function build(Order $order): SubscriptionDataDTO + public function build(Order $order, array $subscriptionProduct): SubscriptionDataDTO { $customer = $order->getCustomer(); /** @var \MolCustomer $molCustomer */ //todo: will need to improve mollie module logic to have shop id or card it so that multishop doesn't break $molCustomer = $this->customerRepository->findOneBy(['email' => $customer->email]); - $products = $order->getCartProducts(); - - // only one product is expected to be in order for subscription, if there are more than validation failed. - if (count($products) !== 1) { - throw new SubscriptionProductValidationException('Invalid amount of products for subscription', SubscriptionProductValidationException::MULTTIPLE_PRODUCTS_IN_CART); - } - /** @var Product $product */ - $product = reset($products); - $combination = $this->combination->getById((int) $product['id_product_attribute']); + $combination = $this->combination->getById((int) $subscriptionProduct['id_product_attribute']); $interval = $this->subscriptionInterval->getSubscriptionInterval($combination); $currency = $this->currencyAdapter->getById((int) $order->id_currency); $description = $this->subscriptionDescription->getSubscriptionDescription($order); - $orderAmount = new Amount((float) $order->total_paid_tax_incl, $currency->iso_code); + /** + * NOTE: we will only send product price as total for subscriptions + */ + $orderAmount = new Amount((float) $subscriptionProduct['total_price_tax_incl'], $currency->iso_code); $subscriptionData = new SubscriptionDataDTO( $molCustomer->customer_id, $orderAmount, diff --git a/subscription/Handler/RecurringOrderHandler.php b/subscription/Handler/RecurringOrderHandler.php index 757dad853..7d4ac50da 100644 --- a/subscription/Handler/RecurringOrderHandler.php +++ b/subscription/Handler/RecurringOrderHandler.php @@ -6,8 +6,6 @@ use Cart; use Mollie; -use Mollie\Action\CreateOrderPaymentFeeAction; -use Mollie\Action\UpdateOrderTotalsAction; use Mollie\Adapter\ConfigurationAdapter; use Mollie\Adapter\Shop; use Mollie\Api\Resources\Payment; @@ -15,14 +13,9 @@ use Mollie\Api\Types\PaymentStatus; use Mollie\Api\Types\SubscriptionStatus; use Mollie\Config\Config; -use Mollie\DTO\CreateOrderPaymentFeeActionData; -use Mollie\DTO\UpdateOrderTotalsData; use Mollie\Errors\Http\HttpStatusCode; -use Mollie\Exception\CouldNotCreateOrderPaymentFee; -use Mollie\Exception\CouldNotUpdateOrderTotals; use Mollie\Exception\OrderCreationException; use Mollie\Exception\TransactionException; -use Mollie\Repository\MolOrderPaymentFeeRepositoryInterface; use Mollie\Repository\PaymentMethodRepositoryInterface; use Mollie\Service\MailService; use Mollie\Service\MollieOrderCreationService; @@ -32,9 +25,9 @@ use Mollie\Subscription\Exception\CouldNotHandleRecurringOrder; use Mollie\Subscription\Factory\GetSubscriptionDataFactory; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; +use Mollie\Subscription\Repository\RecurringOrdersProductRepositoryInterface; use Mollie\Subscription\Utility\ClockInterface; use Mollie\Utility\SecureKeyUtility; -use MolOrderPaymentFee; use MolRecurringOrder; use MolRecurringOrdersProduct; use Order; @@ -64,14 +57,10 @@ class RecurringOrderHandler private $shop; /** @var MailService */ private $mailService; - /** @var MolOrderPaymentFeeRepositoryInterface */ - private $molOrderPaymentFeeRepository; - /** @var UpdateOrderTotalsAction */ - private $updateOrderTotalsAction; - /** @var CreateOrderPaymentFeeAction */ - private $createOrderPaymentFeeAction; /** @var ConfigurationAdapter */ private $configuration; + /** @var RecurringOrdersProductRepositoryInterface */ + private $recurringOrdersProductRepository; public function __construct( SubscriptionApi $subscriptionApi, @@ -85,10 +74,8 @@ public function __construct( ClockInterface $clock, Shop $shop, MailService $mailService, - MolOrderPaymentFeeRepositoryInterface $molOrderPaymentFeeRepository, - UpdateOrderTotalsAction $updateOrderTotalsAction, - CreateOrderPaymentFeeAction $createOrderPaymentFeeAction, - ConfigurationAdapter $configuration + ConfigurationAdapter $configuration, + RecurringOrdersProductRepositoryInterface $recurringOrdersProductRepository ) { $this->subscriptionApi = $subscriptionApi; $this->subscriptionDataFactory = $subscriptionDataFactory; @@ -101,10 +88,8 @@ public function __construct( $this->clock = $clock; $this->shop = $shop; $this->mailService = $mailService; - $this->molOrderPaymentFeeRepository = $molOrderPaymentFeeRepository; - $this->updateOrderTotalsAction = $updateOrderTotalsAction; - $this->createOrderPaymentFeeAction = $createOrderPaymentFeeAction; $this->configuration = $configuration; + $this->recurringOrdersProductRepository = $recurringOrdersProductRepository; } public function handle(string $transactionId): string @@ -168,6 +153,24 @@ private function createSubscription(Payment $transaction, MolRecurringOrder $rec /** @var Cart $newCart */ $newCart = $newCart['cart']; + /** @var MolRecurringOrdersProduct $subscriptionProduct */ + $subscriptionProduct = $this->recurringOrdersProductRepository->findOneBy([ + 'id_mol_recurring_orders_product' => $recurringOrder->id_mol_recurring_orders_product, + ]); + + $cartProducts = $newCart->getProducts(); + + foreach ($cartProducts as $cartProduct) { + if ( + (int) $cartProduct['id_product'] === (int) $subscriptionProduct->id_product && + (int) $cartProduct['id_product_attribute'] === (int) $subscriptionProduct->id_product_attribute + ) { + continue; + } + + $newCart->deleteProduct((int) $cartProduct['id_product'], (int) $cartProduct['id_product_attribute']); + } + /** * NOTE: New order can't have soft deleted delivery address */ @@ -200,37 +203,6 @@ private function createSubscription(Payment $transaction, MolRecurringOrder $rec $this->mollieOrderCreationService->createMolliePayment($transaction, (int) $newCart->id, $order->reference, (int) $orderId, PaymentStatus::STATUS_PAID); - /** @var MolOrderPaymentFee|null $molOrderPaymentFee */ - $molOrderPaymentFee = $this->molOrderPaymentFeeRepository->findOneBy([ - 'id_order' => $recurringOrder->id_order, - ]); - - if ($molOrderPaymentFee) { - try { - $this->createOrderPaymentFeeAction->run(CreateOrderPaymentFeeActionData::create( - $orderId, - (int) $newCart->id, - (float) $molOrderPaymentFee->fee_tax_incl, - (float) $molOrderPaymentFee->fee_tax_excl - )); - } catch (CouldNotCreateOrderPaymentFee $exception) { - throw CouldNotHandleRecurringOrder::failedToCreateOrderPaymentFee($exception); - } - - try { - $this->updateOrderTotalsAction->run(UpdateOrderTotalsData::create( - $orderId, - (float) $molOrderPaymentFee->fee_tax_incl, - (float) $molOrderPaymentFee->fee_tax_excl, - (float) $transaction->amount->value, - (float) $cart->getOrderTotal(true, Cart::BOTH), - (float) $cart->getOrderTotal(false, Cart::BOTH) - )); - } catch (CouldNotUpdateOrderTotals $exception) { - throw CouldNotHandleRecurringOrder::failedToUpdateOrderTotalWithPaymentFee($exception); - } - } - $this->orderStatusService->setOrderStatus($orderId, (int) Config::getStatuses()[$transaction->status]); } diff --git a/subscription/Handler/SubscriptionCreationHandler.php b/subscription/Handler/SubscriptionCreationHandler.php index f0b90816d..87f5f8d6a 100644 --- a/subscription/Handler/SubscriptionCreationHandler.php +++ b/subscription/Handler/SubscriptionCreationHandler.php @@ -8,6 +8,7 @@ use Mollie\Subscription\Api\SubscriptionApi; use Mollie\Subscription\Factory\CreateSubscriptionDataFactory; use Mollie\Subscription\Utility\ClockInterface; +use Mollie\Subscription\Validator\SubscriptionProductValidator; use MolRecurringOrder; use MolRecurringOrdersProduct; use Order; @@ -22,26 +23,40 @@ class SubscriptionCreationHandler /** @var CreateSubscriptionDataFactory */ private $createSubscriptionDataFactory; + /** @var SubscriptionProductValidator */ + private $subscriptionProductValidator; public function __construct( ClockInterface $clock, SubscriptionApi $subscriptionApi, - CreateSubscriptionDataFactory $subscriptionDataFactory + CreateSubscriptionDataFactory $subscriptionDataFactory, + SubscriptionProductValidator $subscriptionProductValidator ) { $this->clock = $clock; $this->subscriptionApi = $subscriptionApi; $this->createSubscriptionDataFactory = $subscriptionDataFactory; + $this->subscriptionProductValidator = $subscriptionProductValidator; } public function handle(Order $order, string $method) { - $subscriptionData = $this->createSubscriptionDataFactory->build($order); - $subscription = $this->subscriptionApi->subscribeOrder($subscriptionData); - $products = $order->getProducts(); - $product = reset($products); + $subscriptionProduct = []; + + foreach ($products as $product) { + if (!$this->subscriptionProductValidator->validate((int) $product['product_attribute_id'])) { + continue; + } + + $subscriptionProduct = $product; + + break; + } + + $subscriptionData = $this->createSubscriptionDataFactory->build($order, $subscriptionProduct); + $subscription = $this->subscriptionApi->subscribeOrder($subscriptionData); - $recurringOrdersProduct = $this->createRecurringOrdersProduct($product); + $recurringOrdersProduct = $this->createRecurringOrdersProduct($subscriptionProduct); $this->createRecurringOrder($recurringOrdersProduct, $order, $subscription, $method); } @@ -52,7 +67,7 @@ private function createRecurringOrdersProduct(array $product): MolRecurringOrder $recurringOrdersProduct->id_product = $product['id_product']; $recurringOrdersProduct->id_product_attribute = $product['product_attribute_id']; $recurringOrdersProduct->quantity = $product['product_quantity']; - $recurringOrdersProduct->unit_price = $product['price']; + $recurringOrdersProduct->unit_price = $product['unit_price_tax_excl']; $recurringOrdersProduct->add(); return $recurringOrdersProduct; diff --git a/subscription/Validator/CanProductBeAddedToCartValidator.php b/subscription/Validator/CanProductBeAddedToCartValidator.php index d7102e684..1060d0139 100644 --- a/subscription/Validator/CanProductBeAddedToCartValidator.php +++ b/subscription/Validator/CanProductBeAddedToCartValidator.php @@ -6,7 +6,7 @@ use Mollie\Adapter\CartAdapter; use Mollie\Adapter\ToolsAdapter; -use Mollie\Subscription\Exception\ProductValidationException; +use Mollie\Subscription\Exception\ExceptionCode; use Mollie\Subscription\Exception\SubscriptionProductValidationException; class CanProductBeAddedToCartValidator @@ -32,12 +32,13 @@ public function __construct( /** * Validates if product can be added to the cart. - * Only 1 subscription product can be in cart and no other products can be added if there are subscription products - * For now we only allow one subscription product with any quantities, later might need to add logic to allow more products + * Only 1 subscription product can be to the cart * * @param int $productAttributeId * * @return bool + * + * @throws SubscriptionProductValidationException */ public function validate(int $productAttributeId): bool { @@ -49,11 +50,7 @@ public function validate(int $productAttributeId): bool $isNewSubscriptionProduct = $this->subscriptionProduct->validate($productAttributeId); - if ($isNewSubscriptionProduct) { - return $this->validateIfSubscriptionProductCanBeAdded($productAttributeId); - } - - return $this->validateIfProductCanBeAdded(); + return !$isNewSubscriptionProduct || $this->validateIfSubscriptionProductCanBeAdded($productAttributeId); } /** @@ -66,39 +63,17 @@ public function validate(int $productAttributeId): bool private function validateIfSubscriptionProductCanBeAdded(int $productAttributeId): bool { $cartProducts = $this->cart->getProducts(); - $numberOfProductsInCart = count($cartProducts); - // we can only have 1 product in cart if its subscription product - if ($numberOfProductsInCart > 1) { - throw new SubscriptionProductValidationException('Cart has multiple products', SubscriptionProductValidationException::MULTTIPLE_PRODUCTS_IN_CART); - } - // if it's the same product we can add more of the same product - if ($numberOfProductsInCart === 1) { - $cartProduct = reset($cartProducts); - - $isTheSameProduct = $productAttributeId === (int) $cartProduct['id_product_attribute']; - - if (!$isTheSameProduct) { - throw new SubscriptionProductValidationException('Cart has multiple products', SubscriptionProductValidationException::MULTTIPLE_PRODUCTS_IN_CART); + foreach ($cartProducts as $cartProduct) { + if (!$this->subscriptionProduct->validate((int) $cartProduct['id_product_attribute'])) { + continue; } - } - - return true; - } - /** - * @return bool - * - * @throws ProductValidationException - */ - private function validateIfProductCanBeAdded(): bool - { - $cartProducts = $this->cart->getProducts(); - foreach ($cartProducts as $cartProduct) { - $isSubscriptionProduct = $this->subscriptionProduct->validate((int) $cartProduct['id_product_attribute']); - if ($isSubscriptionProduct) { - throw new ProductValidationException('Cart has subscription products', ProductValidationException::SUBSCRIPTTION_PRODUCTS_IN_CART); + if ((int) $cartProduct['id_product_attribute'] === $productAttributeId) { + continue; } + + throw new SubscriptionProductValidationException('Cart already has subscription product', ExceptionCode::CART_ALREADY_HAS_SUBSCRIPTION_PRODUCT); } return true; diff --git a/subscription/Validator/SubscriptionOrderValidator.php b/subscription/Validator/SubscriptionOrderValidator.php index 100dbe24c..d6948f6aa 100644 --- a/subscription/Validator/SubscriptionOrderValidator.php +++ b/subscription/Validator/SubscriptionOrderValidator.php @@ -16,23 +16,20 @@ public function __construct(SubscriptionProductValidator $subscriptionProduct) $this->subscriptionProduct = $subscriptionProduct; } - /** Returns true if cart has subscription products */ + /** Returns true if cart has subscription product */ public function validate(Cart $cart): bool { $products = $cart->getProducts(); - // only one product can be subscribed at a time - if (count($products) !== 1) { - return false; - } - // checks if product is subscription product - // foreach is not necessary but might need to add more possible products for subscription in later updates + $subscriptionProductCount = 0; + + // checks if one of cart products is subscription product foreach ($products as $product) { if ($this->subscriptionProduct->validate((int) $product['id_product_attribute'])) { - return true; + ++$subscriptionProductCount; } } - return false; + return $subscriptionProductCount > 0 && $subscriptionProductCount < 2; } } diff --git a/subscription/Validator/SubscriptionProductValidator.php b/subscription/Validator/SubscriptionProductValidator.php index 3c24ec80a..e00f345f2 100644 --- a/subscription/Validator/SubscriptionProductValidator.php +++ b/subscription/Validator/SubscriptionProductValidator.php @@ -43,6 +43,7 @@ public function validate(int $productAttributeId): bool { $combination = $this->combination->getById($productAttributeId); $attributeIds = $this->combinationRepository->getIds((int) $combination->id); + foreach ($attributeIds as $attributeId) { if ($this->isSubscriptionAttribute((int) $attributeId['id_attribute'])) { return true; diff --git a/tests/Integration/Subscription/Factory/TestCreateSubscriptionData.php b/tests/Integration/Subscription/Factory/TestCreateSubscriptionData.php index c70d746c7..a3f3b0a2f 100644 --- a/tests/Integration/Subscription/Factory/TestCreateSubscriptionData.php +++ b/tests/Integration/Subscription/Factory/TestCreateSubscriptionData.php @@ -103,7 +103,12 @@ public function testBuild() ] ); - $subscriptionData = $createSubscriptionData->build($orderMock); + $subscriptionProduct = [ + 'id_product_attribute' => 999, + 'total_price_tax_incl' => 19.99, + ]; + + $subscriptionData = $createSubscriptionData->build($orderMock, $subscriptionProduct); $this->assertEquals(self::CUSTOMER_ID, $subscriptionData->getCustomerId()); $this->assertEquals( diff --git a/tests/Integration/Subscription/Validator/SubscriptionCartTest.php b/tests/Integration/Subscription/Validator/CanProductBeAddedToCartValidatorTest.php similarity index 93% rename from tests/Integration/Subscription/Validator/SubscriptionCartTest.php rename to tests/Integration/Subscription/Validator/CanProductBeAddedToCartValidatorTest.php index 248217403..319709425 100644 --- a/tests/Integration/Subscription/Validator/SubscriptionCartTest.php +++ b/tests/Integration/Subscription/Validator/CanProductBeAddedToCartValidatorTest.php @@ -1,9 +1,10 @@ randomAttributeId = self::NORMAL_PRODUCT_ATTRIBUTE_ID; @@ -58,7 +60,6 @@ protected function setUp(): void */ public function testValidate(string $combinationReference, bool $hasExtraAttribute, array $cartProducts, $expectedResult): void { - $language = new Language(1); $cartAdapterMock = $this->createMock(CartAdapter::class); $cartProducts = array_map(function (array $product) { @@ -114,7 +115,7 @@ public function productDataProvider(): array 'id_product_attribute' => self::NORMAL_PRODUCT_ATTRIBUTE_ID, ], ], - 'expected result' => SubscriptionProductValidationException::class, + 'expected result' => true, ], 'Add subscription product but already have another subscription product in cart' => [ 'subscription reference' => Config::SUBSCRIPTION_ATTRIBUTE_DAILY, @@ -134,7 +135,7 @@ public function productDataProvider(): array 'id_product_attribute' => Config::SUBSCRIPTION_ATTRIBUTE_MONTHLY, ], ], - 'expected result' => ProductValidationException::class, + 'expected result' => true, ], 'Add normal product but already have another normal product in cart' => [ 'subscription reference' => '', @@ -159,6 +160,6 @@ private function getCombination(string $combinationReference, bool $hasExtraAttr ]) : $this->randomAttributeId; } - return (int) Combination::getIdByReference(1, $reference); + return (int) \Combination::getIdByReference(1, $reference); } } diff --git a/tests/Integration/Subscription/Validator/SubscriptionOrderTest.php b/tests/Integration/Subscription/Validator/SubscriptionOrderValidatorTest.php similarity index 94% rename from tests/Integration/Subscription/Validator/SubscriptionOrderTest.php rename to tests/Integration/Subscription/Validator/SubscriptionOrderValidatorTest.php index df246ecc5..dd2467b2d 100644 --- a/tests/Integration/Subscription/Validator/SubscriptionOrderTest.php +++ b/tests/Integration/Subscription/Validator/SubscriptionOrderValidatorTest.php @@ -1,19 +1,21 @@ randomAttributeId = self::NORMAL_PRODUCT_ATTRIBUTE_ID; @@ -64,7 +66,7 @@ public function testValidate(array $orderProducts, $expectedResult): void $combinationMock = $this->createMock(CombinationAdapter::class); $combinationMock ->method('getById') - ->willReturn(new Combination(1)); + ->willReturn(new \Combination(1)); $subscriptionProductMock = $this->createMock(SubscriptionProductValidator::class); $mockedValidation = [ @@ -106,7 +108,7 @@ public function productDataProvider(): array Config::SUBSCRIPTION_ATTRIBUTE_DAILY, self::NORMAL_PRODUCT_ATTRIBUTE_ID, ], - 'expected result' => false, + 'expected result' => true, ], 'Only normal product' => [ 'order products' => [ diff --git a/tests/Integration/Subscription/Validator/SubscriptionProductTest.php b/tests/Integration/Subscription/Validator/SubscriptionProductValidatorTest.php similarity index 93% rename from tests/Integration/Subscription/Validator/SubscriptionProductTest.php rename to tests/Integration/Subscription/Validator/SubscriptionProductValidatorTest.php index 0b50b6c68..7448e07cb 100644 --- a/tests/Integration/Subscription/Validator/SubscriptionProductTest.php +++ b/tests/Integration/Subscription/Validator/SubscriptionProductValidatorTest.php @@ -1,15 +1,18 @@ randomAttributeId = 1; @@ -90,6 +93,6 @@ private function getCombination(string $combinationReference, bool $hasExtraAttr ]) : $this->randomAttributeId; } - return (int) Combination::getIdByReference(1, $reference); + return (int) \Combination::getIdByReference(1, $reference); } } diff --git a/tests/Unit/Factory/SubscriptionDataTest.php b/tests/Unit/Factory/SubscriptionDataTest.php index f133fdaf7..edbe8e30c 100644 --- a/tests/Unit/Factory/SubscriptionDataTest.php +++ b/tests/Unit/Factory/SubscriptionDataTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Mollie\Subscription\Tests\Unit\Factory; +namespace Mollie\Tests\Unit\Factory; use Mollie; use Mollie\Adapter\Link; @@ -74,11 +74,6 @@ public function testBuildSubscriptionData(string $customerId, float $totalAmount $order = $this->createMock('Order'); $order->method('getCustomer')->willReturn($customerMock); - $order->method('getCartProducts')->willReturn([ - [ - 'id_product_attribute' => 1, - ], - ]); $order->id = self::TEST_ORDER_ID; $order->reference = self::TEST_ORDER_REFERENCE; $order->id_cart = self::TEST_CART_ID; @@ -86,7 +81,12 @@ public function testBuildSubscriptionData(string $customerId, float $totalAmount $order->id_currency = 1; $order->total_paid_tax_incl = $totalAmount; - $subscriptionData = $subscriptionDataFactory->build($order); + $subscriptionProduct = [ + 'id_product_attribute' => 1, + 'total_price_tax_incl' => 19.99, + ]; + + $subscriptionData = $subscriptionDataFactory->build($order, $subscriptionProduct); $this->assertEquals($expectedResult, $subscriptionData); } From 1171d240aea9c263f423d2eb5e486fa36b5773ab Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Mon, 11 Sep 2023 14:24:32 +0300 Subject: [PATCH 078/109] PIPRES-261: Payment attribute fix (#806) * PIPRES-261: Payment attribute fix * changelog * replaced getProducts to getCartProducts and product attribute array key --- changelog.md | 5 +++++ subscription/Handler/SubscriptionCreationHandler.php | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/changelog.md b/changelog.md index 4a9477432..fcbc852ee 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,11 @@ # Changelog # +## Changes in release 6.0.4 ## ++ New payment method: Billie. ++ Enabled mixed cart for subscription orders. Various products could be coupled with a single subscription product. ++ Overall improvements and bug fixes. + ## Changes in release 6.0.3 ## + High priority bug fix impacting product add to cart pop-up. diff --git a/subscription/Handler/SubscriptionCreationHandler.php b/subscription/Handler/SubscriptionCreationHandler.php index 87f5f8d6a..864c0479d 100644 --- a/subscription/Handler/SubscriptionCreationHandler.php +++ b/subscription/Handler/SubscriptionCreationHandler.php @@ -40,11 +40,11 @@ public function __construct( public function handle(Order $order, string $method) { - $products = $order->getProducts(); + $products = $order->getCartProducts(); $subscriptionProduct = []; foreach ($products as $product) { - if (!$this->subscriptionProductValidator->validate((int) $product['product_attribute_id'])) { + if (!$this->subscriptionProductValidator->validate((int) $product['id_product_attribute'])) { continue; } @@ -65,7 +65,7 @@ private function createRecurringOrdersProduct(array $product): MolRecurringOrder { $recurringOrdersProduct = new MolRecurringOrdersProduct(); $recurringOrdersProduct->id_product = $product['id_product']; - $recurringOrdersProduct->id_product_attribute = $product['product_attribute_id']; + $recurringOrdersProduct->id_product_attribute = $product['id_product_attribute']; $recurringOrdersProduct->quantity = $product['product_quantity']; $recurringOrdersProduct->unit_price = $product['unit_price_tax_excl']; $recurringOrdersProduct->add(); From 85d6f0d94b78dc37a6ae80349e0c914d036f0576 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Mon, 18 Sep 2023 10:31:24 +0300 Subject: [PATCH 079/109] PIPRES-306: Configuration updateValue multishop context fix (#808) (#811) * PIPRES-306: Configuration updateValue multishop context fix * tests fix * stan fix --- mollie.php | 8 +- src/Adapter/ConfigurationAdapter.php | 70 +++++------ src/Adapter/Context.php | 5 + src/Adapter/ToolsAdapter.php | 14 ++- src/Service/CartLinesService.php | 2 +- src/Service/SettingsSaveService.php | 111 +++++++++--------- subscription/Install/AttributeInstaller.php | 2 +- subscription/Install/AttributeUninstaller.php | 2 +- tests/Integration/BaseTestCase.php | 2 +- tests/Unit/Service/CartLinesServiceTest.php | 28 +---- tests/Unit/Validator/VoucherValidatorTest.php | 5 +- 11 files changed, 121 insertions(+), 128 deletions(-) diff --git a/mollie.php b/mollie.php index 0b419b8d2..3ce85292f 100755 --- a/mollie.php +++ b/mollie.php @@ -176,7 +176,13 @@ public function install() $subscriptionInstaller = new Installer( new DatabaseTableInstaller(), - new AttributeInstaller(new NullLogger(), new ConfigurationAdapter(), $this, new LanguageAdapter(), new ProductAttributeAdapter()), + new AttributeInstaller( + new NullLogger(), + $this->getService(ConfigurationAdapter::class), + $this, + new LanguageAdapter(), + new ProductAttributeAdapter() + ), new HookInstaller($this) ); diff --git a/src/Adapter/ConfigurationAdapter.php b/src/Adapter/ConfigurationAdapter.php index 38ddb4d5a..ecee7e379 100644 --- a/src/Adapter/ConfigurationAdapter.php +++ b/src/Adapter/ConfigurationAdapter.php @@ -12,59 +12,51 @@ namespace Mollie\Adapter; -use Context; use Mollie\Config\Config; -use Shop; class ConfigurationAdapter { - public function get($key, $idShop = null, $idLang = null, $idShopGroup = null) + /** @var Context */ + private $context; + + public function __construct(Context $context) { - if (is_array($key)) { - if ((int) $this->get(Config::MOLLIE_ENVIRONMENT)) { - $key = $key['production']; - } else { - $key = $key['sandbox']; - } - } + $this->context = $context; + } + + /** + * @param string|array{production: string, sandbox: string} $key + */ + public function get($key, $idShop = null, $idLang = null, $idShopGroup = null): ?string + { + $key = $this->parseKeyByEnvironment($key); if (!$idShop) { - $idShop = Context::getContext()->shop->id; + $idShop = $this->context->getShopId(); } if (!$idShopGroup) { - $idShopGroup = Context::getContext()->shop->id_shop_group; + $idShopGroup = $this->context->getShopGroupId(); } - return \Configuration::get($key, $idLang, $idShopGroup, $idShop); + $result = \Configuration::get($key, $idLang, $idShopGroup, $idShop); + + return !empty($result) ? $result : null; } /** * @param string|array{production: string, sandbox: string} $key - * @param mixed $value - * @param ?int $idShop - * @param bool $html - * @param ?int $idShopGroup - * - * @return void */ - public function updateValue($key, $value, $idShop = null, $html = false, $idShopGroup = null) + public function updateValue($key, $value, $idShop = null, $html = false, $idShopGroup = null): void { - if (is_array($key)) { - if ((int) $this->get(Config::MOLLIE_ENVIRONMENT)) { - $key = $key['production']; - } else { - $key = $key['sandbox']; - } - } + $key = $this->parseKeyByEnvironment($key); - if ($idShop === null) { - $shops = Shop::getShops(true); - foreach ($shops as $shop) { - \Configuration::updateValue($key, $value, $html, $shop['id_shop_group'], $shop['id_shop']); - } + if (!$idShop) { + $idShop = $this->context->getShopId(); + } - return; + if (!$idShopGroup) { + $idShopGroup = $this->context->getShopGroupId(); } \Configuration::updateValue($key, $value, $html, $idShopGroup, $idShop); @@ -73,7 +65,15 @@ public function updateValue($key, $value, $idShop = null, $html = false, $idShop /** * @param string|array{production: string, sandbox: string} $key */ - public function delete($key) + public function delete($key): void + { + \Configuration::deleteByName($this->parseKeyByEnvironment($key)); + } + + /** + * @param string|array{production: string, sandbox: string} $key + */ + private function parseKeyByEnvironment($key): string { if (is_array($key)) { if ((int) $this->get(Config::MOLLIE_ENVIRONMENT)) { @@ -83,6 +83,6 @@ public function delete($key) } } - \Configuration::deleteByName($key); + return $key; } } diff --git a/src/Adapter/Context.php b/src/Adapter/Context.php index a2de76c69..2bdf0a9d5 100644 --- a/src/Adapter/Context.php +++ b/src/Adapter/Context.php @@ -125,4 +125,9 @@ public function getCountryId(): int { return (int) PrestashopContext::getContext()->country->id; } + + public function getShopGroupId(): int + { + return (int) PrestashopContext::getContext()->shop->id_shop_group; + } } diff --git a/src/Adapter/ToolsAdapter.php b/src/Adapter/ToolsAdapter.php index c091b043a..8730cf9c4 100644 --- a/src/Adapter/ToolsAdapter.php +++ b/src/Adapter/ToolsAdapter.php @@ -16,11 +16,6 @@ class ToolsAdapter { - public function strtoupper($str): string - { - return Tools::strtoupper($str); - } - public function strlen($str): string { return Tools::strlen($str); @@ -39,6 +34,13 @@ public function displayPrice($price, $currency): string public function getValue(string $key, string $defaultValue = null) { - return Tools::getValue($key, $defaultValue); + $result = Tools::getValue($key, $defaultValue); + + return !empty($result) ? $result : null; + } + + public function isSubmit(string $string): bool + { + return (bool) Tools::isSubmit($string); } } diff --git a/src/Service/CartLinesService.php b/src/Service/CartLinesService.php index 5ca553cc8..cbb6ef3ad 100644 --- a/src/Service/CartLinesService.php +++ b/src/Service/CartLinesService.php @@ -481,7 +481,7 @@ private function convertToLineArray(array $newItems, $currencyIsoCode, $apiRound $line->setQuantity((int) $item['quantity']); $line->setSku(isset($item['sku']) ? $item['sku'] : ''); - $currency = $this->tools->strtoupper($currencyIsoCode); + $currency = strtoupper(strtolower($currencyIsoCode)); if (isset($item['discount'])) { $line->setDiscountAmount(new Amount( diff --git a/src/Service/SettingsSaveService.php b/src/Service/SettingsSaveService.php index 8b7f9ca55..3b69b5c89 100644 --- a/src/Service/SettingsSaveService.php +++ b/src/Service/SettingsSaveService.php @@ -13,11 +13,11 @@ namespace Mollie\Service; use Carrier; -use Context; use Exception; use Mollie; use Mollie\Adapter\ConfigurationAdapter; -use Mollie\Adapter\Shop; +use Mollie\Adapter\Context; +use Mollie\Adapter\ToolsAdapter; use Mollie\Api\Exceptions\ApiException; use Mollie\Api\Types\PaymentStatus; use Mollie\Config\Config; @@ -26,13 +26,12 @@ use Mollie\Handler\Certificate\Exception\ApplePayDirectCertificateCreation; use Mollie\Handler\Settings\PaymentMethodPositionHandlerInterface; use Mollie\Repository\CountryRepository; -use Mollie\Repository\PaymentMethodRepository; +use Mollie\Repository\PaymentMethodRepositoryInterface; use Mollie\Utility\TagsUtility; use MolPaymentMethodIssuer; use OrderState; use PrestaShopDatabaseException; use PrestaShopException; -use Tools; class SettingsSaveService { @@ -49,7 +48,7 @@ class SettingsSaveService private $countryRepository; /** - * @var PaymentMethodRepository + * @var PaymentMethodRepositoryInterface */ private $paymentMethodRepository; @@ -83,22 +82,25 @@ class SettingsSaveService */ private $applePayDirectCertificateHandler; - /** @var Shop */ - private $shop; private $configurationAdapter; + /** @var Context */ + private $context; + /** @var ToolsAdapter */ + private $tools; public function __construct( Mollie $module, CountryRepository $countryRepository, - PaymentMethodRepository $paymentMethodRepository, + PaymentMethodRepositoryInterface $paymentMethodRepository, PaymentMethodService $paymentMethodService, ApiService $apiService, MolCarrierInformationService $carrierInformationService, PaymentMethodPositionHandlerInterface $paymentMethodPositionHandler, ApiKeyService $apiKeyService, CertificateHandlerInterface $applePayDirectCertificateHandler, - Shop $shop, - ConfigurationAdapter $configurationAdapter + ConfigurationAdapter $configurationAdapter, + Context $context, + ToolsAdapter $tools ) { $this->module = $module; $this->countryRepository = $countryRepository; @@ -109,8 +111,9 @@ public function __construct( $this->paymentMethodPositionHandler = $paymentMethodPositionHandler; $this->apiService = $apiService; $this->applePayDirectCertificateHandler = $applePayDirectCertificateHandler; - $this->shop = $shop; $this->configurationAdapter = $configurationAdapter; + $this->context = $context; + $this->tools = $tools; } /** @@ -125,10 +128,10 @@ public function __construct( public function saveSettings(&$errors = []) { $oldEnvironment = (int) $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT); - $environment = (int) Tools::getValue(Config::MOLLIE_ENVIRONMENT); - $mollieApiKey = Tools::getValue(Config::MOLLIE_API_KEY); - $mollieApiKeyTest = Tools::getValue(Config::MOLLIE_API_KEY_TEST); - $paymentOptionPositions = Tools::getValue(Config::MOLLIE_FORM_PAYMENT_OPTION_POSITION); + $environment = (int) $this->tools->getValue(Config::MOLLIE_ENVIRONMENT); + $mollieApiKey = $this->tools->getValue(Config::MOLLIE_API_KEY); + $mollieApiKeyTest = $this->tools->getValue(Config::MOLLIE_API_KEY_TEST); + $paymentOptionPositions = $this->tools->getValue(Config::MOLLIE_FORM_PAYMENT_OPTION_POSITION); $apiKey = Config::ENVIRONMENT_LIVE === (int) $environment ? $mollieApiKey : $mollieApiKeyTest; $isApiKeyIncorrect = 0 !== strpos($apiKey, 'live') && 0 !== strpos($apiKey, 'test'); @@ -139,14 +142,14 @@ public function saveSettings(&$errors = []) return $errors; } - if (Tools::getValue(Config::METHODS_CONFIG) && json_decode(Tools::getValue(Config::METHODS_CONFIG))) { + if ($this->tools->getValue(Config::METHODS_CONFIG) && json_decode($this->tools->getValue(Config::METHODS_CONFIG))) { $this->configurationAdapter->updateValue( Config::METHODS_CONFIG, - json_encode(@json_decode(Tools::getValue(Config::METHODS_CONFIG))) + json_encode(@json_decode($this->tools->getValue(Config::METHODS_CONFIG))) ); } - if ((int) Tools::getValue(Config::MOLLIE_ENV_CHANGED) === 1) { + if ((int) $this->tools->getValue(Config::MOLLIE_ENV_CHANGED) === 1) { $this->configurationAdapter->updateValue(Config::MOLLIE_API_KEY, $mollieApiKey); $this->configurationAdapter->updateValue(Config::MOLLIE_API_KEY_TEST, $mollieApiKeyTest); $this->configurationAdapter->updateValue(Config::MOLLIE_ENVIRONMENT, $environment); @@ -194,28 +197,28 @@ public function saveSettings(&$errors = []) } } - $countries = Tools::getValue(Config::MOLLIE_METHOD_CERTAIN_COUNTRIES . $method['id']); - $excludedCountries = Tools::getValue( + $countries = $this->tools->getValue(Config::MOLLIE_METHOD_CERTAIN_COUNTRIES . $method['id']); + $excludedCountries = $this->tools->getValue( Config::MOLLIE_METHOD_EXCLUDE_CERTAIN_COUNTRIES . $method['id'] ); $this->countryRepository->updatePaymentMethodCountries($paymentMethodId, $countries); $this->countryRepository->updatePaymentMethodExcludedCountries($paymentMethodId, $excludedCountries); } - $this->paymentMethodRepository->deleteOldPaymentMethods($savedPaymentMethods, $environment, (int) $this->shop->getShop()->id); + $this->paymentMethodRepository->deleteOldPaymentMethods($savedPaymentMethods, $environment, $this->context->getShopId()); } if ($paymentOptionPositions) { $this->paymentMethodPositionHandler->savePositions($paymentOptionPositions); } - $useCustomLogo = Tools::getValue(Config::MOLLIE_SHOW_CUSTOM_LOGO); + $useCustomLogo = $this->tools->getValue(Config::MOLLIE_SHOW_CUSTOM_LOGO); $this->configurationAdapter->updateValue( Config::MOLLIE_SHOW_CUSTOM_LOGO, $useCustomLogo ); - $isApplePayDirectProductEnabled = (int) Tools::getValue('MOLLIE_APPLE_PAY_DIRECT_PRODUCT_ENABLED'); - $isApplePayDirectCartEnabled = (int) Tools::getValue('MOLLIE_APPLE_PAY_DIRECT_CART_ENABLED'); + $isApplePayDirectProductEnabled = (int) $this->tools->getValue('MOLLIE_APPLE_PAY_DIRECT_PRODUCT_ENABLED'); + $isApplePayDirectCartEnabled = (int) $this->tools->getValue('MOLLIE_APPLE_PAY_DIRECT_CART_ENABLED'); if ($isApplePayDirectProductEnabled || $isApplePayDirectCartEnabled) { try { @@ -232,29 +235,29 @@ public function saveSettings(&$errors = []) } } - $molliePaymentscreenLocale = Tools::getValue(Config::MOLLIE_PAYMENTSCREEN_LOCALE); - $mollieOrderConfirmationSand = Tools::getValue(Config::MOLLIE_SEND_ORDER_CONFIRMATION); - $mollieIFrameEnabled = Tools::getValue(Config::MOLLIE_IFRAME[$environment ? 'production' : 'sandbox']); - $mollieSingleClickPaymentEnabled = Tools::getValue(Config::MOLLIE_SINGLE_CLICK_PAYMENT[$environment ? 'production' : 'sandbox']); - $mollieImages = Tools::getValue(Config::MOLLIE_IMAGES); - $showResentPayment = Tools::getValue(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK); - $mollieIssuers = Tools::getValue(Config::MOLLIE_ISSUERS[$environment ? 'production' : 'sandbox']); - $mollieCss = Tools::getValue(Config::MOLLIE_CSS); + $molliePaymentscreenLocale = $this->tools->getValue(Config::MOLLIE_PAYMENTSCREEN_LOCALE); + $mollieOrderConfirmationSand = $this->tools->getValue(Config::MOLLIE_SEND_ORDER_CONFIRMATION); + $mollieIFrameEnabled = $this->tools->getValue(Config::MOLLIE_IFRAME[$environment ? 'production' : 'sandbox']); + $mollieSingleClickPaymentEnabled = $this->tools->getValue(Config::MOLLIE_SINGLE_CLICK_PAYMENT[$environment ? 'production' : 'sandbox']); + $mollieImages = $this->tools->getValue(Config::MOLLIE_IMAGES); + $showResentPayment = $this->tools->getValue(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK); + $mollieIssuers = $this->tools->getValue(Config::MOLLIE_ISSUERS[$environment ? 'production' : 'sandbox']); + $mollieCss = $this->tools->getValue(Config::MOLLIE_CSS); if (!isset($mollieCss)) { $mollieCss = ''; } - $mollieLogger = Tools::getValue(Config::MOLLIE_DEBUG_LOG); - $mollieApi = Tools::getValue(Config::MOLLIE_API); - $mollieMethodCountriesEnabled = (int) Tools::getValue(Config::MOLLIE_METHOD_COUNTRIES); - $mollieMethodCountriesDisplayEnabled = (int) Tools::getValue(Config::MOLLIE_METHOD_COUNTRIES_DISPLAY); - $mollieErrors = Tools::getValue(Config::MOLLIE_DISPLAY_ERRORS); - $voucherCategory = Tools::getValue(Config::MOLLIE_VOUCHER_CATEGORY); - $applePayDirectStyle = Tools::getValue(Config::MOLLIE_APPLE_PAY_DIRECT_STYLE); - $isBancontactQrCodeEnabled = Tools::getValue(Config::MOLLIE_BANCONTACT_QR_CODE_ENABLED); + $mollieLogger = $this->tools->getValue(Config::MOLLIE_DEBUG_LOG); + $mollieApi = $this->tools->getValue(Config::MOLLIE_API); + $mollieMethodCountriesEnabled = (int) $this->tools->getValue(Config::MOLLIE_METHOD_COUNTRIES); + $mollieMethodCountriesDisplayEnabled = (int) $this->tools->getValue(Config::MOLLIE_METHOD_COUNTRIES_DISPLAY); + $mollieErrors = $this->tools->getValue(Config::MOLLIE_DISPLAY_ERRORS); + $voucherCategory = $this->tools->getValue(Config::MOLLIE_VOUCHER_CATEGORY); + $applePayDirectStyle = $this->tools->getValue(Config::MOLLIE_APPLE_PAY_DIRECT_STYLE); + $isBancontactQrCodeEnabled = $this->tools->getValue(Config::MOLLIE_BANCONTACT_QR_CODE_ENABLED); - $mollieShipMain = Tools::getValue(Config::MOLLIE_AUTO_SHIP_MAIN); + $mollieShipMain = $this->tools->getValue(Config::MOLLIE_AUTO_SHIP_MAIN); if (!isset($mollieErrors)) { $mollieErrors = false; } else { @@ -315,10 +318,10 @@ public function saveSettings(&$errors = []) $this->configurationAdapter->updateValue(Config::MOLLIE_AUTO_SHIP_MAIN, (int) $mollieShipMain); $this->configurationAdapter->updateValue( Config::MOLLIE_TRACKING_URLS, - json_encode(@json_decode(Tools::getValue(Config::MOLLIE_TRACKING_URLS))) + json_encode(@json_decode($this->tools->getValue(Config::MOLLIE_TRACKING_URLS))) ); $carriers = Carrier::getCarriers( - Context::getContext()->language->id, + $this->context->getLanguageId(), false, false, false, @@ -326,24 +329,24 @@ public function saveSettings(&$errors = []) Carrier::ALL_CARRIERS ); foreach ($carriers as $carrier) { - $urlSource = Tools::getValue(Config::MOLLIE_CARRIER_URL_SOURCE . $carrier['id_carrier']); - $customUrl = Tools::getValue(Config::MOLLIE_CARRIER_CUSTOM_URL . $carrier['id_carrier']); + $urlSource = $this->tools->getValue(Config::MOLLIE_CARRIER_URL_SOURCE . $carrier['id_carrier']); + $customUrl = $this->tools->getValue(Config::MOLLIE_CARRIER_CUSTOM_URL . $carrier['id_carrier']); $this->carrierInformationService->saveMolCarrierInfo($carrier['id_carrier'], $urlSource, $customUrl); } foreach (array_keys(Config::getStatuses()) as $name) { - $name = Tools::strtoupper($name); - if (false === Tools::getValue("MOLLIE_STATUS_{$name}")) { + $name = strtoupper(strtolower($name)); + if (!$this->tools->getValue("MOLLIE_STATUS_{$name}")) { continue; } - $new = (int) Tools::getValue("MOLLIE_STATUS_{$name}"); + $new = (int) $this->tools->getValue("MOLLIE_STATUS_{$name}"); $this->configurationAdapter->updateValue("MOLLIE_STATUS_{$name}", $new); - Config::getStatuses()[Tools::strtolower($name)] = $new; + Config::getStatuses()[strtolower(strtoupper($name))] = $new; if (PaymentStatus::STATUS_OPEN != $name) { $this->configurationAdapter->updateValue( "MOLLIE_MAIL_WHEN_{$name}", - Tools::getValue("MOLLIE_MAIL_WHEN_{$name}") ? true : false + (bool) $this->tools->getValue("MOLLIE_MAIL_WHEN_{$name}") ); } } @@ -371,9 +374,9 @@ public function saveSettings(&$errors = []) private function getStatusesValue($key) { $statesEnabled = []; - $context = Context::getContext(); - foreach (OrderState::getOrderStates($context->language->id) as $state) { - if (Tools::isSubmit($key . '_' . $state['id_order_state'])) { + + foreach (OrderState::getOrderStates($this->context->getLanguageId()) as $state) { + if ($this->tools->isSubmit($key . '_' . $state['id_order_state'])) { $statesEnabled[] = $state['id_order_state']; } } @@ -383,7 +386,7 @@ private function getStatusesValue($key) private function handleAuthorizablePaymentInvoiceStatus(): void { - $authorizablePaymentInvoiceOnStatus = (string) Tools::getValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS); + $authorizablePaymentInvoiceOnStatus = $this->tools->getValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS); $this->configurationAdapter->updateValue(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS, $authorizablePaymentInvoiceOnStatus); diff --git a/subscription/Install/AttributeInstaller.php b/subscription/Install/AttributeInstaller.php index 3636418da..edaf8a244 100644 --- a/subscription/Install/AttributeInstaller.php +++ b/subscription/Install/AttributeInstaller.php @@ -73,7 +73,7 @@ public function install(): bool */ private function createAttributeGroup(array $languages): AttributeGroup { - $existingAttributeGroup = new AttributeGroup($this->configuration->get(Config::SUBSCRIPTION_ATTRIBUTE_GROUP)); + $existingAttributeGroup = new AttributeGroup((int) $this->configuration->get(Config::SUBSCRIPTION_ATTRIBUTE_GROUP)); if (Validate::isLoadedObject($existingAttributeGroup)) { return $existingAttributeGroup; } diff --git a/subscription/Install/AttributeUninstaller.php b/subscription/Install/AttributeUninstaller.php index 0788b58ba..8de11089b 100644 --- a/subscription/Install/AttributeUninstaller.php +++ b/subscription/Install/AttributeUninstaller.php @@ -47,7 +47,7 @@ public function uninstall(): bool $attribute->delete(); } - $attributeGroup = new \AttributeGroup($this->configuration->get(Config::SUBSCRIPTION_ATTRIBUTE_GROUP)); + $attributeGroup = new \AttributeGroup((int) $this->configuration->get(Config::SUBSCRIPTION_ATTRIBUTE_GROUP)); $attributeGroup->delete(); } catch (PrestaShopException $e) { $this->errors[] = $this->module->l('Failed to delete attributes', self::FILE_NAME); diff --git a/tests/Integration/BaseTestCase.php b/tests/Integration/BaseTestCase.php index 7a8b1bb7e..d5afe0150 100644 --- a/tests/Integration/BaseTestCase.php +++ b/tests/Integration/BaseTestCase.php @@ -43,7 +43,7 @@ protected function setUp() $this->contextBuilder = new ContextBuilder(); $this->contextBuilder->setDefaults(); - $this->configuration = new ConfigurationAdapter(); + $this->configuration = $this->getService(ConfigurationAdapter::class); } protected function tearDown() diff --git a/tests/Unit/Service/CartLinesServiceTest.php b/tests/Unit/Service/CartLinesServiceTest.php index 1d80eba79..3816e97f7 100644 --- a/tests/Unit/Service/CartLinesServiceTest.php +++ b/tests/Unit/Service/CartLinesServiceTest.php @@ -10,7 +10,7 @@ * @codingStandardsIgnoreStart */ -namespace Service; +namespace Mollie\Tests\Unit\Service; use Mollie\Adapter\ConfigurationAdapter; use Mollie\Adapter\Context; @@ -55,7 +55,7 @@ public function testGetCartLines( $mocks, $result ) { - $configurationAdapter = $this->getMockBuilder(ConfigurationAdapter::class)->getMock(); + $configurationAdapter = $this->createMock(ConfigurationAdapter::class); foreach ($mocks as $mock) { $configurationAdapter->expects(self::at($mock['at']))->method($mock['function'])->with($mock['expects'])->willReturn($mock['return']); @@ -165,12 +165,6 @@ public function cartLinesProvider() ], ], 'toolsMocks' => [ - 0 => [ - 'function' => 'strtoupper', - 'expects' => $currencyIsoCode, - 'return' => $currencyIsoCode, - 'at' => 0, - ], ], 'mocks' => [], 'result' => [ @@ -279,12 +273,6 @@ public function cartLinesProvider() ], ], 'toolsMocks' => [ - 0 => [ - 'function' => 'strtoupper', - 'expects' => $currencyIsoCode, - 'return' => $currencyIsoCode, - 'at' => 0, - ], ], 'mocks' => [], 'result' => [ @@ -370,12 +358,6 @@ public function cartLinesProvider() ], ], 'toolsMocks' => [ - 0 => [ - 'function' => 'strtoupper', - 'expects' => $currencyIsoCode, - 'return' => $currencyIsoCode, - 'at' => 0, - ], ], 'mocks' => [], 'result' => [ @@ -447,12 +429,6 @@ public function cartLinesProvider() ], ], 'toolsMocks' => [ - 0 => [ - 'function' => 'strtoupper', - 'expects' => $currencyIsoCode, - 'return' => $currencyIsoCode, - 'at' => 0, - ], ], 'mocks' => [], 'result' => [ diff --git a/tests/Unit/Validator/VoucherValidatorTest.php b/tests/Unit/Validator/VoucherValidatorTest.php index 911c3eeac..411a85dd5 100644 --- a/tests/Unit/Validator/VoucherValidatorTest.php +++ b/tests/Unit/Validator/VoucherValidatorTest.php @@ -10,7 +10,7 @@ * @codingStandardsIgnoreStart */ -namespace Validator; +namespace Mollie\Tests\Unit\Validator; use Mollie\Adapter\ConfigurationAdapter; use Mollie\Config\Config; @@ -31,7 +31,8 @@ class VoucherValidatorTest extends TestCase public function testValidate(array $products, $configurationMocks, $voucherServiceMocks, $result) { /** @var MockObject $configurationAdapter */ - $configurationAdapter = $this->getMockBuilder(ConfigurationAdapter::class)->getMock(); + $configurationAdapter = $this->createMock(ConfigurationAdapter::class); + foreach ($configurationMocks as $mock) { $configurationAdapter->expects(self::at($mock['at']))->method($mock['function'])->with($mock['expects'])->willReturn($mock['return']); } From 556480dbf6ae63587ba816d26186d16fd41fc9ac Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Tue, 19 Sep 2023 10:18:08 +0300 Subject: [PATCH 080/109] PIPRES-338: Mixed cart subscription listing improvements (#812) * PIPRES-338: Mixed cart subscription listing improvements * added rounding for total price and moved part of install improvements to main install file * fix * added mandate_id append to upgrade file too * fix --- controllers/front/recurringOrderDetail.php | 2 +- controllers/front/subscriptions.php | 2 +- src/Install/DatabaseTableInstaller.php | 29 ++++++- src/Install/DatabaseTableUninstaller.php | 1 - src/Service/MailService.php | 15 +++- subscription/Entity/MolRecurringOrder.php | 4 + .../Factory/CreateSubscriptionDataFactory.php | 6 +- .../SubscriptionGridDefinitionFactory.php | 12 +-- .../Grid/SubscriptionGridQueryBuilder.php | 4 +- .../Handler/SubscriptionCreationHandler.php | 1 + .../Install/DatabaseTableInstaller.php | 40 +++++++++- subscription/Presenter/OrderPresenter.php | 35 +++++++++ .../Presenter/RecurringOrderLazyArray.php | 40 ++++++++++ .../Presenter/RecurringOrderPresenter.php | 19 ++++- .../Presenter/RecurringOrdersPresenter.php | 15 +--- .../Presenter/OrderPresenterTest.php | 75 +++++++++++++++++++ tests/bootstrap.php | 20 ++++- upgrade/Upgrade-6.0.4.php | 71 ++++++++++++++++++ 18 files changed, 350 insertions(+), 41 deletions(-) create mode 100644 subscription/Presenter/OrderPresenter.php create mode 100644 subscription/Presenter/RecurringOrderLazyArray.php create mode 100644 tests/Integration/Subscription/Presenter/OrderPresenterTest.php diff --git a/controllers/front/recurringOrderDetail.php b/controllers/front/recurringOrderDetail.php index b0b5d0b48..6fe4b7b86 100644 --- a/controllers/front/recurringOrderDetail.php +++ b/controllers/front/recurringOrderDetail.php @@ -27,7 +27,7 @@ use Mollie\Controller\AbstractMollieController; use Mollie\Subscription\Handler\FreeOrderCreationHandler; use Mollie\Subscription\Handler\SubscriptionCancellationHandler; -use Mollie\Subscription\Logger\RecurringOrderPresenter; +use Mollie\Subscription\Presenter\RecurringOrderPresenter; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; class MollieRecurringOrderDetailModuleFrontController extends AbstractMollieController diff --git a/controllers/front/subscriptions.php b/controllers/front/subscriptions.php index 5bc2db973..b0a9d81b2 100644 --- a/controllers/front/subscriptions.php +++ b/controllers/front/subscriptions.php @@ -1,7 +1,7 @@ getCommands(); foreach ($commands as $query) { - if (false == Db::getInstance()->execute($query)) { + if (!Db::getInstance()->execute($query)) { return false; } } - return true; + return $this->alterTableCommands(); } /** @@ -142,4 +142,29 @@ private function getCommands() return $sql; } + + private function alterTableCommands(): bool + { + $query = ' + SELECT COUNT(*) > 0 AS count + FROM information_schema.columns + WHERE TABLE_SCHEMA = "' . _DB_NAME_ . '" AND table_name = "' . _DB_PREFIX_ . 'mollie_payments" AND column_name = "mandate_id"; + '; + + /* only run if it doesn't exist */ + if (Db::getInstance()->getValue($query)) { + return true; + } + + $query = ' + ALTER TABLE ' . _DB_PREFIX_ . 'mollie_payments + ADD COLUMN mandate_id VARCHAR(64); + '; + + if (!Db::getInstance()->execute($query)) { + return false; + } + + return true; + } } diff --git a/src/Install/DatabaseTableUninstaller.php b/src/Install/DatabaseTableUninstaller.php index 7f6d24ed5..2dde9bee9 100644 --- a/src/Install/DatabaseTableUninstaller.php +++ b/src/Install/DatabaseTableUninstaller.php @@ -34,7 +34,6 @@ private function getCommands(): array $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_country`;'; $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_payment_method`;'; $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_issuer`;'; - $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_order_payment_fee`;'; $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_carrier_information`;'; $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_pending_order_cart`;'; $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_excluded_country`;'; diff --git a/src/Service/MailService.php b/src/Service/MailService.php index ebe359d5e..3b0d812d7 100644 --- a/src/Service/MailService.php +++ b/src/Service/MailService.php @@ -34,7 +34,6 @@ use Order; use OrderState; use PDF; -use PrestaShop\Decimal\Number; use Product; use State; use Tools; @@ -186,13 +185,21 @@ private function getSubscriptionCancellationWarningMailData( Customer $customer ): array { $product = new Product($recurringOrderProduct->id_product, false, $customer->id_lang); - $totalPrice = NumberUtility::times((float) $recurringOrderProduct->unit_price, (float) $recurringOrderProduct->quantity); - $unitPrice = new Number((string) $recurringOrderProduct->unit_price); + + $totalPrice = NumberUtility::toPrecision( + (float) $recurringOrder->total_tax_incl, + NumberUtility::DECIMAL_PRECISION + ); + + $unitPrice = NumberUtility::toPrecision( + (float) $recurringOrderProduct->unit_price, + NumberUtility::DECIMAL_PRECISION + ); return [ 'subscription_reference' => $recurringOrder->mollie_subscription_id, 'product_name' => $product->name, - 'unit_price' => $this->toolsAdapter->displayPrice($unitPrice->toPrecision(2), new Currency($recurringOrder->id_currency)), + 'unit_price' => $this->toolsAdapter->displayPrice($unitPrice, new Currency($recurringOrder->id_currency)), 'quantity' => $recurringOrderProduct->quantity, 'total_price' => $this->toolsAdapter->displayPrice($totalPrice, new Currency($recurringOrder->id_currency)), 'firstName' => $customer->firstname, diff --git a/subscription/Entity/MolRecurringOrder.php b/subscription/Entity/MolRecurringOrder.php index 691339212..07adcee47 100644 --- a/subscription/Entity/MolRecurringOrder.php +++ b/subscription/Entity/MolRecurringOrder.php @@ -29,6 +29,9 @@ class MolRecurringOrder extends ObjectModel /** @var string */ public $status; + /** @var float */ + public $total_tax_incl; + /** @var string */ public $payment_method; @@ -71,6 +74,7 @@ class MolRecurringOrder extends ObjectModel 'mollie_customer_id' => ['type' => self::TYPE_STRING, 'validate' => 'isString'], 'description' => ['type' => self::TYPE_STRING, 'validate' => 'isString'], 'status' => ['type' => self::TYPE_STRING, 'validate' => 'isString'], + 'total_tax_incl' => ['type' => self::TYPE_FLOAT, 'validate' => 'isFloat'], 'payment_method' => ['type' => self::TYPE_STRING, 'validate' => 'isString'], 'next_payment' => ['type' => self::TYPE_DATE], 'reminder_at' => ['type' => self::TYPE_DATE], diff --git a/subscription/Factory/CreateSubscriptionDataFactory.php b/subscription/Factory/CreateSubscriptionDataFactory.php index 109774f7b..6563b892c 100644 --- a/subscription/Factory/CreateSubscriptionDataFactory.php +++ b/subscription/Factory/CreateSubscriptionDataFactory.php @@ -74,10 +74,14 @@ public function build(Order $order, array $subscriptionProduct): SubscriptionDat $currency = $this->currencyAdapter->getById((int) $order->id_currency); $description = $this->subscriptionDescription->getSubscriptionDescription($order); + $orderTotal = (float) $subscriptionProduct['total_price_tax_incl'] + + (float) $order->total_wrapping_tax_incl + + (float) $order->total_shipping_tax_incl; + /** * NOTE: we will only send product price as total for subscriptions */ - $orderAmount = new Amount((float) $subscriptionProduct['total_price_tax_incl'], $currency->iso_code); + $orderAmount = new Amount($orderTotal, $currency->iso_code); $subscriptionData = new SubscriptionDataDTO( $molCustomer->customer_id, $orderAmount, diff --git a/subscription/Grid/SubscriptionGridDefinitionFactory.php b/subscription/Grid/SubscriptionGridDefinitionFactory.php index ea1f1b8dd..876d18058 100644 --- a/subscription/Grid/SubscriptionGridDefinitionFactory.php +++ b/subscription/Grid/SubscriptionGridDefinitionFactory.php @@ -104,10 +104,10 @@ protected function getColumns() 'sortable' => true, ]) ) - ->add((new DataColumn('unit_price')) - ->setName($this->module->l('Unit price', self::FILE_NAME)) + ->add((new DataColumn('total_price')) + ->setName($this->module->l('Total price', self::FILE_NAME)) ->setOptions([ - 'field' => 'unit_price', + 'field' => 'total_price', 'sortable' => true, ]) ) @@ -220,14 +220,14 @@ protected function getFilters() ]) ->setAssociatedColumn('status') ) - ->add((new Filter('unit_price', MoneyType::class)) + ->add((new Filter('total_price', MoneyType::class)) ->setTypeOptions([ 'required' => false, 'attr' => [ - 'placeholder' => $this->module->l('Unit price', self::FILE_NAME), + 'placeholder' => $this->module->l('Total price', self::FILE_NAME), ], ]) - ->setAssociatedColumn('unit_price') + ->setAssociatedColumn('total_price') ) ->add((new Filter('iso_code', TextType::class)) ->setTypeOptions([ diff --git a/subscription/Grid/SubscriptionGridQueryBuilder.php b/subscription/Grid/SubscriptionGridQueryBuilder.php index 61a4db912..307d27150 100644 --- a/subscription/Grid/SubscriptionGridQueryBuilder.php +++ b/subscription/Grid/SubscriptionGridQueryBuilder.php @@ -47,7 +47,7 @@ public function getSearchQueryBuilder(SearchCriteriaInterface $searchCriteria): $qb = $this->getQueryBuilder($searchCriteria->getFilters()) ->select('recurring_order.*') ->addSelect($this->getNameField() . ' as fullname') - ->addSelect('ROUND(orders.total_paid, 2) as unit_price') + ->addSelect('ROUND(recurring_order.total_tax_incl, 2) as total_price') ->addSelect('currency.iso_code') ; @@ -106,7 +106,7 @@ private function applyFilters(array $filters, QueryBuilder $qb): void 'fullname' => $this->getNameField(), 'description' => 'recurring_order.description', 'status' => 'recurring_order.status', - 'unit_price' => 'orders.total_paid', + 'total_price' => 'recurring_order.total_tax_incl', 'iso_code' => 'currency.iso_code', ]; diff --git a/subscription/Handler/SubscriptionCreationHandler.php b/subscription/Handler/SubscriptionCreationHandler.php index 864c0479d..89c5c220a 100644 --- a/subscription/Handler/SubscriptionCreationHandler.php +++ b/subscription/Handler/SubscriptionCreationHandler.php @@ -85,6 +85,7 @@ private function createRecurringOrder(MolRecurringOrdersProduct $recurringOrders $recurringOrder->id_address_invoice = $order->id_address_invoice; $recurringOrder->description = $subscription->description; $recurringOrder->status = $subscription->status; + $recurringOrder->total_tax_incl = (float) $subscription->amount->value; $recurringOrder->payment_method = $method; $recurringOrder->next_payment = $subscription->nextPaymentDate; $recurringOrder->reminder_at = $subscription->nextPaymentDate; //todo: add logic to get reminder date when reminder is done diff --git a/subscription/Install/DatabaseTableInstaller.php b/subscription/Install/DatabaseTableInstaller.php index d8ea0783b..497e6718c 100644 --- a/subscription/Install/DatabaseTableInstaller.php +++ b/subscription/Install/DatabaseTableInstaller.php @@ -13,12 +13,12 @@ public function install(): bool $commands = $this->getCommands(); foreach ($commands as $query) { - if (false == Db::getInstance()->execute($query)) { + if (!Db::getInstance()->execute($query)) { return false; } } - return true; + return $this->alterTableCommands(); } /** @@ -45,6 +45,7 @@ private function getCommands(): array `mollie_customer_id` VARCHAR(64) NOT NULL, `payment_method` VARCHAR(64) NOT NULL, `id_mol_recurring_orders_product` INT(64) NOT NULL, + `total_tax_incl` decimal(20, 6) NOT NULL, `date_add` datetime NOT NULL, `date_update` datetime NOT NULL ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;'; @@ -61,4 +62,39 @@ private function getCommands(): array return $sql; } + + private function alterTableCommands(): bool + { + $query = ' + SELECT COUNT(*) > 0 AS count + FROM information_schema.columns + WHERE TABLE_SCHEMA = "' . _DB_NAME_ . '" AND table_name = "' . _DB_PREFIX_ . 'mol_recurring_order" AND column_name = "total_tax_incl"; + '; + + /* only run if it doesn't exist */ + if (Db::getInstance()->getValue($query)) { + return true; + } + + $query = ' + ALTER TABLE ' . _DB_PREFIX_ . 'mol_recurring_order + ADD COLUMN total_tax_incl decimal(20, 6) NOT NULL; + '; + + if (!Db::getInstance()->execute($query)) { + return false; + } + + $query = ' + UPDATE ' . _DB_PREFIX_ . 'mol_recurring_order ro + JOIN ' . _DB_PREFIX_ . 'orders o ON ro.id_order = o.id_order + SET ro.total_tax_incl = o.total_paid_tax_incl; + '; + + if (!Db::getInstance()->execute($query)) { + return false; + } + + return true; + } } diff --git a/subscription/Presenter/OrderPresenter.php b/subscription/Presenter/OrderPresenter.php new file mode 100644 index 000000000..c907b7e7c --- /dev/null +++ b/subscription/Presenter/OrderPresenter.php @@ -0,0 +1,35 @@ +getCartProducts(); + + foreach ($orderProducts as $orderProduct) { + if ((int) $orderProduct['id_product_attribute'] !== $recurringOrderProductAttributeId) { + $order->total_paid_tax_excl -= (float) $orderProduct['total_price_tax_excl']; + + continue; + } + + $order->total_products = (float) $orderProduct['total_price_tax_excl']; + $order->total_products_wt = (float) $orderProduct['total_price_tax_incl']; + $order->total_paid_tax_incl = $recurringOrderTotalTaxIncl; + $order->total_paid = $recurringOrderTotalTaxIncl; + + break; + } + + $orderLazyArray = new RecurringOrderLazyArray($order); + + $orderLazyArray->setRecurringOrderProductAttributeId($recurringOrderProductAttributeId); + + return $orderLazyArray; + } +} diff --git a/subscription/Presenter/RecurringOrderLazyArray.php b/subscription/Presenter/RecurringOrderLazyArray.php new file mode 100644 index 000000000..7d91bf59f --- /dev/null +++ b/subscription/Presenter/RecurringOrderLazyArray.php @@ -0,0 +1,40 @@ +recurringOrderProductAttributeId = $recurringOrderProductAttributeId; + } + + /** + * @arrayAccess + * + * @return array + */ + public function getProducts(): array + { + $subscriptionProduct = []; + + $orderProducts = parent::getProducts(); + + foreach ($orderProducts as $orderProduct) { + if ((int) $orderProduct['id_product_attribute'] !== $this->recurringOrderProductAttributeId) { + continue; + } + + $subscriptionProduct[] = $orderProduct; + + break; + } + + return $subscriptionProduct; + } +} diff --git a/subscription/Presenter/RecurringOrderPresenter.php b/subscription/Presenter/RecurringOrderPresenter.php index abb4c60b8..3601cec40 100644 --- a/subscription/Presenter/RecurringOrderPresenter.php +++ b/subscription/Presenter/RecurringOrderPresenter.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace Mollie\Subscription\Logger; +namespace Mollie\Subscription\Presenter; use Currency; use Mollie\Adapter\Language; use Mollie\Subscription\Api\MethodApi; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; use Mollie\Subscription\Repository\RecurringOrdersProductRepositoryInterface; +use Mollie\Utility\NumberUtility; use Order; -use PrestaShop\PrestaShop\Adapter\Presenter\Order\OrderPresenter; use Product; class RecurringOrderPresenter @@ -23,17 +23,21 @@ class RecurringOrderPresenter private $language; /** @var MethodApi */ private $methodApi; + /** @var OrderPresenter */ + private $orderPresenter; public function __construct( RecurringOrderRepositoryInterface $recurringOrderRepository, RecurringOrdersProductRepositoryInterface $recurringOrdersProductRepository, Language $language, - MethodApi $methodApi + MethodApi $methodApi, + OrderPresenter $orderPresenter ) { $this->recurringOrderRepository = $recurringOrderRepository; $this->recurringOrdersProductRepository = $recurringOrdersProductRepository; $this->language = $language; $this->methodApi = $methodApi; + $this->orderPresenter = $orderPresenter; } public function present(int $recurringOrderId): array @@ -56,7 +60,14 @@ public function present(int $recurringOrderId): array $recurringOrderData['recurring_order'] = $recurringOrder; $recurringOrderData['recurring_product'] = $recurringProduct; $recurringOrderData['product'] = $product; - $recurringOrderData['order'] = (new OrderPresenter())->present($order); + $recurringOrderData['order'] = $this->orderPresenter->present( + $order, + (int) $recurringProduct->id_product_attribute, + NumberUtility::toPrecision( + (float) $recurringOrder->total_tax_incl, + NumberUtility::DECIMAL_PRECISION + ) + ); $recurringOrderData['payment_methods'] = $this->methodApi->getMethodsForFirstPayment($this->language->getContextLanguage()->locale, $currency->iso_code); return $recurringOrderData; diff --git a/subscription/Presenter/RecurringOrdersPresenter.php b/subscription/Presenter/RecurringOrdersPresenter.php index 3557f0f36..42bc1f93b 100644 --- a/subscription/Presenter/RecurringOrdersPresenter.php +++ b/subscription/Presenter/RecurringOrdersPresenter.php @@ -2,19 +2,17 @@ declare(strict_types=1); -namespace Mollie\Subscription\Logger; +namespace Mollie\Subscription\Presenter; use Currency; use Mollie\Adapter\Context; use Mollie\Adapter\Language; use Mollie\Adapter\Link; use Mollie\Adapter\ToolsAdapter; -use Mollie\Repository\OrderRepositoryInterface; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; use Mollie\Subscription\Repository\RecurringOrdersProductRepositoryInterface; use Mollie\Utility\NumberUtility; use MolRecurringOrder; -use Order; use Product; class RecurringOrdersPresenter @@ -29,8 +27,6 @@ class RecurringOrdersPresenter private $language; /** @var ToolsAdapter */ private $tools; - /** @var OrderRepositoryInterface */ - private $orderRepository; /** @var Context */ private $context; @@ -40,7 +36,6 @@ public function __construct( Link $link, Language $language, ToolsAdapter $tools, - OrderRepositoryInterface $orderRepository, Context $context ) { $this->recurringOrderRepository = $recurringOrderRepository; @@ -48,7 +43,6 @@ public function __construct( $this->recurringOrdersProductRepository = $recurringOrdersProductRepository; $this->language = $language; $this->tools = $tools; - $this->orderRepository = $orderRepository; $this->context = $context; } @@ -64,11 +58,6 @@ public function present(string $molCustomerId): array $recurringOrdersPresentData = []; /** @var MolRecurringOrder $recurringOrder */ foreach ($recurringOrders as $recurringOrder) { - /** @var Order $order */ - $order = $this->orderRepository->findOneBy([ - 'id_order' => $recurringOrder->id_order, - ]); - $recurringProduct = $this->recurringOrdersProductRepository->findOneBy([ 'id_mol_recurring_orders_product' => $recurringOrder->id, ]); @@ -79,7 +68,7 @@ public function present(string $molCustomerId): array $recurringOrderData['recurring_order'] = $recurringOrder; $recurringOrderData['details_url'] = $this->link->getModuleLink('mollie', 'recurringOrderDetail', ['id_mol_recurring_order' => $recurringOrder->id]); $recurringOrderData['product_name'] = is_array($product->name) ? $product->name[$this->context->getLanguageId()] : $product->name; - $recurringOrderData['total_price'] = $this->tools->displayPrice(NumberUtility::toPrecision((float) $order->total_paid, 2), new Currency($recurringOrder->id_currency)); + $recurringOrderData['total_price'] = $this->tools->displayPrice(NumberUtility::toPrecision((float) $recurringOrder->total_tax_incl, 2), new Currency($recurringOrder->id_currency)); $recurringOrderData['currency'] = new \Currency($recurringOrder->id_currency); $recurringOrdersPresentData[] = $recurringOrderData; } diff --git a/tests/Integration/Subscription/Presenter/OrderPresenterTest.php b/tests/Integration/Subscription/Presenter/OrderPresenterTest.php new file mode 100644 index 000000000..1b3ad9a7a --- /dev/null +++ b/tests/Integration/Subscription/Presenter/OrderPresenterTest.php @@ -0,0 +1,75 @@ + 1, + 'id_product_attribute' => 1, + 'total_price_tax_excl' => 10.00, + 'product_price' => 10.00, + 'total_price' => 10.00, + 'total_price_tax_incl' => 12.10, + 'product_price_wt' => 12.10, + 'total_wt' => 12.10, + 'product_name' => 'test-product-1', + 'product_quantity' => 1, + 'product_id' => 1, + 'id_customization' => 1, + ], + [ + 'product_attribute_id' => 2, + 'id_product_attribute' => 2, + 'total_price_tax_excl' => 100.00, + 'product_price' => 100.00, + 'total_price' => 100.00, + 'total_price_tax_incl' => 121.00, + 'product_price_wt' => 121.00, + 'total_wt' => 121.00, + 'product_name' => 'test-product-2', + 'product_quantity' => 2, + 'product_id' => 2, + 'id_customization' => 1, + ], + [ + 'product_attribute_id' => 3, + 'id_product_attribute' => 3, + 'total_price_tax_excl' => 1000.00, + 'product_price' => 1000.00, + 'total_price' => 1000.00, + 'total_price_tax_incl' => 1210.00, + 'product_price_wt' => 1210.00, + 'total_wt' => 1210.00, + 'product_name' => 'test-product-3', + 'product_quantity' => 3, + 'product_id' => 3, + 'id_customization' => 1, + ], + ]; + + $order = $this->createMock(\Order::class); + $order->total_paid_tax_excl = 1500; + $order->id_currency = 1; + $order->method('getCartProducts')->willReturn($products); + $order->method('getProducts')->willReturn($products); + + /** @var OrderPresenter $orderPresenter */ + $orderPresenter = $this->getService(OrderPresenter::class); + + $result = $orderPresenter->present( + $order, + 3, + 1300 + ); + + $this->assertCount(1, $result->getProducts()); + $this->assertEquals(3, $result->getProducts()[0]['id_product_attribute']); + } +} diff --git a/tests/bootstrap.php b/tests/bootstrap.php index f29c2f9d7..6db43cd14 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,9 +1,21 @@ boot(); +} +// any actions to apply before any given tests can be done here diff --git a/upgrade/Upgrade-6.0.4.php b/upgrade/Upgrade-6.0.4.php index 497c98904..57205a314 100644 --- a/upgrade/Upgrade-6.0.4.php +++ b/upgrade/Upgrade-6.0.4.php @@ -28,6 +28,10 @@ function upgrade_module_6_0_4(Mollie $module): bool updateConfigurationValues604($module); updateOrderStatusNames604($module); + if (!modifyExistingTables604()) { + return false; + } + return true; } @@ -105,3 +109,70 @@ function updateOrderStatusNames604(Mollie $module) $authorizablePaymentStatusAuthorized->save(); } +function modifyExistingTables604(): bool +{ + $sql = ' + SELECT COUNT(*) > 0 AS count + FROM information_schema.columns + WHERE TABLE_SCHEMA = "' . _DB_NAME_ . '" AND table_name = "' . _DB_PREFIX_ . 'mol_recurring_order" AND column_name = "total_tax_incl"; + '; + + /** only add it if it doesn't exist */ + if (!(int) Db::getInstance()->getValue($sql)) { + $sql = ' + ALTER TABLE ' . _DB_PREFIX_ . 'mol_recurring_order + ADD COLUMN total_tax_incl decimal(20, 6) NOT NULL; + '; + + try { + if (!Db::getInstance()->execute($sql)) { + return false; + } + } catch (Exception $e) { + PrestaShopLogger::addLog("Mollie upgrade error: {$e->getMessage()}"); + + return false; + } + } + + $sql = ' + UPDATE ' . _DB_PREFIX_ . 'mol_recurring_order ro + JOIN ' . _DB_PREFIX_ . 'orders o ON ro.id_order = o.id_order + SET ro.total_tax_incl = o.total_paid_tax_incl; + '; + + try { + Db::getInstance()->execute($sql); + } catch (Exception $e) { + PrestaShopLogger::addLog("Mollie upgrade error: {$e->getMessage()}"); + + return false; + } + + $sql = ' + SELECT COUNT(*) > 0 AS count + FROM INFORMATION_SCHEMA.COLUMNS + WHERE TABLE_SCHEMA = "' . _DB_NAME_ . '" AND TABLE_NAME = "' . _DB_PREFIX_ . 'mollie_payments" AND COLUMN_NAME = "mandate_id" + '; + + /** only add it if it doesn't exist */ + if (!Db::getInstance()->getValue($sql)) { + $sql = ' + ALTER TABLE ' . _DB_PREFIX_ . 'mollie_payments + ADD `mandate_id` VARCHAR(64); + '; + + try { + if (!Db::getInstance()->execute($sql)) { + return false; + } + } catch (Exception $e) { + PrestaShopLogger::addLog("Mollie upgrade error: {$e->getMessage()}"); + + return false; + } + } + + return true; +} + From 2de7fc9a0f37b5dacb5ab9d250489de1efc3f949 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:30:48 +0300 Subject: [PATCH 081/109] PIPRES-113: Billie payment method additional check for vat number (#813) --- src/Repository/AddressFormatRepository.php | 11 +++++ .../AddressFormatRepositoryInterface.php | 7 ++++ .../B2bPaymentMethodRestrictionValidator.php | 16 +++++++- src/ServiceProvider/BaseServiceProvider.php | 3 ++ ...bPaymentMethodRestrictionValidatorTest.php | 40 +++++++++++++++++++ 5 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 src/Repository/AddressFormatRepository.php create mode 100644 src/Repository/AddressFormatRepositoryInterface.php diff --git a/src/Repository/AddressFormatRepository.php b/src/Repository/AddressFormatRepository.php new file mode 100644 index 000000000..de9cad0a6 --- /dev/null +++ b/src/Repository/AddressFormatRepository.php @@ -0,0 +1,11 @@ +context = $context; $this->addressRepository = $addressRepository; $this->customerRepository = $customerRepository; $this->configuration = $configuration; + $this->addressFormatRepository = $addressFormatRepository; } /** @@ -81,6 +86,15 @@ private function isVatNumberValid(): bool 'id_address' => (int) $billingAddressId, ]); + /** @var \AddressFormat $addressFormat */ + $addressFormat = $this->addressFormatRepository->findOneBy([ + 'id_country' => $billingAddress->id_country, + ]); + + if (!str_contains($addressFormat->getFormat($billingAddress->id_country), 'vat_number')) { + return true; + } + return !empty($billingAddress->vat_number); } diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php index 9c149eb9b..d50746b53 100644 --- a/src/ServiceProvider/BaseServiceProvider.php +++ b/src/ServiceProvider/BaseServiceProvider.php @@ -41,6 +41,8 @@ use Mollie\Provider\Shipment\AutomaticShipmentSenderStatusesProviderInterface; use Mollie\Provider\UpdateMessageProvider; use Mollie\Provider\UpdateMessageProviderInterface; +use Mollie\Repository\AddressFormatRepository; +use Mollie\Repository\AddressFormatRepositoryInterface; use Mollie\Repository\AddressRepository; use Mollie\Repository\AddressRepositoryInterface; use Mollie\Repository\CartRepository; @@ -158,6 +160,7 @@ public function register(Container $container) ); $this->addService($container, AddressRepositoryInterface::class, $container->get(AddressRepository::class)); + $this->addService($container, AddressFormatRepositoryInterface::class, $container->get(AddressFormatRepository::class)); $this->addService($container, TaxRulesGroupRepositoryInterface::class, $container->get(TaxRulesGroupRepository::class)); $this->addService($container, TaxRuleRepositoryInterface::class, $container->get(TaxRuleRepository::class)); $this->addService($container, TaxRepositoryInterface::class, $container->get(TaxRepository::class)); diff --git a/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php b/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php index d04f1b19a..ad88fa2c7 100644 --- a/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php +++ b/tests/Integration/Service/PaymentMethod/PaymentMethodRestrictionValidation/B2bPaymentMethodRestrictionValidatorTest.php @@ -59,6 +59,46 @@ public function testItSuccessfullyValidatedIsValid(): void $this->assertEquals(true, $valid); } + public function testItSuccessfullyValidatedIsValidMissingVatNumberInFormat(): void + { + Configuration::set('PS_B2B_ENABLE', 1); + + $molPaymentMethod = new \MolPaymentMethod(); + $molPaymentMethod->id_method = PaymentMethod::BILLIE; + + $customer = CustomerFactory::create([ + 'siret' => 'test-siret-number', + ]); + + $billingAddress = AddressFactory::create([ + 'vat_number' => 'vat-number', + ]); + + $addressFormat = new \AddressFormat($billingAddress->id_country); + + $originalCountryFormat = $addressFormat->format; + + $addressFormat->format = 'test-format'; + $addressFormat->save(); + + $this->contextBuilder->setCart(CartFactory::create()); + $this->contextBuilder->getContext()->cart->id_address_invoice = $billingAddress->id; + $this->contextBuilder->getContext()->cart->id_customer = $customer->id; + + /** @var B2bPaymentMethodRestrictionValidator $b2bPaymentMethodRestrictionValidator */ + $b2bPaymentMethodRestrictionValidator = $this->getService(B2bPaymentMethodRestrictionValidator::class); + + $supports = $b2bPaymentMethodRestrictionValidator->supports($molPaymentMethod); + + $valid = $b2bPaymentMethodRestrictionValidator->isValid($molPaymentMethod); + + $addressFormat->format = $originalCountryFormat; + $addressFormat->save(); + + $this->assertEquals(true, $supports); + $this->assertEquals(true, $valid); + } + public function testItUnsuccessfullyValidatedIsValidMethodNotSupported(): void { Configuration::set('PS_B2B_ENABLE', 1); From 42f69c0d8e0ecc73b0b05124a8d4dffedc20bc91 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 13:16:09 +0300 Subject: [PATCH 082/109] ps1784 debug mode --- .docker/.htaccess1784 | 44 +++++++-------- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.1784.yml | 2 +- docker-compose.e2e.1784.yml | 2 +- tests/seed/database/prestashop_1784_2.sql | 68 +++++++++++------------ 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1784 index 3be87fcb8..1db9638d9 100755 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1784 @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1784.ngrok.io +#Domain: demoshop1784debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1784.ngrok.io +#Domain: demoshop1784debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 0ed68b6af..2fb881ba1 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -20,7 +20,7 @@ jobs: subdomain: 'demoshop1784' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784.ngrok.io' + url: 'https://demoshop1784debug.ngrok.io' test_spec: '**/cypress/e2e/ps1784/**' TestRailID: R4954 - prestashop: 'PS8' diff --git a/docker-compose.1784.yml b/docker-compose.1784.yml index 4bfa923c9..7523dd711 100755 --- a/docker-compose.1784.yml +++ b/docker-compose.1784.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1784.ngrok.io:8002 + PS_DOMAIN: demoshop1784debug.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.e2e.1784.yml b/docker-compose.e2e.1784.yml index 76715f054..9da5f92c6 100644 --- a/docker-compose.e2e.1784.yml +++ b/docker-compose.e2e.1784.yml @@ -6,7 +6,7 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1784.ngrok.io + - CYPRESS_baseUrl=https://demoshop1784debug.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 entrypoint: cypress run --spec "**/cypress/integration/ps1784/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index ad281f977..719d1941e 100755 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -3971,8 +3971,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4652,36 +4652,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1784.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1784.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1784.ngrok.io/shop2/gb/', 'demoshop1784.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1784.ngrok.io/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1784.ngrok.io/__/', 'demoshop1784.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1784.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1784debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1784debug.ngrok.io/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1784debug.ngrok.io/__/', 'demoshop1784debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -24103,8 +24103,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1784.ngrok.io', 'demoshop1784.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 13cfad03bb1226e01c4aa011fa247858c5bea2c4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 13:51:53 +0300 Subject: [PATCH 083/109] updating terminal report extension --- package-lock.json | 1785 ++------------------------------------------- package.json | 2 +- 2 files changed, 49 insertions(+), 1738 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4af6fb29f..5a455c2a6 100755 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "mollie", "version": "1.0.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -12,7 +12,7 @@ "cypress": "^13.1.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", - "cypress-terminal-report": "^5.3.2", + "cypress-terminal-report": "^5.3.3", "cypress-testrail": "^2.8.1", "human-signals": "^3.0.1" } @@ -28,9 +28,9 @@ } }, "node_modules/@cypress/request": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", - "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", + "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -46,7 +46,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "6.10.4", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -87,9 +87,9 @@ } }, "node_modules/@types/node": { - "version": "16.18.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", - "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==", + "version": "16.18.50", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.50.tgz", + "integrity": "sha512-OiDU5xRgYTJ203v4cprTs0RwOCd5c5Zjv+K5P8KSqfiCsB1W3LcamTUMcnQarpq5kOYbhHfSOgIEJvdPyb5xyw==", "dev": true }, "node_modules/@types/sinonjs__fake-timers": { @@ -382,9 +382,9 @@ } }, "node_modules/cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz", + "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==", "dev": true, "engines": { "node": ">=6" @@ -447,10 +447,16 @@ } }, "node_modules/ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", + "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], "engines": { "node": ">=8" } @@ -644,9 +650,9 @@ "dev": true }, "node_modules/colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", "dev": true }, "node_modules/combined-stream": { @@ -764,9 +770,9 @@ } }, "node_modules/cypress-fail-fast": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cypress-fail-fast/-/cypress-fail-fast-7.0.0.tgz", - "integrity": "sha512-N8ei7clcqSWD4jrRMO6zPzSWcQTabGdnkIJBPCcnYYrlNyqsO3xFSGo6x796cR5soqetv10LCTJyCbvqNniUyA==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cypress-fail-fast/-/cypress-fail-fast-7.0.3.tgz", + "integrity": "sha512-IYVDZ+ykfTd2DFBK3N6NnWXc2gix7VwSi9Vg4zv40jm6PLknZTD4cZoRmh7uvpoQAIKNIFbx5V81qQD5pLHLSQ==", "dev": true, "dependencies": { "chalk": "4.1.2" @@ -788,13 +794,14 @@ } }, "node_modules/cypress-terminal-report": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.2.tgz", - "integrity": "sha512-0Gf/pXjrYpTkf2aR3LAFGoxEM0KulWsMKCu+52YJB6l7GEP2RLAOAr32tcZHZiL2EWnS0vE4ollomMzGvCci0w==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.3.tgz", + "integrity": "sha512-6kyeeJqtUeAlfLcGFlH0sF+eCGE4ShsSyghkVmB3Hh4dbiLeK+YoFJjjB2SOpD8LQAUvchGi/oYkGB8i2/OhuA==", "dev": true, "dependencies": { "chalk": "^4.0.0", "fs-extra": "^10.1.0", + "process": "^0.11.10", "safe-json-stringify": "^1.2.0", "semver": "^7.3.5", "tv4": "^1.3.0" @@ -861,9 +868,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", - "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==", + "version": "1.11.9", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", + "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==", "dev": true }, "node_modules/debug": { @@ -918,12 +925,13 @@ } }, "node_modules/enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", + "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", "dev": true, "dependencies": { - "ansi-colors": "^4.1.1" + "ansi-colors": "^4.1.1", + "strip-ansi": "^6.0.1" }, "engines": { "node": ">=8.6" @@ -1201,9 +1209,9 @@ } }, "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "dev": true }, "node_modules/has": { @@ -1877,9 +1885,9 @@ } }, "node_modules/rxjs": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", - "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", + "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, "dependencies": { "tslib": "^2.1.0" @@ -2111,9 +2119,9 @@ } }, "node_modules/tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true }, "node_modules/tunnel-agent": { @@ -2260,1702 +2268,5 @@ "fd-slicer": "~1.1.0" } } - }, - "dependencies": { - "@colors/colors": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", - "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==", - "dev": true, - "optional": true - }, - "@cypress/request": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz", - "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "http-signature": "~1.3.6", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "performance-now": "^2.1.0", - "qs": "~6.10.3", - "safe-buffer": "^5.1.2", - "tough-cookie": "^4.1.3", - "tunnel-agent": "^0.6.0", - "uuid": "^8.3.2" - } - }, - "@cypress/xvfb": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz", - "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==", - "dev": true, - "requires": { - "debug": "^3.1.0", - "lodash.once": "^4.1.1" - }, - "dependencies": { - "debug": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - } - } - }, - "@types/cypress": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz", - "integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==", - "dev": true, - "peer": true, - "requires": { - "cypress": "*" - } - }, - "@types/node": { - "version": "16.18.41", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.41.tgz", - "integrity": "sha512-YZJjn+Aaw0xihnpdImxI22jqGbp0DCgTFKRycygjGx/Y27NnWFJa5FJ7P+MRT3u07dogEeMVh70pWpbIQollTA==", - "dev": true - }, - "@types/sinonjs__fake-timers": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz", - "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==", - "dev": true - }, - "@types/sizzle": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz", - "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==", - "dev": true - }, - "@types/yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==", - "dev": true, - "optional": true, - "requires": { - "@types/node": "*" - } - }, - "aggregate-error": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", - "dev": true, - "requires": { - "clean-stack": "^2.0.0", - "indent-string": "^4.0.0" - } - }, - "ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "dev": true - }, - "ansi-escapes": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", - "dev": true, - "requires": { - "type-fest": "^0.21.3" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "arch": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz", - "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==", - "dev": true - }, - "asn1": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", - "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==", - "dev": true - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true - }, - "async": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", - "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==", - "dev": true - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "dev": true - }, - "at-least-node": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", - "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", - "dev": true - }, - "await-to-js": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/await-to-js/-/await-to-js-3.0.0.tgz", - "integrity": "sha512-zJAaP9zxTcvTHRlejau3ZOY4V7SRpiByf3/dxx2uyKxxor19tpmpV2QRsTKikckwhaPmr2dVpxxMr7jOCYVp5g==", - "dev": true - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==", - "dev": true - }, - "aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", - "dev": true - }, - "axios": { - "version": "0.27.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz", - "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==", - "dev": true, - "requires": { - "follow-redirects": "^1.14.9", - "form-data": "^4.0.0" - }, - "dependencies": { - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - } - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "blob-util": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz", - "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==", - "dev": true - }, - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, - "buffer-crc32": { - "version": "0.2.13", - "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", - "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", - "dev": true - }, - "cachedir": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz", - "integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==", - "dev": true - }, - "call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" - } - }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "dependencies": { - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "check-more-types": { - "version": "2.24.0", - "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", - "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==", - "dev": true - }, - "ci-info": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.7.0.tgz", - "integrity": "sha512-2CpRNYmImPx+RXKLq6jko/L07phmS9I02TyqkcNU20GCF/GgaWvc58hPtjxDX8lPpkdwc9sNh72V9k00S7ezog==", - "dev": true - }, - "clean-stack": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", - "dev": true - }, - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dev": true, - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "cli-handle-error": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/cli-handle-error/-/cli-handle-error-4.4.0.tgz", - "integrity": "sha512-RyBCnKlc7xVr79cKb9RfBq+4fjwQeX8HKeNzIPnI/W+DWWIUUKh2ur576DpwJ3kZt2UGHlIAOF7N9txy+mgZsA==", - "dev": true, - "requires": { - "chalk": "^3.0.0", - "log-symbols": "^3.0.0" - }, - "dependencies": { - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true - }, - "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "dev": true, - "requires": { - "chalk": "^2.4.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "cli-handle-unhandled": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/cli-handle-unhandled/-/cli-handle-unhandled-1.1.1.tgz", - "integrity": "sha512-Em91mJvU7VdgT2MxQpyY633vW1tDzRjPDbii6ZjEBHHLLh0xDoVkFt/wjvi9nSvJcz9rJmvtJSK8KL/hvF0Stg==", - "dev": true, - "requires": { - "cli-handle-error": "^4.1.0" - } - }, - "cli-table3": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz", - "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==", - "dev": true, - "requires": { - "@colors/colors": "1.5.0", - "string-width": "^4.2.0" - } - }, - "cli-truncate": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", - "dev": true, - "requires": { - "slice-ansi": "^3.0.0", - "string-width": "^4.2.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "colorette": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz", - "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==", - "dev": true - }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "dev": true, - "requires": { - "delayed-stream": "~1.0.0" - } - }, - "commander": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz", - "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==", - "dev": true - }, - "common-tags": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", - "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", - "dev": true - }, - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "cypress": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", - "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", - "dev": true, - "requires": { - "@cypress/request": "^3.0.0", - "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", - "@types/sinonjs__fake-timers": "8.1.1", - "@types/sizzle": "^2.3.2", - "arch": "^2.2.0", - "blob-util": "^2.0.2", - "bluebird": "^3.7.2", - "buffer": "^5.6.0", - "cachedir": "^2.3.0", - "chalk": "^4.1.0", - "check-more-types": "^2.24.0", - "cli-cursor": "^3.1.0", - "cli-table3": "~0.6.1", - "commander": "^6.2.1", - "common-tags": "^1.8.0", - "dayjs": "^1.10.4", - "debug": "^4.3.4", - "enquirer": "^2.3.6", - "eventemitter2": "6.4.7", - "execa": "4.1.0", - "executable": "^4.1.1", - "extract-zip": "2.0.1", - "figures": "^3.2.0", - "fs-extra": "^9.1.0", - "getos": "^3.2.1", - "is-ci": "^3.0.0", - "is-installed-globally": "~0.4.0", - "lazy-ass": "^1.6.0", - "listr2": "^3.8.3", - "lodash": "^4.17.21", - "log-symbols": "^4.0.0", - "minimist": "^1.2.8", - "ospath": "^1.2.2", - "pretty-bytes": "^5.6.0", - "process": "^0.11.10", - "proxy-from-env": "1.0.0", - "request-progress": "^3.0.0", - "semver": "^7.5.3", - "supports-color": "^8.1.1", - "tmp": "~0.2.1", - "untildify": "^4.0.0", - "yauzl": "^2.10.0" - } - }, - "cypress-fail-fast": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/cypress-fail-fast/-/cypress-fail-fast-7.0.0.tgz", - "integrity": "sha512-N8ei7clcqSWD4jrRMO6zPzSWcQTabGdnkIJBPCcnYYrlNyqsO3xFSGo6x796cR5soqetv10LCTJyCbvqNniUyA==", - "dev": true, - "requires": { - "chalk": "4.1.2" - } - }, - "cypress-iframe": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cypress-iframe/-/cypress-iframe-1.0.1.tgz", - "integrity": "sha512-Ne+xkZmWMhfq3x6wbfzK/SzsVTCrJru3R3cLXsoSAZyfUtJDamXyaIieHXeea3pQDXF4wE2w4iUuvCYHhoD31g==", - "dev": true, - "requires": {} - }, - "cypress-terminal-report": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-5.3.2.tgz", - "integrity": "sha512-0Gf/pXjrYpTkf2aR3LAFGoxEM0KulWsMKCu+52YJB6l7GEP2RLAOAr32tcZHZiL2EWnS0vE4ollomMzGvCci0w==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "fs-extra": "^10.1.0", - "safe-json-stringify": "^1.2.0", - "semver": "^7.3.5", - "tv4": "^1.3.0" - }, - "dependencies": { - "fs-extra": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", - "integrity": "sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - } - } - }, - "cypress-testrail": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/cypress-testrail/-/cypress-testrail-2.8.1.tgz", - "integrity": "sha512-e3xMI5VzRia16LEdWg1wlfSmTuT0IZr7gqK2Zyfj+RYBfkGFx8nWsT1Kmm2FNFCTUL5dNTrHqgspM+c3K1fWuA==", - "dev": true, - "requires": { - "await-to-js": "^3.0.0", - "axios": "^0.27.2", - "cli-handle-error": "^4.4.0", - "cli-handle-unhandled": "^1.1.1", - "enquirer": "^2.3.6", - "form-data": "^4.0.0" - }, - "dependencies": { - "form-data": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", - "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "mime-types": "^2.1.12" - } - } - } - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "dayjs": { - "version": "1.11.6", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.6.tgz", - "integrity": "sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==", - "dev": true - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "dev": true - }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "enquirer": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", - "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "dev": true, - "requires": { - "ansi-colors": "^4.1.1" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true - }, - "eventemitter2": { - "version": "6.4.7", - "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz", - "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==", - "dev": true - }, - "execa": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", - "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", - "dev": true, - "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", - "is-stream": "^2.0.0", - "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "signal-exit": "^3.0.2", - "strip-final-newline": "^2.0.0" - }, - "dependencies": { - "human-signals": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", - "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", - "dev": true - } - } - }, - "executable": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", - "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", - "dev": true, - "requires": { - "pify": "^2.2.0" - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extract-zip": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", - "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", - "dev": true, - "requires": { - "@types/yauzl": "^2.9.1", - "debug": "^4.1.1", - "get-stream": "^5.1.0", - "yauzl": "^2.10.0" - } - }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==", - "dev": true - }, - "fd-slicer": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", - "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", - "dev": true, - "requires": { - "pend": "~1.2.0" - } - }, - "figures": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "dev": true, - "requires": { - "escape-string-regexp": "^1.0.5" - } - }, - "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==", - "dev": true - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", - "dev": true, - "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" - } - }, - "fs-extra": { - "version": "9.1.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", - "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", - "dev": true, - "requires": { - "at-least-node": "^1.0.0", - "graceful-fs": "^4.2.0", - "jsonfile": "^6.0.1", - "universalify": "^2.0.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1", - "has": "^1.0.3", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" - } - }, - "get-stream": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", - "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "getos": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz", - "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==", - "dev": true, - "requires": { - "async": "^3.2.0" - } - }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, - "glob": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.1.1", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "global-dirs": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz", - "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==", - "dev": true, - "requires": { - "ini": "2.0.0" - } - }, - "graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "^1.1.1" - } - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", - "dev": true - }, - "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", - "dev": true - }, - "http-signature": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz", - "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^2.0.2", - "sshpk": "^1.14.1" - } - }, - "human-signals": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-3.0.1.tgz", - "integrity": "sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ==", - "dev": true - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz", - "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==", - "dev": true - }, - "is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==", - "dev": true, - "requires": { - "ci-info": "^3.2.0" - } - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-installed-globally": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz", - "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==", - "dev": true, - "requires": { - "global-dirs": "^3.0.0", - "is-path-inside": "^3.0.2" - } - }, - "is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true - }, - "is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "dev": true - }, - "is-typedarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", - "dev": true - }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true - }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==", - "dev": true - }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==", - "dev": true - }, - "json-schema": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", - "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", - "dev": true - }, - "json-stringify-safe": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", - "dev": true - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "jsprim": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz", - "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.4.0", - "verror": "1.10.0" - } - }, - "lazy-ass": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", - "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==", - "dev": true - }, - "listr2": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz", - "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==", - "dev": true, - "requires": { - "cli-truncate": "^2.1.0", - "colorette": "^2.0.16", - "log-update": "^4.0.0", - "p-map": "^4.0.0", - "rfdc": "^1.3.0", - "rxjs": "^7.5.1", - "through": "^2.3.8", - "wrap-ansi": "^7.0.0" - } - }, - "lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true - }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "dev": true - }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dev": true, - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - } - }, - "log-update": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", - "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", - "dev": true, - "requires": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" - }, - "dependencies": { - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - } - } - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "merge-stream": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", - "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", - "dev": true - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "requires": { - "mime-db": "1.52.0" - } - }, - "mimic-fn": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "npm-run-path": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", - "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "dev": true, - "requires": { - "path-key": "^3.0.0" - } - }, - "object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "onetime": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "dev": true, - "requires": { - "mimic-fn": "^2.1.0" - } - }, - "ospath": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz", - "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==", - "dev": true - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "pend": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", - "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", - "dev": true - }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==", - "dev": true - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "dev": true - }, - "pretty-bytes": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz", - "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==", - "dev": true - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", - "dev": true - }, - "proxy-from-env": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", - "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==", - "dev": true - }, - "psl": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", - "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", - "dev": true - }, - "pump": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", - "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, - "requires": { - "end-of-stream": "^1.1.0", - "once": "^1.3.1" - } - }, - "punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", - "dev": true - }, - "qs": { - "version": "6.10.4", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz", - "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==", - "dev": true, - "requires": { - "side-channel": "^1.0.4" - } - }, - "querystringify": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", - "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", - "dev": true - }, - "request-progress": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz", - "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==", - "dev": true, - "requires": { - "throttleit": "^1.0.0" - } - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", - "dev": true - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dev": true, - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - }, - "rfdc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "rxjs": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.6.0.tgz", - "integrity": "sha512-DDa7d8TFNUalGC9VqXvQ1euWNN7sc63TrUCuM9J998+ViviahMIjKSOU7rfcgFOF+FCD71BhDRv4hrFz+ImDLQ==", - "dev": true, - "requires": { - "tslib": "^2.1.0" - } - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - }, - "safe-json-stringify": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz", - "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", - "dev": true, - "requires": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "slice-ansi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "sshpk": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", - "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-final-newline": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", - "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==", - "dev": true - }, - "supports-color": { - "version": "8.1.1", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", - "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "throttleit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz", - "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==", - "dev": true - }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true - }, - "tmp": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", - "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", - "dev": true, - "requires": { - "rimraf": "^3.0.0" - } - }, - "tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", - "dev": true, - "requires": { - "psl": "^1.1.33", - "punycode": "^2.1.1", - "universalify": "^0.2.0", - "url-parse": "^1.5.3" - }, - "dependencies": { - "universalify": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", - "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", - "dev": true - } - } - }, - "tslib": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.1.tgz", - "integrity": "sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==", - "dev": true - }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tv4": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", - "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", - "dev": true - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==", - "dev": true - }, - "type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true - }, - "untildify": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz", - "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==", - "dev": true - }, - "url-parse": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", - "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", - "dev": true, - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "uuid": { - "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "yauzl": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", - "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", - "dev": true, - "requires": { - "buffer-crc32": "~0.2.3", - "fd-slicer": "~1.1.0" - } - } } } diff --git a/package.json b/package.json index 75d24c1c3..e435f778f 100755 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "cypress": "^13.1.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", - "cypress-terminal-report": "^5.3.2", + "cypress-terminal-report": "^5.3.3", "cypress-testrail": "^2.8.1", "human-signals": "^3.0.1" } From 52e920d6ad1fe18608c46aa87b63e77f91b8af30 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 14:34:20 +0300 Subject: [PATCH 084/109] ps8 debug mode --- .docker/.htaccess8 | 20 +++---- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 90 ++++++++++++++-------------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index d7343aab0..b1f21a2bf 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,29 +10,29 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8.ngrok.io +#Domain: demoshop8debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 2fb881ba1..563368c63 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8.ngrok.io' + url: 'https://demoshop8debug.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index af308d9dd..72da1c1b6 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -36,7 +36,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8.ngrok.io:8142 + PS_DOMAIN: demoshop8debug.ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 0b7db8dc9..93eb8894c 100755 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3053,8 +3053,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3425,37 +3425,37 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8.ngrok.io/', '', '2023-08-28 13:41:41'), -(2, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), -(3, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), -(4, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), -(5, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), -(6, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), -(7, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), -(8, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), -(9, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), -(10, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), -(11, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:48:03'), -(12, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), -(13, 2, 'http://demoshop8.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), -(14, 2, 'http://demoshop8.ngrok.io/en/registration', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:48:30'), -(15, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), -(16, 2, 'http://demoshop8.ngrok.io/en/my-account', 'demoshop8.ngrok.io/en/address', '', '2023-08-28 13:48:44'), -(17, 2, 'http://demoshop8.ngrok.io/en/address', 'demoshop8.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), -(18, 2, 'http://demoshop8.ngrok.io/en/addresses', 'demoshop8.ngrok.io/en/address', '', '2023-08-28 13:49:11'), -(19, 2, 'http://demoshop8.ngrok.io/en/address', 'demoshop8.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), -(20, 2, 'http://demoshop8.ngrok.io/en/addresses', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:50:35'), -(21, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), -(22, 2, 'http://demoshop8.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), -(23, 2, 'http://demoshop8.ngrok.io/en/cart?action=show', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:50'), -(24, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:52'), -(25, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:55'), -(26, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), -(27, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), -(28, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:51:14'), -(29, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), -(30, 2, 'http://demoshop8.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), -(31, 2, 'http://demoshop8.ngrok.io/en/my-account', 'demoshop8.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); +(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-08-28 13:41:41'), +(2, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), +(3, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), +(4, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), +(5, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), +(6, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), +(7, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), +(8, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), +(9, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), +(10, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), +(11, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:03'), +(12, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), +(13, 2, 'http://demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8debug.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), +(14, 2, 'http://demoshop8debug.ngrok.io/en/registration', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:30'), +(15, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), +(16, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:48:44'), +(17, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), +(18, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:49:11'), +(19, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), +(20, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:50:35'), +(21, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), +(22, 2, 'http://demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8debug.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), +(23, 2, 'http://demoshop8debug.ngrok.io/en/cart?action=show', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:50'), +(24, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:52'), +(25, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:55'), +(26, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), +(27, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), +(28, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:51:14'), +(29, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), +(30, 2, 'http://demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), +(31, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -10243,17 +10243,17 @@ CREATE TABLE `ps_pagenotfound` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES -(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), -(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); +(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), +(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -12272,7 +12272,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 1c8b5f97e8e8cf24ce703ada927082ff3e6bd012 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:32:37 +0300 Subject: [PATCH 085/109] Update Dockerfile.1784 --- .docker/Dockerfile.1784 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.docker/Dockerfile.1784 b/.docker/Dockerfile.1784 index 0b16422a1..879a54191 100755 --- a/.docker/Dockerfile.1784 +++ b/.docker/Dockerfile.1784 @@ -1,4 +1,4 @@ -FROM prestashop/prestashop:1.7.8.4-apache +FROM prestashop/prestashop:1.7.8.5-apache RUN cd /usr/local/etc/php/conf.d/ && \ echo 'memory_limit = 4096M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini From 5d9070657d5134172c9d2a363067c4cd96cd14d4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:37:50 +0300 Subject: [PATCH 086/109] upgrading the build to PS1785 --- .docker/{.htaccess1784 => .htaccess1785} | 44 +++---- .docker/{Dockerfile.1784 => Dockerfile.1785} | 0 .github/workflows/E2E_On_PR.yml | 6 +- .github/workflows/upgrading_check.yml | 2 +- Makefile | 30 ++--- ...ollie.ps1785.ModuleConfiguration.specs.js} | 2 +- ...ps1785.EnablingPaymentsOrdersAPI.specs.js} | 2 +- .../03_mollie.ps1785.PaymentTests.js} | 2 +- .../04_mollie.ps1785.Subscriptions.js} | 2 +- cypress/e2e/{ps1784 => ps1785}/index.php | 0 cypress/support/commands.js | 2 +- ...ompose.1784.yml => docker-compose.1785.yml | 24 ++-- ...2e.1784.yml => docker-compose.e2e.1785.yml | 4 +- tests/seed/database/prestashop_1784_2.sql | 120 +++++++++--------- 14 files changed, 120 insertions(+), 120 deletions(-) rename .docker/{.htaccess1784 => .htaccess1785} (79%) rename .docker/{Dockerfile.1784 => Dockerfile.1785} (100%) rename cypress/e2e/{ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js => ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js} (98%) rename cypress/e2e/{ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js => ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js} (96%) rename cypress/e2e/{ps1784/03_mollie.ps1784.PaymentTests.js => ps1785/03_mollie.ps1785.PaymentTests.js} (99%) rename cypress/e2e/{ps1784/04_mollie.ps1784.Subscriptions.js => ps1785/04_mollie.ps1785.Subscriptions.js} (98%) rename cypress/e2e/{ps1784 => ps1785}/index.php (100%) rename docker-compose.1784.yml => docker-compose.1785.yml (69%) rename docker-compose.e2e.1784.yml => docker-compose.e2e.1785.yml (81%) diff --git a/.docker/.htaccess1784 b/.docker/.htaccess1785 similarity index 79% rename from .docker/.htaccess1784 rename to .docker/.htaccess1785 index 1db9638d9..93dea1fbe 100755 --- a/.docker/.htaccess1784 +++ b/.docker/.htaccess1785 @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1784debug.ngrok.io +#Domain: demoshop1785debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1784debug.ngrok.io +#Domain: demoshop1785debug.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1784debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.docker/Dockerfile.1784 b/.docker/Dockerfile.1785 similarity index 100% rename from .docker/Dockerfile.1784 rename to .docker/Dockerfile.1785 diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 563368c63..a62cbf555 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -15,13 +15,13 @@ jobs: fail-fast: false matrix: include: - - prestashop: 'PS1784' + - prestashop: 'PS1785' make: 'make e2eh1784' subdomain: 'demoshop1784' port: '8002' yml: 'docker-compose.1784.yml' - url: 'https://demoshop1784debug.ngrok.io' - test_spec: '**/cypress/e2e/ps1784/**' + url: 'https://demoshop1785debug.ngrok.io' + test_spec: '**/cypress/e2e/PS1785/**' TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' diff --git a/.github/workflows/upgrading_check.yml b/.github/workflows/upgrading_check.yml index 6771b5af8..a5d78e1c8 100644 --- a/.github/workflows/upgrading_check.yml +++ b/.github/workflows/upgrading_check.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: include: - - prestashop: 'PS1784' + - prestashop: 'PS1785' make: 'make e2eh1784' port: '8002' yml: 'docker-compose.1784.yml' diff --git a/Makefile b/Makefile index b0ef8765d..e417d8209 100755 --- a/Makefile +++ b/Makefile @@ -4,28 +4,28 @@ ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) fix-lint: docker-compose run --rm php sh -c "vendor/bin/php-cs-fixer fix --using-cache=no" -#PS1784 -e2eh1784: +#PS1785 +e2eh1785: # detaching containers - docker-compose -f docker-compose.1784.yml up -d --force-recreate + docker-compose -f docker-compose.1785.yml up -d --force-recreate # sees what containers are running - docker-compose -f docker-compose.1784.yml ps + docker-compose -f docker-compose.1785.yml ps # waits for mysql to load - /bin/bash .docker/wait-for-container.sh mysql-mollie-1784 + /bin/bash .docker/wait-for-container.sh mysql-mollie-1785 # configuring your prestashop - docker exec -i prestashop-mollie-1784 sh -c "rm -rf /var/www/html/install" + docker exec -i prestashop-mollie-1785 sh -c "rm -rf /var/www/html/install" # configuring base database - mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1784_2.sql + mysql -h 127.0.0.1 -P 9002 --protocol=tcp -u root -pprestashop prestashop < ${PWD}/tests/seed/database/prestashop_1785_2.sql # installing module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # uninstalling module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" + docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module uninstall mollie" # installing the module again - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # enabling the module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie" + docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module enable mollie" # chmod all folders - docker exec -i prestashop-mollie-1784 sh -c "chmod -R 777 /var/www/html" + docker exec -i prestashop-mollie-1785 sh -c "chmod -R 777 /var/www/html" #PS8 e2eh8: @@ -59,13 +59,13 @@ run-e2e-tests-locally: npx cypress run # checking the module upgrading - installs older module then installs from master branch -upgrading-module-test-1784: +upgrading-module-test-1785: git fetch git checkout v5.2.0 . composer install # installing 5.2.0 module - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" # installing develop branch module git checkout -- . git checkout develop --force - docker exec -i prestashop-mollie-1784 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" + docker exec -i prestashop-mollie-1785 sh -c "cd /var/www/html && php bin/console prestashop:module install mollie" diff --git a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js similarity index 98% rename from cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js rename to cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js index 21e81926f..d8b5a0415 100755 --- a/cypress/e2e/ps1784/01_mollie.ps1784.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js @@ -59,7 +59,7 @@ afterEach(() => { afterEach(function() { if (this.currentTest.state === "failed") failEarly = true }); -describe('PS1784 Module initial configuration setup', () => { +describe('PS1785 Module initial configuration setup', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') diff --git a/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js b/cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js similarity index 96% rename from cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js rename to cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js index b195fb8e2..4ec3a0bb8 100755 --- a/cypress/e2e/ps1784/02_mollie.ps1784.EnablingPaymentsOrdersAPI.specs.js +++ b/cypress/e2e/ps1785/02_mollie.ps1785.EnablingPaymentsOrdersAPI.specs.js @@ -22,7 +22,7 @@ afterEach(() => { afterEach(function() { if (this.currentTest.state === "failed") failEarly = true }); -describe('PS1784 Enabling Payments', () => { +describe('PS1785 Enabling Payments', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') diff --git a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js similarity index 99% rename from cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js rename to cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js index 9dd11430d..835642e4b 100755 --- a/cypress/e2e/ps1784/03_mollie.ps1784.PaymentTests.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js @@ -54,7 +54,7 @@ const login = (MollieBOFOLoggingIn) => { // afterEach(() => { // expect(windowConsoleError).to.not.be.called; // }) -describe('PS1784 Tests Suite', () => { +describe('PS1785 Tests Suite', () => { beforeEach(() => { login('MollieBOFOLoggingIn') cy.viewport(1920,1080) diff --git a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.js b/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js similarity index 98% rename from cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.js rename to cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js index 976c8ca5d..9ab194022 100755 --- a/cypress/e2e/ps1784/04_mollie.ps1784.Subscriptions.js +++ b/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js @@ -22,7 +22,7 @@ windowConsoleError = cy.spy(win.console, 'error'); afterEach(() => { expect(windowConsoleError).to.not.be.called; }) -describe('PS1784 Subscriptions Test Suit', () => { +describe('PS1785 Subscriptions Test Suit', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') diff --git a/cypress/e2e/ps1784/index.php b/cypress/e2e/ps1785/index.php similarity index 100% rename from cypress/e2e/ps1784/index.php rename to cypress/e2e/ps1785/index.php diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 26e8673a8..8a2b96281 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -584,7 +584,7 @@ Cypress.Commands.add("OpeningModuleDashboardURL", () => { cy.visit('/admin1/index.php?controller=AdminModules&configure=mollie') cy.get('.btn-continue').click() }) -Cypress.Commands.add("CachingBOFOPS1784", () => { +Cypress.Commands.add("CachingBOFOPS1785", () => { //Caching the BO and FO session const login = (MollieBOFOLoggingIn) => { cy.session(MollieBOFOLoggingIn,() => { diff --git a/docker-compose.1784.yml b/docker-compose.1785.yml similarity index 69% rename from docker-compose.1784.yml rename to docker-compose.1785.yml index 7523dd711..ffa2f1d5e 100755 --- a/docker-compose.1784.yml +++ b/docker-compose.1785.yml @@ -11,7 +11,7 @@ services: mysql: #platform: linux/amd64 - container_name: mysql-mollie-1784 + container_name: mysql-mollie-1785 image: mysql:5.7 ports: - "9002:3306" @@ -23,19 +23,19 @@ services: test: "mysqladmin ping -h127.0.0.1 -uroot -pprestashop --silent" interval: 10s networks: - - prestashop_mollie_net_1784 + - prestashop_mollie_net_1785 prestashop-17: #platform: linux/amd64 - container_name: prestashop-mollie-1784 + container_name: prestashop-mollie-1785 build: context: . - dockerfile: .docker/Dockerfile.1784 + dockerfile: .docker/Dockerfile.1785 environment: PS_INSTALL_AUTO: 0 DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1784debug.ngrok.io:8002 + PS_DOMAIN: demoshop1785debug.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: @@ -44,11 +44,11 @@ services: - "8002:80" volumes: - ./:/var/www/html/modules/mollie:cached - - ./tests/seed/settings1784/defines.inc.php:/var/www/html/config/defines.inc.php - - ./tests/seed/settings1784/parameters.php:/var/www/html/app/config/parameters.php - - ./.docker/.htaccess1784:/var/www/html/.htaccess + - ./tests/seed/settings1785/defines.inc.php:/var/www/html/config/defines.inc.php + - ./tests/seed/settings1785/parameters.php:/var/www/html/app/config/parameters.php + - ./.docker/.htaccess1785:/var/www/html/.htaccess networks: - - prestashop_mollie_net_1784 + - prestashop_mollie_net_1785 healthcheck: test: "wget --no-verbose --tries=1 --spider http://localhost:80 || exit 1" interval: 10s @@ -59,8 +59,8 @@ services: ports: - '6969:8080' networks: - - prestashop_mollie_net_1784 + - prestashop_mollie_net_1785 networks: - prestashop_mollie_net_1784: - name: 'prestashop_mollie_net_1784' + prestashop_mollie_net_1785: + name: 'prestashop_mollie_net_1785' diff --git a/docker-compose.e2e.1784.yml b/docker-compose.e2e.1785.yml similarity index 81% rename from docker-compose.e2e.1784.yml rename to docker-compose.e2e.1785.yml index 9da5f92c6..08a4fc72c 100644 --- a/docker-compose.e2e.1784.yml +++ b/docker-compose.e2e.1785.yml @@ -6,9 +6,9 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1784debug.ngrok.io + - CYPRESS_baseUrl=https://demoshop1785debug.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 - entrypoint: cypress run --spec "**/cypress/integration/ps1784/**" + entrypoint: cypress run --spec "**/cypress/integration/PS1785/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" # share the current folder as volume to avoid copying working_dir: /e2e diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1784_2.sql index 719d1941e..0133ed802 100755 --- a/tests/seed/database/prestashop_1784_2.sql +++ b/tests/seed/database/prestashop_1784_2.sql @@ -3971,9 +3971,9 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1784debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(236, NULL, NULL, 'PS_SHOP_NAME', 'PS1784', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1785debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1785debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(236, NULL, NULL, 'PS_SHOP_NAME', 'PS1785', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (239, NULL, NULL, 'PS_SHOP_ACTIVITY', NULL, '0000-00-00 00:00:00', '2023-08-21 07:36:34'), @@ -4652,36 +4652,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1784debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1784debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1784debug.ngrok.io/shop2/gb/', 'demoshop1784debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1784debug.ngrok.io/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1784debug.ngrok.io/__/', 'demoshop1784debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1784debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1785debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1785debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1785debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1785debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1785debug.ngrok.io/shop2/gb/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1785debug.ngrok.io/shop2/gb/', 'demoshop1785debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1785debug.ngrok.io/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1785debug.ngrok.io/__/', 'demoshop1785debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -16526,30 +16526,30 @@ CREATE TABLE `ps_order_invoice` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_order_invoice` (`id_order_invoice`, `id_order`, `number`, `delivery_number`, `delivery_date`, `total_discount_tax_excl`, `total_discount_tax_incl`, `total_paid_tax_excl`, `total_paid_tax_incl`, `total_products`, `total_products_wt`, `total_shipping_tax_excl`, `total_shipping_tax_incl`, `shipping_tax_computation_method`, `total_wrapping_tax_excl`, `total_wrapping_tax_incl`, `shop_address`, `note`, `date_add`) VALUES -(1, 7, 1, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-22 12:58:26'), -(2, 8, 2, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 07:39:47'), -(3, 9, 3, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 07:41:03'), -(4, 10, 4, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 07:41:53'), -(5, 12, 5, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 07:53:45'), -(6, 14, 6, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 08:00:28'), -(7, 15, 7, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 08:10:03'), -(8, 16, 8, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 08:11:09'), -(9, 17, 9, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 08:14:26'), -(10, 18, 10, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 08:38:24'), -(11, 19, 11, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:52:52'), -(12, 20, 12, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:53:52'), -(13, 21, 13, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:54:44'), -(14, 22, 14, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:55:33'), -(15, 23, 15, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:56:32'), -(16, 24, 16, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:58:25'), -(17, 25, 17, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 15:59:22'), -(18, 26, 18, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 16:00:18'), -(19, 27, 19, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2022-03-23 16:15:06'), -(20, 28, 20, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2023-04-05 11:07:00'), -(21, 29, 21, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2023-04-05 11:07:56'), -(22, 30, 22, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2023-04-05 11:08:42'), -(23, 31, 23, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2023-04-05 11:09:26'), -(24, 32, 24, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1784', '', '2023-04-05 11:10:05'); +(1, 7, 1, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-22 12:58:26'), +(2, 8, 2, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 07:39:47'), +(3, 9, 3, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 07:41:03'), +(4, 10, 4, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 07:41:53'), +(5, 12, 5, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 07:53:45'), +(6, 14, 6, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 08:00:28'), +(7, 15, 7, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 08:10:03'), +(8, 16, 8, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 08:11:09'), +(9, 17, 9, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 08:14:26'), +(10, 18, 10, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 08:38:24'), +(11, 19, 11, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:52:52'), +(12, 20, 12, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:53:52'), +(13, 21, 13, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:54:44'), +(14, 22, 14, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:55:33'), +(15, 23, 15, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:56:32'), +(16, 24, 16, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:58:25'), +(17, 25, 17, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 15:59:22'), +(18, 26, 18, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 16:00:18'), +(19, 27, 19, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2022-03-23 16:15:06'), +(20, 28, 20, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2023-04-05 11:07:00'), +(21, 29, 21, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2023-04-05 11:07:56'), +(22, 30, 22, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2023-04-05 11:08:42'), +(23, 31, 23, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2023-04-05 11:09:26'), +(24, 32, 24, 0, '0000-00-00 00:00:00', 0.000000, 0.000000, 129.000000, 148.200000, 96.000000, 115.200000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 'PS1785', '', '2023-04-05 11:10:05'); DROP TABLE IF EXISTS `ps_order_invoice_payment`; CREATE TABLE `ps_order_invoice_payment` ( @@ -24069,7 +24069,7 @@ CREATE TABLE `ps_shop` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; INSERT INTO `ps_shop` (`id_shop`, `id_shop_group`, `name`, `color`, `id_category`, `theme_name`, `active`, `deleted`) VALUES -(1, 1, 'PS1784', '', 2, 'classic', 1, 0), +(1, 1, 'PS1785', '', 2, 'classic', 1, 0), (3, 1, 'SHOP2', '#00ff00', 2, 'classic', 1, 0); DROP TABLE IF EXISTS `ps_shop_group`; @@ -24103,8 +24103,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1784debug.ngrok.io', 'demoshop1784debug.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1785debug.ngrok.io', 'demoshop1785debug.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1785debug.ngrok.io', 'demoshop1785debug.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 62ad59b89fb742c58ba4e69cee6374bae196debf Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:40:51 +0300 Subject: [PATCH 087/109] ps1785 updates --- tests/seed/{settings1784 => settings1785}/defines.inc.php | 0 tests/seed/{settings1784 => settings1785}/index.php | 0 tests/seed/{settings1784 => settings1785}/parameters.php | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename tests/seed/{settings1784 => settings1785}/defines.inc.php (100%) rename tests/seed/{settings1784 => settings1785}/index.php (100%) rename tests/seed/{settings1784 => settings1785}/parameters.php (100%) diff --git a/tests/seed/settings1784/defines.inc.php b/tests/seed/settings1785/defines.inc.php similarity index 100% rename from tests/seed/settings1784/defines.inc.php rename to tests/seed/settings1785/defines.inc.php diff --git a/tests/seed/settings1784/index.php b/tests/seed/settings1785/index.php similarity index 100% rename from tests/seed/settings1784/index.php rename to tests/seed/settings1785/index.php diff --git a/tests/seed/settings1784/parameters.php b/tests/seed/settings1785/parameters.php similarity index 100% rename from tests/seed/settings1784/parameters.php rename to tests/seed/settings1785/parameters.php From f8f5a0dd613075f50672206dac090689f35ec0ec Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:41:58 +0300 Subject: [PATCH 088/109] ps1785 updates --- .../database/{prestashop_1784_2.sql => prestashop_1785_2.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/seed/database/{prestashop_1784_2.sql => prestashop_1785_2.sql} (100%) diff --git a/tests/seed/database/prestashop_1784_2.sql b/tests/seed/database/prestashop_1785_2.sql similarity index 100% rename from tests/seed/database/prestashop_1784_2.sql rename to tests/seed/database/prestashop_1785_2.sql From 7b49ac821060721c6b96638d0d23fbc892d34cd5 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:50:32 +0300 Subject: [PATCH 089/109] Update E2E_On_PR.yml --- .github/workflows/E2E_On_PR.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index a62cbf555..ef3c3d5e5 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -16,12 +16,12 @@ jobs: matrix: include: - prestashop: 'PS1785' - make: 'make e2eh1784' - subdomain: 'demoshop1784' + make: 'make e2eh1785' + subdomain: 'demoshop1785' port: '8002' - yml: 'docker-compose.1784.yml' + yml: 'docker-compose.1785.yml' url: 'https://demoshop1785debug.ngrok.io' - test_spec: '**/cypress/e2e/PS1785/**' + test_spec: '**/cypress/e2e/ps1785/**' TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' From d20e3cee536e31d1b4ef29103883398f3e52254a Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:54:21 +0300 Subject: [PATCH 090/109] moving things to ps1785 --- .github/workflows/upgrading_check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upgrading_check.yml b/.github/workflows/upgrading_check.yml index a5d78e1c8..2f31256e3 100644 --- a/.github/workflows/upgrading_check.yml +++ b/.github/workflows/upgrading_check.yml @@ -11,10 +11,10 @@ jobs: matrix: include: - prestashop: 'PS1785' - make: 'make e2eh1784' + make: 'make e2eh1785' port: '8002' - yml: 'docker-compose.1784.yml' - ModuleUpgradeTest: 'make upgrading-module-test-1784' + yml: 'docker-compose.1785.yml' + ModuleUpgradeTest: 'make upgrading-module-test-1785' steps: - name: Checkout uses: actions/checkout@v3.5.3 From 03cf2f0816ed5c97664556113588adff17e6a684 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 15:57:51 +0300 Subject: [PATCH 091/109] Update E2E_On_PR.yml --- .github/workflows/E2E_On_PR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index ef3c3d5e5..591bccff9 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -42,7 +42,7 @@ jobs: shell: bash - run: ./ngrok authtoken ${{ secrets.NGROK_TOKEN }} shell: bash - - run: ./ngrok http -region=eu -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log & + - run: ./ngrok http -region=us -subdomain=${{ matrix.subdomain }} ${{ matrix.port }} > ngrok.log & shell: bash - name: Install composer run: composer i From e8c2a15a73a7ab6ecda4417c0e76e5202c898605 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 16:04:43 +0300 Subject: [PATCH 092/109] Update E2E_On_PR.yml --- .github/workflows/E2E_On_PR.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 591bccff9..83823245f 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -17,7 +17,7 @@ jobs: include: - prestashop: 'PS1785' make: 'make e2eh1785' - subdomain: 'demoshop1785' + subdomain: 'demoshop1785debug' port: '8002' yml: 'docker-compose.1785.yml' url: 'https://demoshop1785debug.ngrok.io' @@ -25,7 +25,7 @@ jobs: TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' - subdomain: 'demoshop8' + subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' url: 'https://demoshop8debug.ngrok.io' From 80ffa4e3baa40dda6a080550d7981843a16905df Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 11 Sep 2023 16:29:30 +0300 Subject: [PATCH 093/109] downgrading cypress breaking changes in the terminal module, temporary downgrading Cypress --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a455c2a6..4178382cf 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^13.1.0", + "cypress": "^12.17.4", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.3", @@ -28,9 +28,9 @@ } }, "node_modules/@cypress/request": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", - "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", + "version": "2.88.12", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", + "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -46,7 +46,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "6.10.4", + "qs": "~6.10.3", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -712,13 +712,13 @@ } }, "node_modules/cypress": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", - "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", + "version": "12.17.4", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", + "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "^3.0.0", + "@cypress/request": "2.88.12", "@cypress/xvfb": "^1.2.4", "@types/node": "^16.18.39", "@types/sinonjs__fake-timers": "8.1.1", @@ -766,7 +766,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": "^16.0.0 || ^18.0.0 || >=20.0.0" + "node": "^14.0.0 || ^16.0.0 || >=18.0.0" } }, "node_modules/cypress-fail-fast": { diff --git a/package.json b/package.json index e435f778f..c7c6cccb2 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { - "cypress": "^13.1.0", + "cypress": "^12.17.4", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.3", From 5f138395abb8d40faf0c08dc3adbba73ca21a212 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 12:18:22 +0300 Subject: [PATCH 094/109] some e2e fixes --- .../ps1785/03_mollie.ps1785.PaymentTests.js | 26 ++++++++--------- package-lock.json | 28 +++++++++---------- package.json | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js index 835642e4b..723f62df7 100755 --- a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js @@ -46,20 +46,20 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#history-link > .link-item').click() }) } -// //Checking the console for errors -// let windowConsoleError; -// Cypress.on('window:before:load', (win) => { -// windowConsoleError = cy.spy(win.console, 'error'); -// }) -// afterEach(() => { -// expect(windowConsoleError).to.not.be.called; -// }) +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +afterEach(() => { + expect(windowConsoleError).to.not.be.called; +}) describe('PS1785 Tests Suite', () => { beforeEach(() => { login('MollieBOFOLoggingIn') cy.viewport(1920,1080) }) -it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { +it('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.visit('/de/index.php?controller=history') cy.get('a').click() cy.contains('Reorder').click() @@ -91,7 +91,7 @@ it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { +it('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist }) @@ -349,7 +349,7 @@ it('C339357: 20 IN3 Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it.skip('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason +it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { @@ -1121,7 +1121,7 @@ it('C339399: 64 Belfius Checkouting [Payments API]', () => { it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { cy.OrderRefundingPartialPaymentsAPI() }); -it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { +it.skip('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { // skipping temporary, bug cy.visit('/en/index.php?controller=history') cy.get('a').click() // @@ -1150,7 +1150,7 @@ it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }); -it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why +it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // skipping temporary, bug cy.OrderRefundingPartialPaymentsAPI() }); }) diff --git a/package-lock.json b/package-lock.json index 4178382cf..c2c3cc247 100755 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "devDependencies": { - "cypress": "^12.17.4", + "cypress": "^13.3.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.3", @@ -28,9 +28,9 @@ } }, "node_modules/@cypress/request": { - "version": "2.88.12", - "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz", - "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz", + "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==", "dev": true, "dependencies": { "aws-sign2": "~0.7.0", @@ -46,7 +46,7 @@ "json-stringify-safe": "~5.0.1", "mime-types": "~2.1.19", "performance-now": "^2.1.0", - "qs": "~6.10.3", + "qs": "6.10.4", "safe-buffer": "^5.1.2", "tough-cookie": "^4.1.3", "tunnel-agent": "^0.6.0", @@ -87,9 +87,9 @@ } }, "node_modules/@types/node": { - "version": "16.18.50", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.50.tgz", - "integrity": "sha512-OiDU5xRgYTJ203v4cprTs0RwOCd5c5Zjv+K5P8KSqfiCsB1W3LcamTUMcnQarpq5kOYbhHfSOgIEJvdPyb5xyw==", + "version": "18.18.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.1.tgz", + "integrity": "sha512-3G42sxmm0fF2+Vtb9TJQpnjmP+uKlWvFa8KoEGquh4gqRmoUG/N0ufuhikw6HEsdG2G2oIKhog1GCTfz9v5NdQ==", "dev": true }, "node_modules/@types/sinonjs__fake-timers": { @@ -712,15 +712,15 @@ } }, "node_modules/cypress": { - "version": "12.17.4", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz", - "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==", + "version": "13.3.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.3.0.tgz", + "integrity": "sha512-mpI8qcTwLGiA4zEQvTC/U1xGUezVV4V8HQCOYjlEOrVmU1etVvxOjkCXHGwrlYdZU/EPmUiWfsO3yt1o+Q2bgw==", "dev": true, "hasInstallScript": true, "dependencies": { - "@cypress/request": "2.88.12", + "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", + "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -766,7 +766,7 @@ "cypress": "bin/cypress" }, "engines": { - "node": "^14.0.0 || ^16.0.0 || >=18.0.0" + "node": "^16.0.0 || ^18.0.0 || >=20.0.0" } }, "node_modules/cypress-fail-fast": { diff --git a/package.json b/package.json index c7c6cccb2..0826a2d21 100755 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ }, "homepage": "https://github.com/mollie/PrestaShop#readme", "devDependencies": { - "cypress": "^12.17.4", + "cypress": "^13.3.0", "cypress-fail-fast": "^7.0.0", "cypress-iframe": "^1.0.1", "cypress-terminal-report": "^5.3.3", From 11c2341748bc356fc717cbda14a4e3877aeb9d95 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 13:10:57 +0300 Subject: [PATCH 095/109] Update 04_mollie.ps1785.Subscriptions.js --- cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js b/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js index 9ab194022..c5dd78fb3 100755 --- a/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js +++ b/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js @@ -44,7 +44,8 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('[class="attribute-quantity"]').last().find('[type="text"]').clear().type('999') cy.get('#submit').click() cy.get('.growl-message').contains('Settings updated.') - //Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it +}) +it('Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => { cy.visit('/de/') cy.get('[data-id-product="8"]').click() cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page @@ -62,8 +63,8 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('.ps-shown-by-js > .btn').click() cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') - //Check if Subscription options are implemented in My Account FO +}); +it('Check if Subscription options are implemented in My Account FO', () => { cy.visit('/en/') cy.get('[class="account"]').click() cy.contains('Subscriptions').click() From d46be3e2ecf042d719094466bec3e807efdd69dc Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 13:52:42 +0300 Subject: [PATCH 096/109] Update 03_mollie.ps8.PaymentTests.js --- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index 715a540f7..edb1bee2f 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -46,14 +46,14 @@ const login = (MollieBOFOLoggingIn) => { cy.get('#history-link > .link-item').click() }) } -// //Checking the console for errors -// let windowConsoleError; -// Cypress.on('window:before:load', (win) => { -// windowConsoleError = cy.spy(win.console, 'error'); -// }) -// afterEach(() => { -// expect(windowConsoleError).to.not.be.called; -// }) +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +afterEach(() => { + expect(windowConsoleError).to.not.be.called; +}) describe('PS8 Tests Suite', () => { beforeEach(() => { cy.viewport(1920,1080) From 7b7a4d45b3fd0fc98f4566bcdf5b035d46aa3d13 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 13:52:56 +0300 Subject: [PATCH 097/109] Update 04_mollie.ps8.Subscriptions.js --- cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js index 6c82166f7..4247b5cda 100755 --- a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js +++ b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js @@ -44,26 +44,28 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('[class="attribute-quantity"]').last().find('[type="text"]').clear().type('999') cy.get('#submit').click() cy.get('.growl-message').contains('Settings updated.') - //Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it - cy.visit('/de/') +}) +it.skip('Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => { //PS805 test is not working on Cypress, deleting the Cart session somehow, checking for alternative test + cy.visit('/en/') cy.get('[data-id-product="8"]').click() cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page cy.contains('Add to cart').click() cy.contains('Proceed to checkout').click() + cy.visit('/en/cart?action=show') //strangely, session is deleted somehow, but after the visit to the Cart page again, the Cart is with an item again cy.contains('Proceed to checkout').click() cy.contains('DE').click() cy.get('.clearfix > .btn').click() cy.get('#js-delivery > .continue').click() //Payment method choosing - cy.contains('Karte').click({force:true}) + cy.contains('Card').click({force:true}) //Credit card inputing cy.CreditCardFillingIframe() cy.get('.condition-label > .js-terms').click({force:true}) cy.get('.ps-shown-by-js > .btn').click() cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') - //Check if Subscription options are implemented in My Account FO +}); +it('Check if Subscription options are implemented in My Account FO', () => { cy.visit('/en/') cy.get('[class="account"]').click() cy.contains('Subscriptions').click() From 6e53f71bb4047ff75d1a2f526cab580ab08ea301 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 14:02:31 +0300 Subject: [PATCH 098/109] adding testrail ids for CI --- cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js | 6 +++--- cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js b/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js index c5dd78fb3..b88609478 100755 --- a/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js +++ b/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js @@ -27,7 +27,7 @@ describe('PS1785 Subscriptions Test Suit', () => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') }) -it('C176305 Check if Subscription options added in Product BO', () => { +it('C176305: Check if Subscription options added in Product BO', () => { cy.visit('/admin1/') cy.get('#subtab-AdminCatalog > :nth-child(1)').click() cy.get('#subtab-AdminProducts > .link').click() @@ -45,7 +45,7 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('#submit').click() cy.get('.growl-message').contains('Settings updated.') }) -it('Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => { +it('C1672516: Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => { cy.visit('/de/') cy.get('[data-id-product="8"]').click() cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page @@ -64,7 +64,7 @@ it('Check if Subscription options are in Product Page FO and then register the S cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() }); -it('Check if Subscription options are implemented in My Account FO', () => { +it('C1672517: Check if Subscription options are implemented in My Account FO', () => { cy.visit('/en/') cy.get('[class="account"]').click() cy.contains('Subscriptions').click() diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js index 4247b5cda..3fa8b4922 100755 --- a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js +++ b/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js @@ -27,7 +27,7 @@ describe('PS8 Subscriptions Test Suit', () => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') }) -it('C176305 Check if Subscription options added in Product BO', () => { +it('C176305: Check if Subscription options added in Product BO', () => { cy.visit('/admin1/') cy.get('#subtab-AdminCatalog > :nth-child(1)').click() cy.get('#subtab-AdminProducts > .link').click() @@ -45,7 +45,7 @@ it('C176305 Check if Subscription options added in Product BO', () => { cy.get('#submit').click() cy.get('.growl-message').contains('Settings updated.') }) -it.skip('Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => { //PS805 test is not working on Cypress, deleting the Cart session somehow, checking for alternative test +it.skip('C1672516: Check if Subscription options are in Product Page FO and then register the Subscription product by purchasing it', () => { //PS805 test is not working on Cypress, deleting the Cart session somehow, checking for alternative test cy.visit('/en/') cy.get('[data-id-product="8"]').click() cy.get('[aria-label="Subscription"]').should('be.visible') //asserting if there is a Subscription dropdown in product page @@ -65,7 +65,7 @@ it.skip('Check if Subscription options are in Product Page FO and then register cy.get('[value="paid"]').click() cy.get('[class="button form__button"]').click() }); -it('Check if Subscription options are implemented in My Account FO', () => { +it('C1672517: Check if Subscription options are implemented in My Account FO', () => { cy.visit('/en/') cy.get('[class="account"]').click() cy.contains('Subscriptions').click() From f40b43b1d5a97f7e9df7002cd5b123a5348c9ddb Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 14:38:09 +0300 Subject: [PATCH 099/109] Update 03_mollie.ps8.PaymentTests.js --- cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js index edb1bee2f..7d492bbe4 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js @@ -59,7 +59,7 @@ describe('PS8 Tests Suite', () => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') }) -it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { +it.skip('C339342: 05 Vouchers Checkouting [Orders API]', () => { //temporary skip, possible bug containing PS8 version cy.visit('/de/index.php?controller=history') cy.contains('Reorder').click() cy.contains('DE').click() @@ -342,7 +342,7 @@ it('C339357: 20 IN3 Checkouting [Orders API]', () => { // wip cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it.skip('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason +it('C339358: 21 IN3 Order BO Shipping, Refunding [Orders API]', () => { // checking why payment div is not loaded in the Orders for some reason cy.OrderRefundingShippingOrdersAPI() }) it('C339359: 22 IN3 should not be shown under 5000 EUR [Orders API]', () => { From 14e088a438bcbc8c143f500e4c78631686cd26bd Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 17:01:48 +0300 Subject: [PATCH 100/109] small typo --- .../e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js index d8b5a0415..f9f41e6f6 100755 --- a/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js +++ b/cypress/e2e/ps1785/01_mollie.ps1785.ModuleConfiguration.specs.js @@ -111,13 +111,13 @@ it('C339339: 03 Checking the Advanced Settings tab, verifying the Front-end comp cy.get('[class="alert alert-success"]').should('be.visible') //checking if saving returns green alert //cy.window() will check if there are no Errors in console }); -it('C688472 Checking the Subscriptions tab, and console errors', () => { +it('C688472: Checking the Subscriptions tab, and console errors', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() cy.get('#subtab-AdminMollieSubscriptionOrders').click() cy.get('[id="invertus_mollie_subscription_grid_panel"]').should('be.visible') }); -it('C688473 Checking the Subscriptions FAQ, and console errors', () => { +it('C688473: Checking the Subscriptions FAQ, and console errors', () => { cy.visit('/admin1/') cy.OpeningModuleDashboardURL() cy.get('#subtab-AdminMollieSubscriptionFAQ').click() From 514a2dd7793f513f05f9a2a6f599fc9a6fbe637e Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 2 Oct 2023 17:23:37 +0300 Subject: [PATCH 101/109] small e2e improvements --- cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js | 2 +- cypress/support/commands.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js index 723f62df7..c96b7b7d4 100755 --- a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js @@ -91,7 +91,7 @@ it('C339342: 05 Vouchers Checkouting [Orders API]', () => { cy.get('[class="button form__button"]').click() cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') }) -it('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { +it.skip('C339343: 06 Vouchers Order BO Refunding, Shipping (Paid part only) [Orders API]', () => { //skipping, because of flaky behavior of this payment, sometimes the Mollie div is shown in Orders BO, sometimes not cy.OrderRefundingShippingOrdersAPI() cy.get('[class="card-body"]').find('[class="alert alert-warning"]').should('exist') //additional checking if the warning alert for vouchers exist }) diff --git a/cypress/support/commands.js b/cypress/support/commands.js index 8a2b96281..00851b9f6 100755 --- a/cypress/support/commands.js +++ b/cypress/support/commands.js @@ -465,6 +465,7 @@ Cypress.Commands.add("ConfPaymentsAPI1784", () => { Cypress.Commands.add("OrderRefundingShippingOrdersAPI", () => { cy.visit('/admin1/index.php?controller=AdminOrders') cy.get(':nth-child(1) > .column-payment').click() + cy.scrollTo('bottom') //Refunding dropdown in React cy.get('.btn-group-action > .btn-group > .dropdown-toggle').eq(0).click() cy.get('[role="button"]').eq(2).click() @@ -484,6 +485,7 @@ Cypress.Commands.add("OrderRefundingShippingOrdersAPI", () => { Cypress.Commands.add("OrderShippingRefundingOrdersAPI", () => { cy.visit('/admin1/index.php?controller=AdminOrders') cy.get(':nth-child(1) > .column-payment').click() + cy.scrollTo('bottom') //Shipping button in React cy.get('.btn-group > [title=""]').eq(0).click() cy.get('[class="swal-button swal-button--confirm"]').click() @@ -503,6 +505,7 @@ Cypress.Commands.add("OrderShippingRefundingOrdersAPI", () => { Cypress.Commands.add("OrderRefundingPartialPaymentsAPI", () => { cy.visit('/admin1/index.php?controller=AdminOrders') cy.get(':nth-child(1) > .column-payment').click() + cy.scrollTo('bottom') cy.get('#mollie_order > :nth-child(1)').should('exist') cy.get('.form-inline > :nth-child(1) > .btn').should('exist') cy.get('.input-group-btn > .btn').should('exist') From 65b36710e6bea7abe8afceccfd9939a9b7e17135 Mon Sep 17 00:00:00 2001 From: mandan2 <61560082+mandan2@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:23:35 +0300 Subject: [PATCH 102/109] PIPRES-261: Separate carrier for recurring orders improvements (#821) * PIPRES-261: shipping option module setting (#814) * PIPRES-261: Shipping option module setting * csfixer * install and uninstall subscription configuration * improved faq page * PIPRES-333: Missing registered interface (#816) * PIPRES-261: Get carrier price to create subscription (#817) * PIPRES-261: Get carrier price to create subscription * updated subscription faq * renamed some services and added additional conditions for carrier retrieve * addedd back to exception codes * PIPRES-261: Set carrier for recurring order (#818) * PIPRES-261: Get carrier price to create subscription * renamed some services and added additional conditions for carrier retrieve * PIPRES-261: Set carrier for recurring order * PIPRES-261: Subscription order detail view refactoring (#819) * PIPRES-261: Get carrier price to create subscription * renamed some services and added additional conditions for carrier retrieve * addedd back to exception codes * PIPRES-261: Subscription order detail view refactoring * phpstan * PIPRES-261: Minor improvements (#820) * PIPRES-261: Get carrier price to create subscription * renamed some services and added additional conditions for carrier retrieve * PIPRES-261: Minor improvements * PIPRES-261: Create fresh specific price (#822) * PIPRES-261: Restrict BO subscription list for all shops (#823) * PIPRES-261: Restrict BO subscription list for all shops * fixed redundant error mesage --- controllers/front/recurringOrderDetail.php | 21 +- controllers/front/subscriptionWebhook.php | 9 + src/Adapter/Context.php | 15 + src/Adapter/Shop.php | 4 +- src/Builder/FormBuilder.php | 57 +++- src/Config/Config.php | 2 + .../CouldNotCreateOrderPaymentFee.php | 2 +- src/Exception/CouldNotInstallModule.php | 2 +- src/Exception/CouldNotUpdateOrderTotals.php | 2 +- .../CouldNotHandleOrderPaymentFee.php | 8 +- src/Handler/Order/OrderCreationHandler.php | 19 +- src/Install/Installer.php | 2 + src/Install/Uninstall.php | 1 + src/Repository/AddressRepository.php | 9 +- src/Repository/AddressRepositoryInterface.php | 1 + src/Repository/CarrierRepository.php | 16 + src/Repository/CarrierRepositoryInterface.php | 8 + src/Repository/CountryRepository.php | 2 +- src/Repository/CountryRepositoryInterface.php | 7 + src/Repository/ProductRepository.php | 23 ++ src/Repository/ProductRepositoryInterface.php | 10 + src/Service/ConfigFieldService.php | 2 + src/Service/SettingsSaveService.php | 3 + src/ServiceProvider/BaseServiceProvider.php | 19 ++ .../Action/CreateSpecificPriceAction.php | 67 +++++ .../Symfony/SubscriptionController.php | 13 + .../Symfony/SubscriptionFAQController.php | 34 ++- subscription/DTO/CreateSpecificPriceData.php | 115 +++++++ .../CouldNotHandleRecurringOrder.php | 16 +- .../Exception/CouldNotPresentOrderDetail.php | 38 +++ ...rovideSubscriptionCarrierDeliveryPrice.php | 62 ++++ subscription/Exception/ExceptionCode.php | 18 +- .../Factory/CreateSubscriptionDataFactory.php | 45 ++- .../Handler/RecurringOrderHandler.php | 154 ++++++---- .../Handler/SubscriptionCreationHandler.php | 5 +- .../Presenter/OrderDetailPresenter.php | 129 ++++++++ subscription/Presenter/OrderPresenter.php | 35 --- .../Presenter/RecurringOrderLazyArray.php | 40 --- .../Presenter/RecurringOrderPresenter.php | 24 +- ...bscriptionCarrierDeliveryPriceProvider.php | 124 ++++++++ .../Repository/OrderDetailRepository.php | 11 + .../OrderDetailRepositoryInterface.php | 9 + .../Repository/SpecificPriceRepository.php | 11 + .../SpecificPriceRepositoryInterface.php | 9 + tests/Integration/Factory/CarrierFactory.php | 8 + tests/Integration/Factory/ProductFactory.php | 26 ++ .../Action/CreateSpecificPriceActionTest.php | 67 +++++ .../Presenter/OrderPresenterTest.php | 75 ----- ...iptionCarrierDeliveryPriceProviderTest.php | 159 ++++++++++ .../Presenter/OrderDetailPresenterTest.php | 283 ++++++++++++++++++ .../subscription/customer_order_detail.css | 7 + .../Subscription/subscriptions-faq.html.twig | 55 +++- .../customerRecurringOrderDetail.tpl | 5 +- .../customerRecurringOrderDetailProduct.tpl | 31 ++ 54 files changed, 1628 insertions(+), 291 deletions(-) create mode 100644 src/Repository/CarrierRepository.php create mode 100644 src/Repository/CarrierRepositoryInterface.php create mode 100644 src/Repository/CountryRepositoryInterface.php create mode 100644 src/Repository/ProductRepository.php create mode 100644 src/Repository/ProductRepositoryInterface.php create mode 100644 subscription/Action/CreateSpecificPriceAction.php create mode 100644 subscription/DTO/CreateSpecificPriceData.php create mode 100644 subscription/Exception/CouldNotPresentOrderDetail.php create mode 100644 subscription/Exception/CouldNotProvideSubscriptionCarrierDeliveryPrice.php create mode 100644 subscription/Presenter/OrderDetailPresenter.php delete mode 100644 subscription/Presenter/OrderPresenter.php delete mode 100644 subscription/Presenter/RecurringOrderLazyArray.php create mode 100644 subscription/Provider/SubscriptionCarrierDeliveryPriceProvider.php create mode 100644 subscription/Repository/OrderDetailRepository.php create mode 100644 subscription/Repository/OrderDetailRepositoryInterface.php create mode 100644 subscription/Repository/SpecificPriceRepository.php create mode 100644 subscription/Repository/SpecificPriceRepositoryInterface.php create mode 100644 tests/Integration/Factory/ProductFactory.php create mode 100644 tests/Integration/Subscription/Action/CreateSpecificPriceActionTest.php delete mode 100644 tests/Integration/Subscription/Presenter/OrderPresenterTest.php create mode 100644 tests/Integration/Subscription/Provider/SubscriptionCarrierDeliveryPriceProviderTest.php create mode 100644 tests/Unit/Subscription/Presenter/OrderDetailPresenterTest.php create mode 100644 views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl diff --git a/controllers/front/recurringOrderDetail.php b/controllers/front/recurringOrderDetail.php index 6fe4b7b86..300f83372 100644 --- a/controllers/front/recurringOrderDetail.php +++ b/controllers/front/recurringOrderDetail.php @@ -25,6 +25,7 @@ */ use Mollie\Controller\AbstractMollieController; +use Mollie\Logger\PrestaLoggerInterface; use Mollie\Subscription\Handler\FreeOrderCreationHandler; use Mollie\Subscription\Handler\SubscriptionCancellationHandler; use Mollie\Subscription\Presenter\RecurringOrderPresenter; @@ -74,13 +75,25 @@ public function initContent() Tools::redirect(Context::getContext()->link->getModuleLink($this->module->name, 'subscriptions', [], true)); } + /** @var PrestaLoggerInterface $logger */ + $logger = $this->module->getService(PrestaLoggerInterface::class); + /** @var RecurringOrderPresenter $recurringOrderPresenter */ $recurringOrderPresenter = $this->module->getService(RecurringOrderPresenter::class); - $this->context->smarty->assign([ - 'recurringOrderData' => $recurringOrderPresenter->present($recurringOrderId), - 'token' => Tools::getToken(), - ]); + try { + $this->context->smarty->assign([ + 'recurringOrderData' => $recurringOrderPresenter->present($recurringOrderId), + 'token' => Tools::getToken(), + ]); + } catch (Throwable $exception) { + $logger->error('Failed to present subscription order', [ + 'Exception message' => $exception->getMessage(), + 'Exception code' => $exception->getCode(), + ]); + + Tools::redirect(Context::getContext()->link->getModuleLink($this->module->name, 'subscriptions', [], true)); + } parent::initContent(); $this->context->controller->addCSS($this->module->getPathUri() . 'views/css/front/subscription/customer_order_detail.css'); diff --git a/controllers/front/subscriptionWebhook.php b/controllers/front/subscriptionWebhook.php index 0fe91601f..433e6b290 100644 --- a/controllers/front/subscriptionWebhook.php +++ b/controllers/front/subscriptionWebhook.php @@ -13,6 +13,7 @@ use Mollie\Controller\AbstractMollieController; use Mollie\Errors\Http\HttpStatusCode; use Mollie\Handler\ErrorHandler\ErrorHandler; +use Mollie\Logger\PrestaLoggerInterface; use Mollie\Subscription\Handler\RecurringOrderHandler; if (!defined('_PS_VERSION_')) { @@ -62,9 +63,17 @@ protected function executeWebhook() /** @var ErrorHandler $errorHandler */ $errorHandler = $this->module->getService(ErrorHandler::class); + /** @var PrestaLoggerInterface $logger */ + $logger = $this->module->getService(PrestaLoggerInterface::class); + try { $recurringOrderHandler->handle($transactionId); } catch (\Throwable $exception) { + $logger->error('Failed to handle recurring order', [ + 'Exception message' => $exception->getMessage(), + 'Exception code' => $exception->getCode(), + ]); + $errorHandler->handle($exception, null, false); $this->respond('failed', HttpStatusCode::HTTP_BAD_REQUEST); diff --git a/src/Adapter/Context.php b/src/Adapter/Context.php index 2bdf0a9d5..5aec66c47 100644 --- a/src/Adapter/Context.php +++ b/src/Adapter/Context.php @@ -130,4 +130,19 @@ public function getShopGroupId(): int { return (int) PrestashopContext::getContext()->shop->id_shop_group; } + + public function formatPrice(float $price, string $isoCode): string + { + $locale = PrestashopContext::getContext()->getCurrentLocale(); + + /* @phpstan-ignore-next-line */ + if (!$locale) { + return (string) $price; + } + + return $locale->formatPrice( + $price, + $isoCode + ); + } } diff --git a/src/Adapter/Shop.php b/src/Adapter/Shop.php index cfedbcac2..9a6028605 100644 --- a/src/Adapter/Shop.php +++ b/src/Adapter/Shop.php @@ -19,8 +19,8 @@ public function getShop(): \Shop return \Context::getContext()->shop; } - public function getContext() + public function getContext(): int { - return $this->getShop()->getContext(); + return (int) $this->getShop()->getContext(); } } diff --git a/src/Builder/FormBuilder.php b/src/Builder/FormBuilder.php index eacef51b6..111c9f83f 100644 --- a/src/Builder/FormBuilder.php +++ b/src/Builder/FormBuilder.php @@ -24,6 +24,7 @@ use Mollie\Api\Types\RefundStatus; use Mollie\Config\Config; use Mollie\Provider\CustomLogoProviderInterface; +use Mollie\Repository\CarrierRepositoryInterface; use Mollie\Repository\TaxRulesGroupRepositoryInterface; use Mollie\Service\ApiService; use Mollie\Service\ConfigFieldService; @@ -90,6 +91,8 @@ class FormBuilder /** @var Context */ private $context; + /** @var CarrierRepositoryInterface */ + private $carrierRepository; public function __construct( Mollie $module, @@ -103,7 +106,8 @@ public function __construct( CustomLogoProviderInterface $creditCardLogoProvider, ConfigurationAdapter $configuration, TaxRulesGroupRepositoryInterface $taxRulesGroupRepository, - Context $context + Context $context, + CarrierRepositoryInterface $carrierRepository ) { $this->module = $module; $this->apiService = $apiService; @@ -117,6 +121,7 @@ public function __construct( $this->configuration = $configuration; $this->taxRulesGroupRepository = $taxRulesGroupRepository; $this->context = $context; + $this->carrierRepository = $carrierRepository; } public function buildSettingsForm() @@ -527,6 +532,8 @@ protected function getAdvancedSettingsSection() ], ]; + $input = array_merge($input, $this->getShippingOptions($advancedSettings)); + $messageStatus = $this->module->l('Status for %s payments', self::FILE_NAME); $descriptionStatus = $this->module->l('`%s` payments get `%s` status', self::FILE_NAME); $messageMail = $this->module->l('Send email when %s', self::FILE_NAME); @@ -821,4 +828,52 @@ private function getSettingTabs($isApiKeyProvided) return $tabs; } + + private function getShippingOptions(string $tab): array + { + /** @var \Carrier[] $carriers */ + $carriers = $this->carrierRepository->findAllBy([ + 'active' => 1, + 'deleted' => 0, + ]); + + $mappedCarriers = []; + + $mappedCarriers[] = [ + 'id' => 0, + 'name' => $this->module->l('Not selected', self::FILE_NAME), + ]; + + foreach ($carriers as $carrier) { + $mappedCarriers[] = [ + 'id' => $carrier->id, + 'name' => $carrier->name, + ]; + } + + $header = [ + 'type' => 'mollie-h2', + 'name' => '', + 'tab' => $tab, + 'title' => $this->module->l('Subscriptions', self::FILE_NAME), + ]; + + $options = [ + 'type' => 'select', + 'label' => $this->module->l('Select shipping option to use in subscription orders', self::FILE_NAME), + 'desc' => $this->module->l('WARNING: do not change selection after getting first subscription order.', self::FILE_NAME), + 'tab' => $tab, + 'name' => Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, + 'options' => [ + 'query' => $mappedCarriers, + 'id' => 'id', + 'name' => 'name', + ], + ]; + + return [ + $header, + $options, + ]; + } } diff --git a/src/Config/Config.php b/src/Config/Config.php index b08d3a074..1509c77ba 100644 --- a/src/Config/Config.php +++ b/src/Config/Config.php @@ -157,6 +157,8 @@ class Config const MOLLIE_CARRIER_URL_SOURCE = 'MOLLIE_CARRIER_URL_SOURCE_'; const MOLLIE_CARRIER_CUSTOM_URL = 'MOLLIE_CARRIER_CUSTOM_URL_'; + const MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID = 'MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID'; + const MOLLIE_METHOD_ENABLED = 'MOLLIE_METHOD_ENABLED_'; const MOLLIE_METHOD_TITLE = 'MOLLIE_METHOD_TITLE_'; const MOLLIE_METHOD_API = 'MOLLIE_METHOD_API_'; diff --git a/src/Exception/CouldNotCreateOrderPaymentFee.php b/src/Exception/CouldNotCreateOrderPaymentFee.php index dd7919550..0ac620f71 100644 --- a/src/Exception/CouldNotCreateOrderPaymentFee.php +++ b/src/Exception/CouldNotCreateOrderPaymentFee.php @@ -7,7 +7,7 @@ class CouldNotCreateOrderPaymentFee extends MollieException { - public static function failedToInsertOrderPaymentFee(Exception $exception): CouldNotCreateOrderPaymentFee + public static function failedToInsertOrderPaymentFee(Exception $exception): self { return new self( 'Failed to insert order payment fee.', diff --git a/src/Exception/CouldNotInstallModule.php b/src/Exception/CouldNotInstallModule.php index 9ff488ae8..c9fd4b06c 100644 --- a/src/Exception/CouldNotInstallModule.php +++ b/src/Exception/CouldNotInstallModule.php @@ -6,7 +6,7 @@ class CouldNotInstallModule extends MollieException { - public static function failedToInstallOrderState(string $orderStateName, \Exception $exception): CouldNotInstallModule + public static function failedToInstallOrderState(string $orderStateName, \Exception $exception): self { return new self( sprintf('Failed to install order state (%s).', $orderStateName), diff --git a/src/Exception/CouldNotUpdateOrderTotals.php b/src/Exception/CouldNotUpdateOrderTotals.php index 6c8625bbc..69bda3404 100644 --- a/src/Exception/CouldNotUpdateOrderTotals.php +++ b/src/Exception/CouldNotUpdateOrderTotals.php @@ -7,7 +7,7 @@ class CouldNotUpdateOrderTotals extends MollieException { - public static function failedToUpdateOrderTotals(Exception $exception): CouldNotUpdateOrderTotals + public static function failedToUpdateOrderTotals(Exception $exception): self { return new self( 'Failed to update order totals.', diff --git a/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php b/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php index cab968358..077c1f55a 100644 --- a/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php +++ b/src/Handler/Exception/CouldNotHandleOrderPaymentFee.php @@ -8,7 +8,7 @@ class CouldNotHandleOrderPaymentFee extends MollieException { - public static function failedToRetrievePaymentMethod(Throwable $exception): CouldNotHandleOrderPaymentFee + public static function failedToRetrievePaymentMethod(Throwable $exception): self { return new self( 'Failed to retrieve payment method', @@ -17,7 +17,7 @@ public static function failedToRetrievePaymentMethod(Throwable $exception): Coul ); } - public static function failedToRetrievePaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee + public static function failedToRetrievePaymentFee(Throwable $exception): self { return new self( 'Failed to retrieve payment fee', @@ -26,7 +26,7 @@ public static function failedToRetrievePaymentFee(Throwable $exception): CouldNo ); } - public static function failedToCreateOrderPaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee + public static function failedToCreateOrderPaymentFee(Throwable $exception): self { return new self( 'Failed to create order payment fee', @@ -35,7 +35,7 @@ public static function failedToCreateOrderPaymentFee(Throwable $exception): Coul ); } - public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): CouldNotHandleOrderPaymentFee + public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): self { return new self( 'Failed to update order total with payment fee.', diff --git a/src/Handler/Order/OrderCreationHandler.php b/src/Handler/Order/OrderCreationHandler.php index e09f39690..7a3316cf4 100644 --- a/src/Handler/Order/OrderCreationHandler.php +++ b/src/Handler/Order/OrderCreationHandler.php @@ -49,6 +49,7 @@ use Mollie\DTO\PaymentData; use Mollie\Exception\FailedToProvidePaymentFeeException; use Mollie\Exception\OrderCreationException; +use Mollie\Logger\PrestaLoggerInterface; use Mollie\Provider\PaymentFeeProviderInterface; use Mollie\Repository\PaymentMethodRepositoryInterface; use Mollie\Service\OrderStatusService; @@ -85,6 +86,8 @@ class OrderCreationHandler private $subscriptionOrder; /** @var PaymentFeeProviderInterface */ private $paymentFeeProvider; + /** @var PrestaLoggerInterface */ + private $logger; public function __construct( Mollie $module, @@ -94,7 +97,8 @@ public function __construct( OrderStatusService $orderStatusService, SubscriptionCreationHandler $recurringOrderCreation, SubscriptionOrderValidator $subscriptionOrder, - PaymentFeeProviderInterface $paymentFeeProvider + PaymentFeeProviderInterface $paymentFeeProvider, + PrestaLoggerInterface $logger ) { $this->module = $module; $this->paymentMethodRepository = $paymentMethodRepository; @@ -104,6 +108,7 @@ public function __construct( $this->recurringOrderCreation = $recurringOrderCreation; $this->subscriptionOrder = $subscriptionOrder; $this->paymentFeeProvider = $paymentFeeProvider; + $this->logger = $logger; } /** @@ -286,6 +291,16 @@ private function createRecurringOrderEntity(Order $order, string $method): void return; } - $this->recurringOrderCreation->handle($order, $method); + try { + $this->recurringOrderCreation->handle($order, $method); + } catch (\Throwable $exception) { + $this->logger->error( + 'Failed to create recurring order', + [ + 'Exception message' => $exception->getMessage(), + 'Exception code' => $exception->getCode(), + ] + ); + } } } diff --git a/src/Install/Installer.php b/src/Install/Installer.php index 9455cc6ab..72a3eb6d8 100644 --- a/src/Install/Installer.php +++ b/src/Install/Installer.php @@ -209,6 +209,8 @@ protected function initConfig() $this->configurationAdapter->updateValue(Config::MOLLIE_API, Config::MOLLIE_ORDERS_API); $this->configurationAdapter->updateValue(Config::MOLLIE_APPLE_PAY_DIRECT_STYLE, 0); $this->configurationAdapter->updateValue(Config::MOLLIE_BANCONTACT_QR_CODE_ENABLED, 0); + + $this->configurationAdapter->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, 0); } public function setDefaultCarrierStatuses() diff --git a/src/Install/Uninstall.php b/src/Install/Uninstall.php index a6f7c1fff..c89dd7073 100644 --- a/src/Install/Uninstall.php +++ b/src/Install/Uninstall.php @@ -92,6 +92,7 @@ private function deleteConfig() Config::METHODS_CONFIG, Config::MOLLIE_MAIL_WHEN_COMPLETED, Config::MOLLIE_API_KEY_TEST, + Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, ]; $this->deleteConfigurations($configurations); diff --git a/src/Repository/AddressRepository.php b/src/Repository/AddressRepository.php index 867c90f2d..06696a498 100644 --- a/src/Repository/AddressRepository.php +++ b/src/Repository/AddressRepository.php @@ -2,12 +2,15 @@ namespace Mollie\Repository; -use Address; - class AddressRepository extends AbstractRepository implements AddressRepositoryInterface { public function __construct() { - parent::__construct(Address::class); + parent::__construct(\Address::class); + } + + public function getZoneById(int $id_address_delivery): int + { + return \Address::getZoneById($id_address_delivery); } } diff --git a/src/Repository/AddressRepositoryInterface.php b/src/Repository/AddressRepositoryInterface.php index a25dd6ce4..cab93f85f 100644 --- a/src/Repository/AddressRepositoryInterface.php +++ b/src/Repository/AddressRepositoryInterface.php @@ -4,4 +4,5 @@ interface AddressRepositoryInterface extends ReadOnlyRepositoryInterface { + public function getZoneById(int $id_address_delivery): int; } diff --git a/src/Repository/CarrierRepository.php b/src/Repository/CarrierRepository.php new file mode 100644 index 000000000..6dc12293d --- /dev/null +++ b/src/Repository/CarrierRepository.php @@ -0,0 +1,16 @@ + $this->configurationAdapter->get(Config::MOLLIE_STATUS_SHIPPING), Config::MOLLIE_MAIL_WHEN_SHIPPING => $this->configurationAdapter->get(Config::MOLLIE_MAIL_WHEN_SHIPPING), Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS => $this->configurationAdapter->get(Config::MOLLIE_AUTHORIZABLE_PAYMENT_INVOICE_ON_STATUS), + + Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID => $this->configurationAdapter->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID), ]; if (EnvironmentUtility::getApiKey() && $this->module->getApiClient() !== null) { diff --git a/src/Service/SettingsSaveService.php b/src/Service/SettingsSaveService.php index 3b69b5c89..53cb5e89a 100644 --- a/src/Service/SettingsSaveService.php +++ b/src/Service/SettingsSaveService.php @@ -257,6 +257,8 @@ public function saveSettings(&$errors = []) $applePayDirectStyle = $this->tools->getValue(Config::MOLLIE_APPLE_PAY_DIRECT_STYLE); $isBancontactQrCodeEnabled = $this->tools->getValue(Config::MOLLIE_BANCONTACT_QR_CODE_ENABLED); + $subscriptionsShippingOption = (int) $this->tools->getValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID); + $mollieShipMain = $this->tools->getValue(Config::MOLLIE_AUTO_SHIP_MAIN); if (!isset($mollieErrors)) { $mollieErrors = false; @@ -311,6 +313,7 @@ public function saveSettings(&$errors = []) $this->configurationAdapter->updateValue(Config::MOLLIE_DEBUG_LOG, (int) $mollieLogger); $this->configurationAdapter->updateValue(Config::MOLLIE_API, $mollieApi); $this->configurationAdapter->updateValue(Config::MOLLIE_VOUCHER_CATEGORY, $voucherCategory); + $this->configurationAdapter->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $subscriptionsShippingOption); $this->configurationAdapter->updateValue( Config::MOLLIE_AUTO_SHIP_STATUSES, json_encode($this->getStatusesValue(Config::MOLLIE_AUTO_SHIP_STATUSES)) diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php index d50746b53..44f50e108 100644 --- a/src/ServiceProvider/BaseServiceProvider.php +++ b/src/ServiceProvider/BaseServiceProvider.php @@ -16,6 +16,8 @@ use Mollie\Handler\Certificate\CertificateHandlerInterface; use Mollie\Handler\PaymentOption\PaymentOptionHandler; use Mollie\Handler\PaymentOption\PaymentOptionHandlerInterface; +use Mollie\Handler\RetryHandler; +use Mollie\Handler\RetryHandlerInterface; use Mollie\Handler\Settings\PaymentMethodPositionHandler; use Mollie\Handler\Settings\PaymentMethodPositionHandlerInterface; use Mollie\Handler\Shipment\ShipmentSenderHandler; @@ -45,10 +47,14 @@ use Mollie\Repository\AddressFormatRepositoryInterface; use Mollie\Repository\AddressRepository; use Mollie\Repository\AddressRepositoryInterface; +use Mollie\Repository\CarrierRepository; +use Mollie\Repository\CarrierRepositoryInterface; use Mollie\Repository\CartRepository; use Mollie\Repository\CartRepositoryInterface; use Mollie\Repository\CartRuleRepository; use Mollie\Repository\CartRuleRepositoryInterface; +use Mollie\Repository\CountryRepository; +use Mollie\Repository\CountryRepositoryInterface; use Mollie\Repository\CurrencyRepository; use Mollie\Repository\CurrencyRepositoryInterface; use Mollie\Repository\CustomerRepository; @@ -64,6 +70,8 @@ use Mollie\Repository\PaymentMethodRepositoryInterface; use Mollie\Repository\PendingOrderCartRuleRepository; use Mollie\Repository\PendingOrderCartRuleRepositoryInterface; +use Mollie\Repository\ProductRepository; +use Mollie\Repository\ProductRepositoryInterface; use Mollie\Repository\TaxRepository; use Mollie\Repository\TaxRepositoryInterface; use Mollie\Repository\TaxRuleRepository; @@ -92,10 +100,14 @@ use Mollie\Subscription\Install\InstallerInterface; use Mollie\Subscription\Logger\Logger; use Mollie\Subscription\Logger\LoggerInterface; +use Mollie\Subscription\Repository\OrderDetailRepository; +use Mollie\Subscription\Repository\OrderDetailRepositoryInterface; use Mollie\Subscription\Repository\RecurringOrderRepository; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; use Mollie\Subscription\Repository\RecurringOrdersProductRepository; use Mollie\Subscription\Repository\RecurringOrdersProductRepositoryInterface; +use Mollie\Subscription\Repository\SpecificPriceRepository; +use Mollie\Subscription\Repository\SpecificPriceRepositoryInterface; use Mollie\Subscription\Utility\Clock; use Mollie\Subscription\Utility\ClockInterface; use Mollie\Utility\Decoder\DecoderInterface; @@ -127,6 +139,12 @@ public function register(Container $container) /* Utility */ $this->addService($container, ClockInterface::class, $container->get(Clock::class)); + $this->addService($container, RetryHandlerInterface::class, $container->get(RetryHandler::class)); + + $this->addService($container, SpecificPriceRepositoryInterface::class, $container->get(SpecificPriceRepository::class)); + $this->addService($container, ProductRepositoryInterface::class, $container->get(ProductRepository::class)); + $this->addService($container, OrderDetailRepositoryInterface::class, $container->get(OrderDetailRepository::class)); + $this->addService($container, CountryRepositoryInterface::class, $container->get(CountryRepository::class)); $this->addService($container, PaymentMethodRepositoryInterface::class, $container->get(PaymentMethodRepository::class)); $this->addService($container, GenderRepositoryInterface::class, $container->get(GenderRepository::class)); $this->addService($container, MolCustomerRepository::class, MolCustomerRepository::class) @@ -179,6 +197,7 @@ public function register(Container $container) $this->addService($container, CurrencyRepositoryInterface::class, $container->get(CurrencyRepository::class)); $this->addService($container, CustomerRepositoryInterface::class, $container->get(CustomerRepository::class)); $this->addService($container, MolOrderPaymentFeeRepositoryInterface::class, $container->get(MolOrderPaymentFeeRepository::class)); + $this->addService($container, CarrierRepositoryInterface::class, $container->get(CarrierRepository::class)); $this->addService($container, CartRuleQuantityChangeHandlerInterface::class, $container->get(CartRuleQuantityChangeHandler::class)); $this->addService($container, RecurringOrderRepositoryInterface::class, RecurringOrderRepository::class) diff --git a/subscription/Action/CreateSpecificPriceAction.php b/subscription/Action/CreateSpecificPriceAction.php new file mode 100644 index 000000000..fde4e0a9a --- /dev/null +++ b/subscription/Action/CreateSpecificPriceAction.php @@ -0,0 +1,67 @@ +specificPriceRepository = $specificPriceRepository; + } + + /** + * @throws \Throwable + */ + public function run(CreateSpecificPriceData $data): \SpecificPrice + { + /** @var \SpecificPrice[] $specificPrices */ + $specificPrices = $this->specificPriceRepository->findAllBy([ + 'id_product' => $data->getProductId(), + 'id_product_attribute' => $data->getProductAttributeId(), + 'price' => $data->getPrice(), + 'id_customer' => $data->getCustomerId(), + 'id_shop' => $data->getShopId(), + 'id_currency' => $data->getCurrencyId(), + 'id_shop_group' => $data->getShopGroupId(), + 'id_country' => 0, + 'id_group' => 0, + 'from_quantity' => 0, + 'reduction' => 0, + 'reduction_type' => 'amount', + 'from' => '0000-00-00 00:00:00', + 'to' => '0000-00-00 00:00:00', + ]); + + foreach ($specificPrices as $specificPrice) { + $specificPrice->delete(); + } + + $specificPrice = new \SpecificPrice(); + + $specificPrice->id_product = $data->getProductId(); + $specificPrice->id_product_attribute = $data->getProductAttributeId(); + $specificPrice->price = $data->getPrice(); + $specificPrice->id_customer = $data->getCustomerId(); + $specificPrice->id_shop = $data->getShopId(); + $specificPrice->id_currency = $data->getCurrencyId(); + $specificPrice->id_shop_group = $data->getShopGroupId(); + $specificPrice->id_country = 0; + $specificPrice->id_group = 0; + $specificPrice->from_quantity = 0; + $specificPrice->reduction = 0; + $specificPrice->reduction_type = 'amount'; + $specificPrice->from = '0000-00-00 00:00:00'; + $specificPrice->to = '0000-00-00 00:00:00'; + + $specificPrice->add(); + + return $specificPrice; + } +} diff --git a/subscription/Controller/Symfony/SubscriptionController.php b/subscription/Controller/Symfony/SubscriptionController.php index 24596a78f..ba13cca0d 100644 --- a/subscription/Controller/Symfony/SubscriptionController.php +++ b/subscription/Controller/Symfony/SubscriptionController.php @@ -5,6 +5,7 @@ namespace Mollie\Subscription\Controller\Symfony; use Exception; +use Mollie\Adapter\Shop; use Mollie\Subscription\Exception\SubscriptionApiException; use Mollie\Subscription\Filters\SubscriptionFilters; use Mollie\Subscription\Grid\SubscriptionGridDefinitionFactory; @@ -28,6 +29,17 @@ class SubscriptionController extends AbstractSymfonyController */ public function indexAction(SubscriptionFilters $filters, Request $request) { + /** @var Shop $shop */ + $shop = $this->leagueContainer->getService(Shop::class); + + if ($shop->getContext() !== \Shop::CONTEXT_SHOP) { + if (!$this->get('session')->getFlashBag()->has('error')) { + $this->addFlash('error', $this->module->l('Select the shop that you want to configure')); + } + + return $this->render('@PrestaShop/Admin/layout.html.twig'); + } + /** @var GridFactoryInterface $currencyGridFactory */ $currencyGridFactory = $this->leagueContainer->getService('subscription_grid_factory'); $currencyGrid = $currencyGridFactory->getGrid($filters); @@ -71,6 +83,7 @@ public function cancelAction(int $subscriptionId): RedirectResponse { /** @var SubscriptionCancellationHandler $subscriptionCancellationHandler */ $subscriptionCancellationHandler = $this->leagueContainer->getService(SubscriptionCancellationHandler::class); + try { $subscriptionCancellationHandler->handle($subscriptionId); } catch (SubscriptionApiException $e) { diff --git a/subscription/Controller/Symfony/SubscriptionFAQController.php b/subscription/Controller/Symfony/SubscriptionFAQController.php index c6ebbc227..44654a77e 100644 --- a/subscription/Controller/Symfony/SubscriptionFAQController.php +++ b/subscription/Controller/Symfony/SubscriptionFAQController.php @@ -18,20 +18,24 @@ class SubscriptionFAQController extends AbstractSymfonyController */ public function indexAction() { - return $this->render('@Modules/mollie/views/templates/admin/Subscription/subscriptions-faq.html.twig', - [ - 'subscriptionCreationTittle' => $this->module->l('Subscription creation', self::FILE_NAME), - 'subscriptionCreation' => $this->module->l('To create a subscription option for a product variation, assign it a Mollie subscription attribute.', self::FILE_NAME), - 'importantInformationTittle' => $this->module->l('IMPORTANT points', self::FILE_NAME), - 'importantInformation' => $this->module->l('When you add Mollie subscription attributes, make sure you always include \'none\' as a fallback.', self::FILE_NAME), - 'cartRuleTitle' => $this->module->l('Cart rules', self::FILE_NAME), - 'cartRule' => $this->module->l('A customer can\'t add a subscription item to the shopping cart if it already contains a non-subscription item.', self::FILE_NAME), - 'cartRule2' => $this->module->l('A customer can\'t add subscription items with different recurring periods to the same shopping cart.', self::FILE_NAME), - 'cartRule3' => $this->module->l('Do not use cart rules with subscription products as this will cause errors due to incorrect pricing.', self::FILE_NAME), - 'subscriptionOrderLogicTitle' => $this->module->l('Recurring order creation', self::FILE_NAME), - 'recurringOrderCreation' => $this->module->l('Mollie for Prestashop automatically creates a new order when the previous order is paid for.', self::FILE_NAME), - 'recurringOrderPrice' => $this->module->l('Recurring orders always use the product price that was specified when the related subscription was created.', self::FILE_NAME), - 'recurringOrderAPIChanges' => $this->module->l('Recurring order will override the “Method” payment setting and will be using Mollie’s Payment API.', self::FILE_NAME), - ]); + return $this->render('@Modules/mollie/views/templates/admin/Subscription/subscriptions-faq.html.twig', [ + 'subscriptionCreationTittle' => $this->module->l('Subscription creation', self::FILE_NAME), + 'subscriptionCreation' => $this->module->l('To create a subscription option for a product variation, assign it a Mollie subscription attribute.', self::FILE_NAME), + 'importantInformationTittle' => $this->module->l('IMPORTANT points', self::FILE_NAME), + 'importantInformation' => $this->module->l('When you add Mollie subscription attributes, make sure you always include \'none\' as a fallback.', self::FILE_NAME), + 'carrierInformationTitle' => $this->module->l('IMPORTANT subscription carrier points', self::FILE_NAME), + 'carrierInformation1' => $this->module->l('Make sure to select default carrier for recurring orders in advanced settings.', self::FILE_NAME), + 'carrierInformation2' => $this->module->l('Carrier should cover all supported shop regions.', self::FILE_NAME), + 'carrierInformation3' => $this->module->l('Carrier cannot be changed after first subscription order is placed.', self::FILE_NAME), + 'carrierInformation4' => $this->module->l('Selected carrier pricing/weight settings or carrier selection in Mollie should not change. If they do, subscription orders must be cancelled and carrier re-selected in module settings.', self::FILE_NAME), + 'cartRuleTitle' => $this->module->l('Cart rules', self::FILE_NAME), + 'cartRule1' => $this->module->l('Do not use cart rules with subscription products as this will cause errors due to incorrect pricing.', self::FILE_NAME), + 'giftWrappingTitle' => $this->module->l('Gift wrapping', self::FILE_NAME), + 'giftWrapping1' => $this->module->l('Gift wrapping feature is not supported for subscription orders.', self::FILE_NAME), + 'subscriptionOrderLogicTitle' => $this->module->l('Recurring order creation', self::FILE_NAME), + 'recurringOrderCreation' => $this->module->l('Mollie for Prestashop automatically creates a new order when the previous order is paid for.', self::FILE_NAME), + 'recurringOrderPrice' => $this->module->l('Recurring orders always use the product price that was specified when the related subscription was created.', self::FILE_NAME), + 'recurringOrderAPIChanges' => $this->module->l('Recurring order will override the “Method” payment setting and will be using Mollie’s Payment API.', self::FILE_NAME), + ]); } } diff --git a/subscription/DTO/CreateSpecificPriceData.php b/subscription/DTO/CreateSpecificPriceData.php new file mode 100644 index 000000000..03574251f --- /dev/null +++ b/subscription/DTO/CreateSpecificPriceData.php @@ -0,0 +1,115 @@ +productId = $productId; + $this->productAttributeId = $productAttributeId; + $this->price = $price; + $this->customerId = $customerId; + $this->shopId = $shopId; + $this->shopGroupId = $shopGroupId; + $this->currencyId = $currencyId; + } + + /** + * @return int + */ + public function getProductId(): int + { + return $this->productId; + } + + /** + * @return int + */ + public function getProductAttributeId(): int + { + return $this->productAttributeId; + } + + /** + * @return float + */ + public function getPrice(): float + { + return $this->price; + } + + /** + * @return int + */ + public function getCustomerId(): int + { + return $this->customerId; + } + + /** + * @return int + */ + public function getShopId(): int + { + return $this->shopId; + } + + /** + * @return int + */ + public function getShopGroupId(): int + { + return $this->shopGroupId; + } + + /** + * @return int + */ + public function getCurrencyId(): int + { + return $this->currencyId; + } + + public static function create( + int $productId, + int $productAttributeId, + float $price, + int $customerId, + int $shopId, + int $shopGroupId, + int $currencyId + ): self { + return new self( + $productId, + $productAttributeId, + $price, + $customerId, + $shopId, + $shopGroupId, + $currencyId + ); + } +} diff --git a/subscription/Exception/CouldNotHandleRecurringOrder.php b/subscription/Exception/CouldNotHandleRecurringOrder.php index 197ed5163..88c00de19 100644 --- a/subscription/Exception/CouldNotHandleRecurringOrder.php +++ b/subscription/Exception/CouldNotHandleRecurringOrder.php @@ -2,25 +2,21 @@ namespace Mollie\Subscription\Exception; -use Throwable; - class CouldNotHandleRecurringOrder extends MollieSubscriptionException { - public static function failedToCreateOrderPaymentFee(Throwable $exception): CouldNotHandleRecurringOrder + public static function failedToFindSelectedCarrier(): self { return new self( - 'Failed to create order payment fee', - ExceptionCode::ORDER_FAILED_TO_CREATE_ORDER_PAYMENT_FEE, - $exception + 'Failed to find selected carrier', + ExceptionCode::RECURRING_ORDER_FAILED_TO_FIND_SELECTED_CARRIER ); } - public static function failedToUpdateOrderTotalWithPaymentFee(Throwable $exception): CouldNotHandleRecurringOrder + public static function failedToApplySelectedCarrier(): self { return new self( - 'Failed to update order total with payment fee.', - ExceptionCode::ORDER_FAILED_TO_UPDATE_ORDER_TOTAL_WITH_PAYMENT_FEE, - $exception + 'Failed to apply selected carrier', + ExceptionCode::RECURRING_ORDER_FAILED_TO_APPLY_SELECTED_CARRIER ); } } diff --git a/subscription/Exception/CouldNotPresentOrderDetail.php b/subscription/Exception/CouldNotPresentOrderDetail.php new file mode 100644 index 000000000..8ed1c4c34 --- /dev/null +++ b/subscription/Exception/CouldNotPresentOrderDetail.php @@ -0,0 +1,38 @@ +customerRepository = $customerRepository; $this->subscriptionInterval = $subscriptionInterval; @@ -57,10 +63,16 @@ public function __construct( $this->currencyAdapter = $currencyAdapter; $this->combination = $combination; $this->methodRepository = $methodRepository; - $this->link = $link; $this->module = $module; + $this->context = $context; + $this->subscriptionCarrierDeliveryPriceProvider = $subscriptionCarrierDeliveryPriceProvider; } + /** + * @throws \PrestaShopException + * @throws CouldNotProvideSubscriptionCarrierDeliveryPrice + * @throws SubscriptionIntervalException + */ public function build(Order $order, array $subscriptionProduct): SubscriptionDataDTO { $customer = $order->getCustomer(); @@ -74,13 +86,20 @@ public function build(Order $order, array $subscriptionProduct): SubscriptionDat $currency = $this->currencyAdapter->getById((int) $order->id_currency); $description = $this->subscriptionDescription->getSubscriptionDescription($order); - $orderTotal = (float) $subscriptionProduct['total_price_tax_incl'] - + (float) $order->total_wrapping_tax_incl - + (float) $order->total_shipping_tax_incl; + try { + $deliveryPrice = $this->subscriptionCarrierDeliveryPriceProvider->getPrice( + (int) $order->id_address_delivery, + (int) $order->id_cart, + (int) $order->id_customer, + $subscriptionProduct + ); + } catch (CouldNotProvideSubscriptionCarrierDeliveryPrice $exception) { + // TODO throw generic error when new logger will be implemented + throw $exception; + } + + $orderTotal = (float) $subscriptionProduct['total_price_tax_incl'] + $deliveryPrice; - /** - * NOTE: we will only send product price as total for subscriptions - */ $orderAmount = new Amount($orderTotal, $currency->iso_code); $subscriptionData = new SubscriptionDataDTO( $molCustomer->customer_id, @@ -89,7 +108,7 @@ public function build(Order $order, array $subscriptionProduct): SubscriptionDat $description ); - $subscriptionData->setWebhookUrl($this->link->getModuleLink( + $subscriptionData->setWebhookUrl($this->context->getModuleLink( 'mollie', 'subscriptionWebhook' )); diff --git a/subscription/Handler/RecurringOrderHandler.php b/subscription/Handler/RecurringOrderHandler.php index 7d4ac50da..56833468a 100644 --- a/subscription/Handler/RecurringOrderHandler.php +++ b/subscription/Handler/RecurringOrderHandler.php @@ -7,21 +7,24 @@ use Cart; use Mollie; use Mollie\Adapter\ConfigurationAdapter; -use Mollie\Adapter\Shop; use Mollie\Api\Resources\Payment; use Mollie\Api\Resources\Subscription as MollieSubscription; use Mollie\Api\Types\PaymentStatus; use Mollie\Api\Types\SubscriptionStatus; use Mollie\Config\Config; use Mollie\Errors\Http\HttpStatusCode; -use Mollie\Exception\OrderCreationException; use Mollie\Exception\TransactionException; +use Mollie\Logger\PrestaLoggerInterface; +use Mollie\Repository\CarrierRepositoryInterface; +use Mollie\Repository\OrderRepositoryInterface; use Mollie\Repository\PaymentMethodRepositoryInterface; use Mollie\Service\MailService; use Mollie\Service\MollieOrderCreationService; use Mollie\Service\OrderStatusService; use Mollie\Service\PaymentMethodService; +use Mollie\Subscription\Action\CreateSpecificPriceAction; use Mollie\Subscription\Api\SubscriptionApi; +use Mollie\Subscription\DTO\CreateSpecificPriceData; use Mollie\Subscription\Exception\CouldNotHandleRecurringOrder; use Mollie\Subscription\Factory\GetSubscriptionDataFactory; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; @@ -31,7 +34,6 @@ use MolRecurringOrder; use MolRecurringOrdersProduct; use Order; -use SpecificPrice; class RecurringOrderHandler { @@ -53,14 +55,20 @@ class RecurringOrderHandler private $paymentMethodService; /** @var ClockInterface */ private $clock; - /** @var Shop */ - private $shop; /** @var MailService */ private $mailService; /** @var ConfigurationAdapter */ private $configuration; /** @var RecurringOrdersProductRepositoryInterface */ private $recurringOrdersProductRepository; + /** @var CarrierRepositoryInterface */ + private $carrierRepository; + /** @var PrestaLoggerInterface */ + private $logger; + /** @var CreateSpecificPriceAction */ + private $createSpecificPriceAction; + /** @var Mollie\Repository\OrderRepositoryInterface */ + private $orderRepository; public function __construct( SubscriptionApi $subscriptionApi, @@ -72,10 +80,13 @@ public function __construct( OrderStatusService $orderStatusService, PaymentMethodService $paymentMethodService, ClockInterface $clock, - Shop $shop, MailService $mailService, ConfigurationAdapter $configuration, - RecurringOrdersProductRepositoryInterface $recurringOrdersProductRepository + RecurringOrdersProductRepositoryInterface $recurringOrdersProductRepository, + CarrierRepositoryInterface $carrierRepository, + PrestaLoggerInterface $logger, + CreateSpecificPriceAction $createSpecificPriceAction, + OrderRepositoryInterface $orderRepository ) { $this->subscriptionApi = $subscriptionApi; $this->subscriptionDataFactory = $subscriptionDataFactory; @@ -86,10 +97,13 @@ public function __construct( $this->orderStatusService = $orderStatusService; $this->paymentMethodService = $paymentMethodService; $this->clock = $clock; - $this->shop = $shop; $this->mailService = $mailService; $this->configuration = $configuration; $this->recurringOrdersProductRepository = $recurringOrdersProductRepository; + $this->carrierRepository = $carrierRepository; + $this->logger = $logger; + $this->createSpecificPriceAction = $createSpecificPriceAction; + $this->orderRepository = $orderRepository; } public function handle(string $transactionId): string @@ -130,10 +144,7 @@ public function handle(string $transactionId): string } /** - * @throws CouldNotHandleRecurringOrder - * @throws OrderCreationException - * @throws \PrestaShopDatabaseException - * @throws \PrestaShopException + * @throws \Throwable */ private function createSubscription(Payment $transaction, MolRecurringOrder $recurringOrder, MollieSubscription $subscription): void { @@ -146,13 +157,23 @@ private function createSubscription(Payment $transaction, MolRecurringOrder $rec return; } - $paymentMethod = $this->paymentMethodService->getPaymentMethod($transaction); + /** @var \Order|null $originalOrder */ + $originalOrder = $this->orderRepository->findOneBy([ + 'id_order' => $recurringOrder->id_order, + ]); - $methodName = $paymentMethod->method_name ?: Config::$methods[$transaction->method]; + if (!$originalOrder) { + return; + } /** @var Cart $newCart */ $newCart = $newCart['cart']; + $newCart->id_shop = $originalOrder->id_shop; + $newCart->id_shop_group = $originalOrder->id_shop_group; + + $newCart->update(); + /** @var MolRecurringOrdersProduct $subscriptionProduct */ $subscriptionProduct = $this->recurringOrdersProductRepository->findOneBy([ 'id_mol_recurring_orders_product' => $recurringOrder->id_mol_recurring_orders_product, @@ -182,24 +203,77 @@ private function createSubscription(Payment $transaction, MolRecurringOrder $rec $recurringOrderProduct = new MolRecurringOrdersProduct($recurringOrder->id_mol_recurring_orders_product); - $specificPrice = $this->createSpecificPrice($recurringOrderProduct, $recurringOrder); - - $this->mollie->validateOrder( - (int) $newCart->id, - (int) $this->configuration->get(Config::MOLLIE_STATUS_AWAITING), - (float) $subscription->amount->value, - sprintf('subscription/%s', $methodName), - null, - ['transaction_id' => $transaction->id], - null, - false, - $newCart->secure_key + $subscriptionCarrierId = (int) $this->configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID); + + /** @var \Carrier|null $carrier */ + $carrier = $this->carrierRepository->findOneBy([ + 'id_carrier' => $subscriptionCarrierId, + 'active' => 1, + 'deleted' => 0, + ]); + + if (!$carrier) { + throw CouldNotHandleRecurringOrder::failedToFindSelectedCarrier(); + } + + $newCart->setDeliveryOption( + [(int) $newCart->id_address_delivery => sprintf('%d,', (int) $carrier->id)] ); + $newCart->update(); + + $cartCarrier = (int) ($newCart->getDeliveryOption(null, false, false)[$newCart->id_address_delivery] ?? 0); + + if ((int) $carrier->id !== $cartCarrier) { + throw CouldNotHandleRecurringOrder::failedToApplySelectedCarrier(); + } + + /** + * Creating temporary specific price for recurring order that will be deleted after order is created + */ + $specificPrice = $this->createSpecificPriceAction->run(CreateSpecificPriceData::create( + (int) $recurringOrderProduct->id_product, + (int) $recurringOrderProduct->id_product_attribute, + (float) $recurringOrderProduct->unit_price, + (int) $recurringOrder->id_customer, + (int) $newCart->id_shop, + (int) $newCart->id_shop_group, + (int) $recurringOrder->id_currency + )); + + $paymentMethod = $this->paymentMethodService->getPaymentMethod($transaction); + + $methodName = $paymentMethod->method_name ?: Config::$methods[$transaction->method]; + + try { + $this->mollie->validateOrder( + (int) $newCart->id, + (int) $this->configuration->get(Config::MOLLIE_STATUS_AWAITING), + (float) $subscription->amount->value, + sprintf('subscription/%s', $methodName), + null, + ['transaction_id' => $transaction->id], + null, + false, + $newCart->secure_key + ); + } catch (\Throwable $exception) { + $specificPrice->delete(); + + throw $exception; + } + + $specificPrice->delete(); + $orderId = (int) Order::getIdByCartId((int) $newCart->id); $order = new Order($orderId); - $specificPrice->delete(); + if ((float) $order->total_paid_tax_incl !== (float) $subscription->amount->value) { + $this->logger->error('Paid price is not equal to the order\'s total', [ + 'Paid price' => (float) $subscription->amount->value, + 'Order price' => (float) $order->total_paid_tax_incl, + ]); + } $this->mollieOrderCreationService->createMolliePayment($transaction, (int) $newCart->id, $order->reference, (int) $orderId, PaymentStatus::STATUS_PAID); @@ -240,32 +314,6 @@ private function cancelSubscription(int $recurringOrderId): void $this->mailService->sendSubscriptionCancelWarningEmail($recurringOrderId); } - /** - * creating temporary specific price for recurring order that will be deleted after order is created - */ - private function createSpecificPrice(MolRecurringOrdersProduct $molRecurringOrdersProduct, MolRecurringOrder $recurringOrder): SpecificPrice - { - $specificPrice = new SpecificPrice(); - $specificPrice->id_product = $molRecurringOrdersProduct->id_product; - $specificPrice->id_product_attribute = $molRecurringOrdersProduct->id_product_attribute; - $specificPrice->price = $molRecurringOrdersProduct->unit_price; - $specificPrice->id_customer = $recurringOrder->id_customer; - $specificPrice->id_shop = $this->shop->getShop()->id; - $specificPrice->id_currency = $recurringOrder->id_currency; - $specificPrice->id_country = 0; - $specificPrice->id_shop_group = 0; - $specificPrice->id_group = 0; - $specificPrice->from_quantity = 0; - $specificPrice->reduction = 0; - $specificPrice->reduction_type = 'amount'; - $specificPrice->from = '0000-00-00 00:00:00'; - $specificPrice->to = '0000-00-00 00:00:00'; - - $specificPrice->add(); - - return $specificPrice; - } - private function updateSubscriptionOrderAddress(Cart $cart, int $addressInvoiceId, int $addressDeliveryId): Cart { $cart->id_address_invoice = $addressInvoiceId; diff --git a/subscription/Handler/SubscriptionCreationHandler.php b/subscription/Handler/SubscriptionCreationHandler.php index 89c5c220a..9f5e027cf 100644 --- a/subscription/Handler/SubscriptionCreationHandler.php +++ b/subscription/Handler/SubscriptionCreationHandler.php @@ -38,7 +38,10 @@ public function __construct( $this->subscriptionProductValidator = $subscriptionProductValidator; } - public function handle(Order $order, string $method) + /** + * @throws \Throwable + */ + public function handle(Order $order, string $method): void { $products = $order->getCartProducts(); $subscriptionProduct = []; diff --git a/subscription/Presenter/OrderDetailPresenter.php b/subscription/Presenter/OrderDetailPresenter.php new file mode 100644 index 000000000..9d02c0d9e --- /dev/null +++ b/subscription/Presenter/OrderDetailPresenter.php @@ -0,0 +1,129 @@ +orderDetailRepository = $orderDetailRepository; + $this->context = $context; + $this->orderRepository = $orderRepository; + $this->productRepository = $productRepository; + $this->currencyRepository = $currencyRepository; + } + + /** + * @throws CouldNotPresentOrderDetail + */ + public function present( + \MolRecurringOrder $recurringOrder, + \MolRecurringOrdersProduct $recurringProduct + ): array { + $result = []; + + /** @var \Order|null $order */ + $order = $this->orderRepository->findOneBy([ + 'id_order' => (int) $recurringOrder->id_order, + ]); + + if (!$order) { + throw CouldNotPresentOrderDetail::failedToFindOrder(); + } + + /** @var \OrderDetail|null $orderDetail */ + $orderDetail = $this->orderDetailRepository->findOneBy([ + 'id_order' => (int) $recurringOrder->id_order, + 'product_id' => (int) $recurringProduct->id_product, + 'product_attribute_id' => (int) $recurringProduct->id_product_attribute, + ]); + + if (!$orderDetail) { + throw CouldNotPresentOrderDetail::failedToFindOrderDetail(); + } + + /** @var \Product|null $product */ + $product = $this->productRepository->findOneBy([ + 'id_product' => (int) $recurringProduct->id_product, + ]); + + if (!$product) { + throw CouldNotPresentOrderDetail::failedToFindProduct(); + } + + /** @var \Currency|null $currency */ + $currency = $this->currencyRepository->findOneBy([ + 'id_currency' => (int) $order->id_currency, + ]); + + if (!$currency) { + throw CouldNotPresentOrderDetail::failedToFindCurrency(); + } + + /* @phpstan-ignore-next-line */ + $linkRewrite = $product->link_rewrite[$order->id_lang] ?? $product->link_rewrite; + + $image = $this->productRepository->getCombinationImageById((int) $recurringProduct->id_product_attribute, (int) $order->id_lang); + + if (!$image) { + $image = $this->productRepository->getCover((int) $recurringProduct->id_product); + } + + $result['name'] = $orderDetail->product_name; + $result['link'] = $this->context->getProductLink($product); + $result['img'] = $this->context->getImageLink($linkRewrite, (string) $image['id_image']); + $result['quantity'] = $orderDetail->product_quantity; + $result['unit_price'] = $this->context->formatPrice( + NumberUtility::toPrecision( + (float) $orderDetail->unit_price_tax_incl, + NumberUtility::DECIMAL_PRECISION + ), + $currency->iso_code + ); + $result['total'] = $this->context->formatPrice( + NumberUtility::toPrecision( + (float) $recurringOrder->total_tax_incl, + NumberUtility::DECIMAL_PRECISION + ), + $currency->iso_code + ); + + $result['status'] = $recurringOrder->status; + $result['start_date'] = $recurringOrder->date_add; + + if ($recurringOrder->status === SubscriptionStatus::STATUS_ACTIVE) { + $result['next_payment_date'] = $recurringOrder->next_payment; + } + + if ($recurringOrder->status === SubscriptionStatus::STATUS_CANCELED) { + $result['cancelled_date'] = $recurringOrder->cancelled_at; + } + + return $result; + } +} diff --git a/subscription/Presenter/OrderPresenter.php b/subscription/Presenter/OrderPresenter.php deleted file mode 100644 index c907b7e7c..000000000 --- a/subscription/Presenter/OrderPresenter.php +++ /dev/null @@ -1,35 +0,0 @@ -getCartProducts(); - - foreach ($orderProducts as $orderProduct) { - if ((int) $orderProduct['id_product_attribute'] !== $recurringOrderProductAttributeId) { - $order->total_paid_tax_excl -= (float) $orderProduct['total_price_tax_excl']; - - continue; - } - - $order->total_products = (float) $orderProduct['total_price_tax_excl']; - $order->total_products_wt = (float) $orderProduct['total_price_tax_incl']; - $order->total_paid_tax_incl = $recurringOrderTotalTaxIncl; - $order->total_paid = $recurringOrderTotalTaxIncl; - - break; - } - - $orderLazyArray = new RecurringOrderLazyArray($order); - - $orderLazyArray->setRecurringOrderProductAttributeId($recurringOrderProductAttributeId); - - return $orderLazyArray; - } -} diff --git a/subscription/Presenter/RecurringOrderLazyArray.php b/subscription/Presenter/RecurringOrderLazyArray.php deleted file mode 100644 index 7d91bf59f..000000000 --- a/subscription/Presenter/RecurringOrderLazyArray.php +++ /dev/null @@ -1,40 +0,0 @@ -recurringOrderProductAttributeId = $recurringOrderProductAttributeId; - } - - /** - * @arrayAccess - * - * @return array - */ - public function getProducts(): array - { - $subscriptionProduct = []; - - $orderProducts = parent::getProducts(); - - foreach ($orderProducts as $orderProduct) { - if ((int) $orderProduct['id_product_attribute'] !== $this->recurringOrderProductAttributeId) { - continue; - } - - $subscriptionProduct[] = $orderProduct; - - break; - } - - return $subscriptionProduct; - } -} diff --git a/subscription/Presenter/RecurringOrderPresenter.php b/subscription/Presenter/RecurringOrderPresenter.php index 3601cec40..0c73f39e2 100644 --- a/subscription/Presenter/RecurringOrderPresenter.php +++ b/subscription/Presenter/RecurringOrderPresenter.php @@ -9,8 +9,8 @@ use Mollie\Subscription\Api\MethodApi; use Mollie\Subscription\Repository\RecurringOrderRepositoryInterface; use Mollie\Subscription\Repository\RecurringOrdersProductRepositoryInterface; -use Mollie\Utility\NumberUtility; use Order; +use PrestaShop\PrestaShop\Adapter\Presenter\Order\OrderPresenter; use Product; class RecurringOrderPresenter @@ -23,23 +23,26 @@ class RecurringOrderPresenter private $language; /** @var MethodApi */ private $methodApi; - /** @var OrderPresenter */ - private $orderPresenter; + /** @var OrderDetailPresenter */ + private $orderDetailPresenter; public function __construct( RecurringOrderRepositoryInterface $recurringOrderRepository, RecurringOrdersProductRepositoryInterface $recurringOrdersProductRepository, Language $language, MethodApi $methodApi, - OrderPresenter $orderPresenter + OrderDetailPresenter $orderDetailPresenter ) { $this->recurringOrderRepository = $recurringOrderRepository; $this->recurringOrdersProductRepository = $recurringOrdersProductRepository; $this->language = $language; $this->methodApi = $methodApi; - $this->orderPresenter = $orderPresenter; + $this->orderDetailPresenter = $orderDetailPresenter; } + /** + * @throws \Throwable + */ public function present(int $recurringOrderId): array { $recurringOrder = $this->recurringOrderRepository->findOneBy(['id_mol_recurring_order' => $recurringOrderId]); @@ -60,13 +63,10 @@ public function present(int $recurringOrderId): array $recurringOrderData['recurring_order'] = $recurringOrder; $recurringOrderData['recurring_product'] = $recurringProduct; $recurringOrderData['product'] = $product; - $recurringOrderData['order'] = $this->orderPresenter->present( - $order, - (int) $recurringProduct->id_product_attribute, - NumberUtility::toPrecision( - (float) $recurringOrder->total_tax_incl, - NumberUtility::DECIMAL_PRECISION - ) + $recurringOrderData['order'] = (new OrderPresenter())->present($order); + $recurringOrderData['order_detail'] = $this->orderDetailPresenter->present( + $recurringOrder, + $recurringProduct ); $recurringOrderData['payment_methods'] = $this->methodApi->getMethodsForFirstPayment($this->language->getContextLanguage()->locale, $currency->iso_code); diff --git a/subscription/Provider/SubscriptionCarrierDeliveryPriceProvider.php b/subscription/Provider/SubscriptionCarrierDeliveryPriceProvider.php new file mode 100644 index 000000000..39dd93fbf --- /dev/null +++ b/subscription/Provider/SubscriptionCarrierDeliveryPriceProvider.php @@ -0,0 +1,124 @@ +configuration = $configuration; + $this->carrierRepository = $carrierRepository; + $this->addressRepository = $addressRepository; + $this->customerRepository = $customerRepository; + $this->cartRepository = $cartRepository; + $this->countryRepository = $countryRepository; + } + + /** + * @throws CouldNotProvideSubscriptionCarrierDeliveryPrice + */ + public function getPrice(int $addressDeliveryId, int $cartId, int $customerId, array $subscriptionProduct): float + { + $subscriptionCarrierId = (int) $this->configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID); + + /** @var \Carrier|null $carrier */ + $carrier = $this->carrierRepository->findOneBy([ + 'id_carrier' => $subscriptionCarrierId, + 'active' => 1, + 'deleted' => 0, + ]); + + if (!$carrier) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToFindSelectedCarrier(); + } + + /** @var \Cart|null $cart */ + $cart = $this->cartRepository->findOneBy([ + 'id_cart' => $cartId, + ]); + + if (!$cart) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToFindOrderCart(); + } + + /** @var \Customer|null $customer */ + $customer = $this->customerRepository->findOneBy([ + 'id_customer' => $customerId, + ]); + + if (!$customer) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToFindOrderCustomer(); + } + + $getAvailableOrderCarriers = $this->carrierRepository->getCarriersForOrder( + $this->addressRepository->getZoneById($addressDeliveryId), + $customer->getGroups(), + $cart + ); + + if (!in_array($subscriptionCarrierId, array_column($getAvailableOrderCarriers, 'id_carrier'), false)) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToApplySelectedCarrier(); + } + + /** @var \Address|bool $address */ + $address = $this->addressRepository->findOneBy([ + 'id_address' => $addressDeliveryId, + ]); + + if (!$address) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToFindOrderDeliveryAddress(); + } + + /** @var \Country|bool $country */ + $country = $this->countryRepository->findOneBy([ + 'id_country' => $address->id_country, + ]); + + if (!$country) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToFindOrderDeliveryCountry(); + } + + /** @var float|bool $deliveryPrice */ + $deliveryPrice = $cart->getPackageShippingCost( + $subscriptionCarrierId, + true, + $country, + [$subscriptionProduct], + $this->addressRepository->getZoneById($addressDeliveryId) + ); + + if (is_bool($deliveryPrice) && !$deliveryPrice) { + throw CouldNotProvideSubscriptionCarrierDeliveryPrice::failedToGetSelectedCarrierPrice(); + } + + return (float) $deliveryPrice; + } +} diff --git a/subscription/Repository/OrderDetailRepository.php b/subscription/Repository/OrderDetailRepository.php new file mode 100644 index 000000000..5afa02e64 --- /dev/null +++ b/subscription/Repository/OrderDetailRepository.php @@ -0,0 +1,11 @@ +addZone($zone['id_zone']); $prices[] = [ @@ -50,6 +54,10 @@ public static function create(array $data = []) // enable all zones $carrier->addDeliveryPrice($prices); + $allGroups = \Group::getGroups(\Context::getContext()->language->id); + + $carrier->setGroups(array_column($allGroups, 'id_group')); + return $carrier; } } diff --git a/tests/Integration/Factory/ProductFactory.php b/tests/Integration/Factory/ProductFactory.php new file mode 100644 index 000000000..e44c0c4f9 --- /dev/null +++ b/tests/Integration/Factory/ProductFactory.php @@ -0,0 +1,26 @@ +id_tax_rules_group = $data['id_tax_rules_group'] ?? 1; + $product->name = $data['name'] ?? 'test-name'; + $product->description_short = $data['description_short'] ?? 'test-description_short'; + $product->price = $data['price'] ?? 0; + $product->link_rewrite = \Tools::link_rewrite($product->name); + + $product->save(); + + \StockAvailable::setQuantity( + (int) $product->id, + 0, + isset($data['quantity']) ? (int) $data['quantity'] : 1 + ); + + return $product; + } +} diff --git a/tests/Integration/Subscription/Action/CreateSpecificPriceActionTest.php b/tests/Integration/Subscription/Action/CreateSpecificPriceActionTest.php new file mode 100644 index 000000000..c27213362 --- /dev/null +++ b/tests/Integration/Subscription/Action/CreateSpecificPriceActionTest.php @@ -0,0 +1,67 @@ +assertDatabaseHasNot(\SpecificPrice::class, [ + 'id_product' => (int) $product->id, + 'id_product_attribute' => (int) \Product::getDefaultAttribute($product->id), + 'price' => 10.00, + 'id_customer' => 1, + 'id_shop' => 1, + 'id_currency' => 1, + 'id_shop_group' => 1, + 'id_country' => 0, + 'id_group' => 0, + 'from_quantity' => 0, + 'reduction' => 0, + 'reduction_type' => 'amount', + 'from' => '0000-00-00 00:00:00', + 'to' => '0000-00-00 00:00:00', + ]); + + /** @var CreateSpecificPriceAction $createSpecificPrice */ + $createSpecificPrice = $this->getService(CreateSpecificPriceAction::class); + + $result = $createSpecificPrice->run(CreateSpecificPriceData::create( + (int) $product->id, + (int) \Product::getDefaultAttribute($product->id), + 10.00, + 1, + 1, + 1, + 1 + )); + + $this->assertDatabaseHas(\SpecificPrice::class, [ + 'id_product' => (int) $product->id, + 'id_product_attribute' => (int) \Product::getDefaultAttribute($product->id), + 'price' => 10.00, + 'id_customer' => 1, + 'id_shop' => 1, + 'id_currency' => 1, + 'id_shop_group' => 1, + 'id_country' => 0, + 'id_group' => 0, + 'from_quantity' => 0, + 'reduction' => 0, + 'reduction_type' => 'amount', + 'from' => '0000-00-00 00:00:00', + 'to' => '0000-00-00 00:00:00', + ]); + + $product->delete(); + $result->delete(); + } +} diff --git a/tests/Integration/Subscription/Presenter/OrderPresenterTest.php b/tests/Integration/Subscription/Presenter/OrderPresenterTest.php deleted file mode 100644 index 1b3ad9a7a..000000000 --- a/tests/Integration/Subscription/Presenter/OrderPresenterTest.php +++ /dev/null @@ -1,75 +0,0 @@ - 1, - 'id_product_attribute' => 1, - 'total_price_tax_excl' => 10.00, - 'product_price' => 10.00, - 'total_price' => 10.00, - 'total_price_tax_incl' => 12.10, - 'product_price_wt' => 12.10, - 'total_wt' => 12.10, - 'product_name' => 'test-product-1', - 'product_quantity' => 1, - 'product_id' => 1, - 'id_customization' => 1, - ], - [ - 'product_attribute_id' => 2, - 'id_product_attribute' => 2, - 'total_price_tax_excl' => 100.00, - 'product_price' => 100.00, - 'total_price' => 100.00, - 'total_price_tax_incl' => 121.00, - 'product_price_wt' => 121.00, - 'total_wt' => 121.00, - 'product_name' => 'test-product-2', - 'product_quantity' => 2, - 'product_id' => 2, - 'id_customization' => 1, - ], - [ - 'product_attribute_id' => 3, - 'id_product_attribute' => 3, - 'total_price_tax_excl' => 1000.00, - 'product_price' => 1000.00, - 'total_price' => 1000.00, - 'total_price_tax_incl' => 1210.00, - 'product_price_wt' => 1210.00, - 'total_wt' => 1210.00, - 'product_name' => 'test-product-3', - 'product_quantity' => 3, - 'product_id' => 3, - 'id_customization' => 1, - ], - ]; - - $order = $this->createMock(\Order::class); - $order->total_paid_tax_excl = 1500; - $order->id_currency = 1; - $order->method('getCartProducts')->willReturn($products); - $order->method('getProducts')->willReturn($products); - - /** @var OrderPresenter $orderPresenter */ - $orderPresenter = $this->getService(OrderPresenter::class); - - $result = $orderPresenter->present( - $order, - 3, - 1300 - ); - - $this->assertCount(1, $result->getProducts()); - $this->assertEquals(3, $result->getProducts()[0]['id_product_attribute']); - } -} diff --git a/tests/Integration/Subscription/Provider/SubscriptionCarrierDeliveryPriceProviderTest.php b/tests/Integration/Subscription/Provider/SubscriptionCarrierDeliveryPriceProviderTest.php new file mode 100644 index 000000000..1a5a890dc --- /dev/null +++ b/tests/Integration/Subscription/Provider/SubscriptionCarrierDeliveryPriceProviderTest.php @@ -0,0 +1,159 @@ +getService(ConfigurationAdapter::class); + + $this->subscriptionOrderCarrierId = $configuration->get(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID); + + parent::setUp(); + } + + public function tearDown(): void + { + /** @var ConfigurationAdapter $configuration */ + $configuration = $this->getService(ConfigurationAdapter::class); + + $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $this->subscriptionOrderCarrierId); + + parent::tearDown(); + } + + public function testItSuccessfullyProvidesCarrierDeliveryPrice(): void + { + $address = AddressFactory::create(); + $carrier = CarrierFactory::create([ + 'price' => 999.00, + ]); + $cart = CartFactory::create([ + 'id_carrier' => $carrier->id, + ]); + + /** @var ConfigurationAdapter $configuration */ + $configuration = $this->getService(ConfigurationAdapter::class); + + $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id); + + $targetProduct = ProductFactory::create([ + 'quantity' => 10, + ]); + $product1 = ProductFactory::create([ + 'quantity' => 10, + ]); + $product2 = ProductFactory::create([ + 'quantity' => 10, + ]); + + $cart->updateQty(2, $targetProduct->id); + + $targetProductArray = $cart->getProducts()[0]; + + $cart->updateQty(2, $product1->id); + $cart->updateQty(3, $product2->id); + + /** @var SubscriptionCarrierDeliveryPriceProvider $subscriptionCarrierDeliveryPriceProvider */ + $subscriptionCarrierDeliveryPriceProvider = $this->getService(SubscriptionCarrierDeliveryPriceProvider::class); + + $result = $subscriptionCarrierDeliveryPriceProvider->getPrice( + $address->id, + $cart->id, + $cart->id_customer, + $targetProductArray + ); + + $this->assertEquals(999.00, $result); + + $this->removeFactories([ + $carrier, + $address, + $cart, + $targetProduct, + $product1, + $product2, + ]); + } + + public function testItUnsuccessfullyProvidesCarrierDeliveryPriceCarrierIsOutOfZone(): void + { + $address = AddressFactory::create(); + $carrier = CarrierFactory::create([ + 'price' => 999.00, + 'id_zones_to_delete' => [ + $address::getZoneById($address->id), + ], + ]); + $cart = CartFactory::create([ + 'id_carrier' => $carrier->id, + ]); + + /** @var ConfigurationAdapter $configuration */ + $configuration = $this->getService(ConfigurationAdapter::class); + + $configuration->updateValue(Config::MOLLIE_SUBSCRIPTION_ORDER_CARRIER_ID, $carrier->id); + + $targetProduct = ProductFactory::create([ + 'quantity' => 10, + ]); + $product1 = ProductFactory::create([ + 'quantity' => 10, + ]); + $product2 = ProductFactory::create([ + 'quantity' => 10, + ]); + + $cart->updateQty(2, $targetProduct->id); + + $targetProductArray = $cart->getProducts()[0]; + + $cart->updateQty(2, $product1->id); + $cart->updateQty(3, $product2->id); + + $this->expectException(CouldNotProvideSubscriptionCarrierDeliveryPrice::class); + $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_APPLY_SELECTED_CARRIER); + + /** @var SubscriptionCarrierDeliveryPriceProvider $subscriptionCarrierDeliveryPriceProvider */ + $subscriptionCarrierDeliveryPriceProvider = $this->getService(SubscriptionCarrierDeliveryPriceProvider::class); + + $subscriptionCarrierDeliveryPriceProvider->getPrice( + $address->id, + $cart->id, + $cart->id_customer, + $targetProductArray + ); + + $this->removeFactories([ + $carrier, + $address, + $cart, + $targetProduct, + $product1, + $product2, + ]); + } + + /** + * @param \ObjectModel[] $objects + */ + private function removeFactories(array $objects): void + { + foreach ($objects as $object) { + $object->delete(); + } + } +} diff --git a/tests/Unit/Subscription/Presenter/OrderDetailPresenterTest.php b/tests/Unit/Subscription/Presenter/OrderDetailPresenterTest.php new file mode 100644 index 000000000..62663ba1a --- /dev/null +++ b/tests/Unit/Subscription/Presenter/OrderDetailPresenterTest.php @@ -0,0 +1,283 @@ +orderDetailRepository = $this->createMock(OrderDetailRepositoryInterface::class); + $this->context = $this->createMock(Context::class); + $this->orderRepository = $this->createMock(OrderRepositoryInterface::class); + $this->productRepository = $this->createMock(ProductRepositoryInterface::class); + $this->currencyRepository = $this->createMock(CurrencyRepositoryInterface::class); + + parent::setUp(); + } + + public function testItSuccessfullyPresentsOrderDetail(): void + { + /** @var \Order $order */ + $order = $this->createMock(\Order::class); + $order->id_lang = 1; + + /** @var \OrderDetail $orderDetail */ + $orderDetail = $this->createMock(\OrderDetail::class); + $orderDetail->unit_price_tax_incl = 1.11; + + /** @var \Product $product */ + $product = $this->createMock(\Product::class); + + /** @var \Currency $currency */ + $currency = $this->createMock(\Currency::class); + $currency->iso_code = 'EUR'; + + /** @var \MolRecurringOrder $recurringOrder */ + $recurringOrder = $this->createMock(\MolRecurringOrder::class); + $recurringOrder->total_tax_incl = 1.11; + $recurringOrder->status = SubscriptionStatus::STATUS_ACTIVE; + + /** @var \MolRecurringOrdersProduct $recurringProduct */ + $recurringProduct = $this->createMock(\MolRecurringOrdersProduct::class); + $recurringProduct->id_product = 1; + $recurringProduct->id_product_attribute = 1; + + $this->orderRepository->expects($this->once())->method('findOneBy')->willReturn($order); + $this->orderDetailRepository->expects($this->once())->method('findOneBy')->willReturn($orderDetail); + $this->productRepository->expects($this->once())->method('findOneBy')->willReturn($product); + $this->productRepository->expects($this->once())->method('getCombinationImageById')->willReturn(['id_image' => 1]); + $this->currencyRepository->expects($this->once())->method('findOneBy')->willReturn($currency); + + $this->context->expects($this->once())->method('getProductLink')->willReturn('test-link'); + $this->context->expects($this->once())->method('getImageLink')->willReturn('test-link'); + $this->context->expects($this->exactly(2))->method('formatPrice')->willReturn('123.33$'); + + $orderDetailPresenter = new OrderDetailPresenter( + $this->orderDetailRepository, + $this->context, + $this->orderRepository, + $this->productRepository, + $this->currencyRepository + ); + + $result = $orderDetailPresenter->present($recurringOrder, $recurringProduct); + + $this->assertArrayHasKey('next_payment_date', $result); + $this->assertArrayNotHasKey('cancelled_date', $result); + } + + public function testItSuccessfullyPresentsCancelledOrderDetailWithDefaultProductImage(): void + { + /** @var \Order $order */ + $order = $this->createMock(\Order::class); + $order->id_lang = 1; + + /** @var \OrderDetail $orderDetail */ + $orderDetail = $this->createMock(\OrderDetail::class); + $orderDetail->unit_price_tax_incl = 1.11; + + /** @var \Product $product */ + $product = $this->createMock(\Product::class); + + /** @var \Currency $currency */ + $currency = $this->createMock(\Currency::class); + $currency->iso_code = 'EUR'; + + /** @var \MolRecurringOrder $recurringOrder */ + $recurringOrder = $this->createMock(\MolRecurringOrder::class); + $recurringOrder->total_tax_incl = 1.11; + $recurringOrder->status = SubscriptionStatus::STATUS_CANCELED; + + /** @var \MolRecurringOrdersProduct $recurringProduct */ + $recurringProduct = $this->createMock(\MolRecurringOrdersProduct::class); + $recurringProduct->id_product = 1; + $recurringProduct->id_product_attribute = 1; + + $this->orderRepository->expects($this->once())->method('findOneBy')->willReturn($order); + $this->orderDetailRepository->expects($this->once())->method('findOneBy')->willReturn($orderDetail); + $this->productRepository->expects($this->once())->method('findOneBy')->willReturn($product); + $this->productRepository->expects($this->once())->method('getCombinationImageById')->willReturn(null); + $this->productRepository->expects($this->once())->method('getCover')->willReturn(['id_image' => 1]); + $this->currencyRepository->expects($this->once())->method('findOneBy')->willReturn($currency); + + $this->context->expects($this->once())->method('getProductLink')->willReturn('test-link'); + $this->context->expects($this->once())->method('getImageLink')->willReturn('test-link'); + $this->context->expects($this->exactly(2))->method('formatPrice')->willReturn('123.33$'); + + $orderDetailPresenter = new OrderDetailPresenter( + $this->orderDetailRepository, + $this->context, + $this->orderRepository, + $this->productRepository, + $this->currencyRepository + ); + + $result = $orderDetailPresenter->present($recurringOrder, $recurringProduct); + + $this->assertArrayNotHasKey('next_payment_date', $result); + $this->assertArrayHasKey('cancelled_date', $result); + } + + public function testItUnsuccessfullyPresentsOrderDetailMissingOrder(): void + { + /** @var \MolRecurringOrder $recurringOrder */ + $recurringOrder = $this->createMock(\MolRecurringOrder::class); + $recurringOrder->total_tax_incl = 1.11; + $recurringOrder->status = SubscriptionStatus::STATUS_CANCELED; + + /** @var \MolRecurringOrdersProduct $recurringProduct */ + $recurringProduct = $this->createMock(\MolRecurringOrdersProduct::class); + $recurringProduct->id_product = 1; + $recurringProduct->id_product_attribute = 1; + + $this->orderRepository->expects($this->once())->method('findOneBy')->willReturn(null); + + $orderDetailPresenter = new OrderDetailPresenter( + $this->orderDetailRepository, + $this->context, + $this->orderRepository, + $this->productRepository, + $this->currencyRepository + ); + + $this->expectException(CouldNotPresentOrderDetail::class); + $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_FIND_ORDER); + + $orderDetailPresenter->present($recurringOrder, $recurringProduct); + } + + public function testItUnsuccessfullyPresentsOrderDetailMissingOrderDetail(): void + { + /** @var \Order $order */ + $order = $this->createMock(\Order::class); + $order->id_lang = 1; + + /** @var \MolRecurringOrder $recurringOrder */ + $recurringOrder = $this->createMock(\MolRecurringOrder::class); + $recurringOrder->total_tax_incl = 1.11; + $recurringOrder->status = SubscriptionStatus::STATUS_CANCELED; + + /** @var \MolRecurringOrdersProduct $recurringProduct */ + $recurringProduct = $this->createMock(\MolRecurringOrdersProduct::class); + $recurringProduct->id_product = 1; + $recurringProduct->id_product_attribute = 1; + + $this->orderRepository->expects($this->once())->method('findOneBy')->willReturn($order); + $this->orderDetailRepository->expects($this->once())->method('findOneBy')->willReturn(null); + + $orderDetailPresenter = new OrderDetailPresenter( + $this->orderDetailRepository, + $this->context, + $this->orderRepository, + $this->productRepository, + $this->currencyRepository + ); + + $this->expectException(CouldNotPresentOrderDetail::class); + $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_FIND_ORDER_DETAIL); + + $orderDetailPresenter->present($recurringOrder, $recurringProduct); + } + + public function testItUnsuccessfullyPresentsOrderDetailMissingProduct(): void + { + /** @var \Order $order */ + $order = $this->createMock(\Order::class); + $order->id_lang = 1; + + /** @var \OrderDetail $orderDetail */ + $orderDetail = $this->createMock(\OrderDetail::class); + $orderDetail->unit_price_tax_incl = 1.11; + + /** @var \MolRecurringOrder $recurringOrder */ + $recurringOrder = $this->createMock(\MolRecurringOrder::class); + $recurringOrder->total_tax_incl = 1.11; + $recurringOrder->status = SubscriptionStatus::STATUS_CANCELED; + + /** @var \MolRecurringOrdersProduct $recurringProduct */ + $recurringProduct = $this->createMock(\MolRecurringOrdersProduct::class); + $recurringProduct->id_product = 1; + $recurringProduct->id_product_attribute = 1; + + $this->orderRepository->expects($this->once())->method('findOneBy')->willReturn($order); + $this->orderDetailRepository->expects($this->once())->method('findOneBy')->willReturn($orderDetail); + $this->productRepository->expects($this->once())->method('findOneBy')->willReturn(null); + + $orderDetailPresenter = new OrderDetailPresenter( + $this->orderDetailRepository, + $this->context, + $this->orderRepository, + $this->productRepository, + $this->currencyRepository + ); + + $this->expectException(CouldNotPresentOrderDetail::class); + $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_FIND_PRODUCT); + + $orderDetailPresenter->present($recurringOrder, $recurringProduct); + } + + public function testItUnsuccessfullyPresentsOrderDetailMissingCurrency(): void + { + /** @var \Order $order */ + $order = $this->createMock(\Order::class); + $order->id_lang = 1; + + /** @var \OrderDetail $orderDetail */ + $orderDetail = $this->createMock(\OrderDetail::class); + $orderDetail->unit_price_tax_incl = 1.11; + + /** @var \Product $product */ + $product = $this->createMock(\Product::class); + + /** @var \MolRecurringOrder $recurringOrder */ + $recurringOrder = $this->createMock(\MolRecurringOrder::class); + $recurringOrder->total_tax_incl = 1.11; + $recurringOrder->status = SubscriptionStatus::STATUS_CANCELED; + + /** @var \MolRecurringOrdersProduct $recurringProduct */ + $recurringProduct = $this->createMock(\MolRecurringOrdersProduct::class); + $recurringProduct->id_product = 1; + $recurringProduct->id_product_attribute = 1; + + $this->orderRepository->expects($this->once())->method('findOneBy')->willReturn($order); + $this->orderDetailRepository->expects($this->once())->method('findOneBy')->willReturn($orderDetail); + $this->productRepository->expects($this->once())->method('findOneBy')->willReturn($product); + $this->currencyRepository->expects($this->once())->method('findOneBy')->willReturn(null); + + $orderDetailPresenter = new OrderDetailPresenter( + $this->orderDetailRepository, + $this->context, + $this->orderRepository, + $this->productRepository, + $this->currencyRepository + ); + + $this->expectException(CouldNotPresentOrderDetail::class); + $this->expectExceptionCode(ExceptionCode::ORDER_FAILED_TO_FIND_CURRENCY); + + $orderDetailPresenter->present($recurringOrder, $recurringProduct); + } +} diff --git a/views/css/front/subscription/customer_order_detail.css b/views/css/front/subscription/customer_order_detail.css index 594d30507..dbcfc504e 100644 --- a/views/css/front/subscription/customer_order_detail.css +++ b/views/css/front/subscription/customer_order_detail.css @@ -8,3 +8,10 @@ .addresses { margin: 0 -.9375rem } + +@media only screen and (max-width: 991px) { + .recurring-method-form .product-info .product-img { + text-align: center; + margin-bottom: 20px; + } +} diff --git a/views/templates/admin/Subscription/subscriptions-faq.html.twig b/views/templates/admin/Subscription/subscriptions-faq.html.twig index 3e39f4538..58d78f091 100644 --- a/views/templates/admin/Subscription/subscriptions-faq.html.twig +++ b/views/templates/admin/Subscription/subscriptions-faq.html.twig @@ -32,11 +32,11 @@

- info_outline {{ subscriptionCreationTittle }} + info_outline {{ subscriptionCreationTittle|escape }}

-

{{subscriptionCreation}}

+

{{ subscriptionCreation|escape }}

@@ -47,11 +47,11 @@

- info_outline {{ importantInformationTittle }} + info_outline {{ importantInformationTittle|escape }}

-

{{importantInformation}}

+

{{ importantInformation|escape }}

@@ -62,13 +62,14 @@

- info_outline {{ cartRuleTitle }} + info_outline {{ carrierInformationTitle|escape }}

-

{{cartRule}}

-

{{cartRule2}}

-

{{cartRule3}}

+

{{ carrierInformation1|escape }}

+

{{ carrierInformation2|escape }}

+

{{ carrierInformation3|escape }}

+

{{ carrierInformation4|escape }}

@@ -79,13 +80,43 @@

- info_outline {{ subscriptionOrderLogicTitle }} + info_outline {{ cartRuleTitle|escape }}

-

{{recurringOrderCreation}}

-

{{recurringOrderPrice}}

-

{{recurringOrderAPIChanges}}

+

{{ cartRule1|escape }}

+
+
+
+
+
+ +
+
+
+

+ info_outline {{ giftWrappingTitle|escape }} +

+
+
+

{{ giftWrapping1|escape }}

+
+
+
+
+
+ +
+
+
+

+ info_outline {{ subscriptionOrderLogicTitle|escape }} +

+
+
+

{{ recurringOrderCreation|escape }}

+

{{ recurringOrderPrice|escape }}

+

{{ recurringOrderAPIChanges|escape }}

diff --git a/views/templates/front/subscription/customerRecurringOrderDetail.tpl b/views/templates/front/subscription/customerRecurringOrderDetail.tpl index dc9dffec8..64a6745c9 100644 --- a/views/templates/front/subscription/customerRecurringOrderDetail.tpl +++ b/views/templates/front/subscription/customerRecurringOrderDetail.tpl @@ -67,9 +67,8 @@
{/block} - {block name='order_detail'} - {include file='customer/_partials/order-detail-no-return.tpl' order=$recurringOrderData.order} - {/block} + {include file='module:mollie/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl' order=$recurringOrderData.order_detail} + {if $recurringOrderData.recurring_order->status !== 'canceled'} {block name='recurring_method'} diff --git a/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl b/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl new file mode 100644 index 000000000..73a902eb7 --- /dev/null +++ b/views/templates/front/subscription/customerRecurringOrderDetailProduct.tpl @@ -0,0 +1,31 @@ +
+
+
+
+
+ +
+
+

{l s='Product:' mod='mollie'} {$order.name|escape:'htmlall':'UTF-8'}

 +

{l s='Quantity:' mod='mollie'} {$order.quantity|escape:'htmlall':'UTF-8'}

+

{l s='Unit price:' mod='mollie'} {$order.unit_price|escape:'htmlall':'UTF-8'}

+
+
+
+
+

{l s='Total:' mod='mollie'} {$order.total|escape:'htmlall':'UTF-8'}

+

{l s='Subscription status:' mod='mollie'} {$order.status|escape:'htmlall':'UTF-8'}

+

{l s='Subscription start date:' mod='mollie'} {$order.start_date|escape:'htmlall':'UTF-8'}

+ + {if isset($order.next_payment_date)} +

{l s='Next payment date:' mod='mollie'} {$order.next_payment_date|escape:'htmlall':'UTF-8'}

+ {/if} + + {if isset($order.cancelled_date)} +

{l s='Cancelled date:' mod='mollie'} {$order.cancelled_date|escape:'htmlall':'UTF-8'}

+ {/if} +
+
+
From 2e2b0870edeb8efba60146e68ef55bd87fe9e0d1 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 12:45:59 +0300 Subject: [PATCH 103/109] url updates --- .docker/.htaccess1785 | 44 +++++++-------- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.1785.yml | 2 +- docker-compose.e2e.1785.yml | 2 +- tests/seed/database/prestashop_1785_2.sql | 68 +++++++++++------------ 5 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.docker/.htaccess1785 b/.docker/.htaccess1785 index 93dea1fbe..ff2028dfb 100755 --- a/.docker/.htaccess1785 +++ b/.docker/.htaccess1785 @@ -10,60 +10,60 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop1785debug.ngrok.io +#Domain: demoshop1785.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] -#Domain: demoshop1785debug.ngrok.io +#Domain: demoshop1785.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^SHOP2$ /SHOP2/ [L,R] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^SHOP2/(.*) /$1 [L] # Images -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop1785debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop1785.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 83823245f..7c4f62413 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -20,7 +20,7 @@ jobs: subdomain: 'demoshop1785debug' port: '8002' yml: 'docker-compose.1785.yml' - url: 'https://demoshop1785debug.ngrok.io' + url: 'https://demoshop1785.ngrok.io' test_spec: '**/cypress/e2e/ps1785/**' TestRailID: R4954 - prestashop: 'PS8' diff --git a/docker-compose.1785.yml b/docker-compose.1785.yml index ffa2f1d5e..39c315233 100755 --- a/docker-compose.1785.yml +++ b/docker-compose.1785.yml @@ -35,7 +35,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop1785debug.ngrok.io:8002 + PS_DOMAIN: demoshop1785.ngrok.io:8002 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/docker-compose.e2e.1785.yml b/docker-compose.e2e.1785.yml index 08a4fc72c..360dc63d7 100644 --- a/docker-compose.e2e.1785.yml +++ b/docker-compose.e2e.1785.yml @@ -6,7 +6,7 @@ services: image: "cypress/included:9.5.2" environment: # pass base url to test pointing at the web application - - CYPRESS_baseUrl=https://demoshop1785debug.ngrok.io + - CYPRESS_baseUrl=https://demoshop1785.ngrok.io - CYPRESS_EVERY_NTH_FRAME=1 entrypoint: cypress run --spec "**/cypress/integration/PS1785/**" command: /bin/sh -c "--config npx browserslist@latest --update-db" diff --git a/tests/seed/database/prestashop_1785_2.sql b/tests/seed/database/prestashop_1785_2.sql index 0133ed802..6fda4e98c 100755 --- a/tests/seed/database/prestashop_1785_2.sql +++ b/tests/seed/database/prestashop_1785_2.sql @@ -3971,8 +3971,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '2022-03-23 08:34:58'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1785debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1785debug.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop1785.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop1785.ngrok.io', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PS1785', '0000-00-00 00:00:00', '2022-03-18 13:44:55'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@demo.com', '0000-00-00 00:00:00', '2022-03-18 13:44:56'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -4652,36 +4652,36 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 5, 'https://demoshop1785debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1785debug.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), -(2, 8, 'https://demoshop1785debug.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), -(3, 43, 'https://demoshop1785debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), -(4, 43, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), -(5, 63, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), -(6, 65, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), -(7, 67, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), -(8, 69, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), -(9, 74, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), -(10, 84, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), -(11, 87, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), -(12, 89, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), -(13, 43, 'https://demoshop1785debug.ngrok.io/shop2/gb/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), -(14, 105, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), -(15, 117, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), -(16, 119, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), -(17, 121, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), -(18, 123, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), -(19, 125, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), -(20, 131, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), -(21, 133, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), -(22, 135, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), -(23, 97, 'https://demoshop1785debug.ngrok.io/shop2/gb/', 'demoshop1785debug.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), -(24, 145, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), -(25, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), -(26, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), -(27, 164, 'https://demoshop1785debug.ngrok.io/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), -(28, 164, 'https://demoshop1785debug.ngrok.io/__/', 'demoshop1785debug.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), -(29, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), -(30, 164, 'https://www.mollie.com/', 'demoshop1785debug.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); +(1, 5, 'https://demoshop1785.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1785.ngrok.io/shop2/gb/', '', '2022-03-22 08:36:25'), +(2, 8, 'https://demoshop1785.ngrok.io/admin1/index.php?controller=AdminDashboard&token=c7e722677d24cced4f4c4dcc1d2ae476', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-22 10:16:01'), +(3, 43, 'https://demoshop1785.ngrok.io/admin1/index.php/improve/payment/preferences?_token=tZ574aBpKsfXGfPK_ADZztbV5fsBScNAsu1EB4V5Org', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-22 12:45:44'), +(4, 43, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/module/mollie/return?cart_id=32&utm_nooverride=1&rand=1647953895&key=c73350cb18a0408243e4723d1918224e&customerId=3&order_number=mol_326239c7e7921c51647953895', '', '2022-03-22 12:58:27'), +(5, 63, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 07:39:50'), +(6, 65, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:05'), +(7, 67, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 07:41:55'), +(8, 69, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 07:53:47'), +(9, 74, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 08:00:30'), +(10, 84, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 08:10:05'), +(11, 87, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 08:11:11'), +(12, 89, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 08:14:28'), +(13, 43, 'https://demoshop1785.ngrok.io/shop2/gb/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 08:25:24'), +(14, 105, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 08:38:30'), +(15, 117, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 15:52:55'), +(16, 119, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 15:53:53'), +(17, 121, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 15:54:46'), +(18, 123, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 15:55:35'), +(19, 125, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 15:56:35'), +(20, 131, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/', '', '2022-03-23 15:58:26'), +(21, 133, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 15:59:24'), +(22, 135, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 16:00:20'), +(23, 97, 'https://demoshop1785.ngrok.io/shop2/gb/', 'demoshop1785.ngrok.io/SHOP2/gb/', '', '2022-03-23 16:11:23'), +(24, 145, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/en/', '', '2022-03-23 16:15:12'), +(25, 164, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/module/mollie/return?cart_id=100&utm_nooverride=1&rand=1680689211&key=f2ae1ef7d3756806840ed6182dca7133&customerId=3&order_number=mol_100642d483bd9e8c1680689211', '', '2023-04-05 11:07:01'), +(26, 164, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/module/mollie/return?cart_id=101&utm_nooverride=1&rand=1680689270&key=73662c516c54101515251463bd18783e&customerId=3&order_number=mol_101642d4876253f91680689270', '', '2023-04-05 11:07:58'), +(27, 164, 'https://demoshop1785.ngrok.io/', 'demoshop1785.ngrok.io/SHOP2/de/module/mollie/return?cart_id=102&utm_nooverride=1&rand=1680689316&key=8b78539acc38d6297467adad697b2e31&customerId=3&order_number=mol_102642d48a4ac4791680689316', '', '2023-04-05 11:08:44'), +(28, 164, 'https://demoshop1785.ngrok.io/__/', 'demoshop1785.ngrok.io/SHOP2/de/bestellbestatigung?id_cart=102&id_module=80&id_order=30&key=c87361b275fdc73622d49fd9819156e4', '', '2023-04-05 11:08:46'), +(29, 164, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/module/mollie/return?cart_id=103&utm_nooverride=1&rand=1680689362&key=19064c071554f3667f69547cd940945f&customerId=3&order_number=mol_103642d48d2707311680689362', '', '2023-04-05 11:09:27'), +(30, 164, 'https://www.mollie.com/', 'demoshop1785.ngrok.io/SHOP2/de/module/mollie/return?cart_id=104&utm_nooverride=1&rand=1680689401&key=2626e82aa1ad127346b09a695618b678&customerId=3&order_number=mol_104642d48f9494bf1680689401', '', '2023-04-05 11:10:06'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -24103,8 +24103,8 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop1785debug.ngrok.io', 'demoshop1785debug.ngrok.io', '/', '', 1, 1), -(3, 3, 'demoshop1785debug.ngrok.io', 'demoshop1785debug.ngrok.io', '/', 'SHOP2/', 1, 1); +(1, 1, 'demoshop1785.ngrok.io', 'demoshop1785.ngrok.io', '/', '', 1, 1), +(3, 3, 'demoshop1785.ngrok.io', 'demoshop1785.ngrok.io', '/', 'SHOP2/', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From b67102c0fe93e59fff7df7f29ce37556759dd702 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 13:46:49 +0300 Subject: [PATCH 104/109] refactoring PS17 tests --- ...03_mollie.ps1785.PaymentTestsOrdersAPI.js} | 463 ---------------- ...s1785.EnablingPaymentsPaymentsAPI.specs.js | 37 ++ ...5_mollie.ps1785.PaymentTestsPaymentsAPI.js | 518 ++++++++++++++++++ ...s.js => 06_mollie.ps1785.Subscriptions.js} | 0 4 files changed, 555 insertions(+), 463 deletions(-) rename cypress/e2e/ps1785/{03_mollie.ps1785.PaymentTests.js => 03_mollie.ps1785.PaymentTestsOrdersAPI.js} (58%) create mode 100755 cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js create mode 100755 cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js rename cypress/e2e/ps1785/{04_mollie.ps1785.Subscriptions.js => 06_mollie.ps1785.Subscriptions.js} (100%) diff --git a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js similarity index 58% rename from cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js rename to cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js index c96b7b7d4..fc21c6dba 100755 --- a/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTests.js +++ b/cypress/e2e/ps1785/03_mollie.ps1785.PaymentTestsOrdersAPI.js @@ -690,467 +690,4 @@ it.skip('40 Gift Card Checkouting [Orders API]', () => { it.skip('41 Gift Card Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.ConfPaymentsAPI1784() - cy.get('[type="submit"]').first().click({force:true}) - cy.get('[class="alert alert-success"]').should('be.visible') -}) -it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') -}) -it('C339379: 44 Bancontact Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Bancontact').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}) -it('C339381: 46 iDEAL Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - cy.get('a').click() - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('iDEAL').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('.payment-method-list > :nth-child(1)').click() - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}) -it('C339383: 48 Credit Card Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - cy.get('a').click() - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Card').click({force:true}) - //Credit card inputing - cy.CreditCardFillingIframe() - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}) -it('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { - cy.clearCookies() - //Payments API item - cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) - cy.get('[class="h3 product-title"]').eq(0).click() - cy.get('.add > .btn').click() - cy.get('.cart-content-btn > .btn-primary').click() - cy.get('.text-sm-center > .btn').click() - // Creating random user all the time - cy.get(':nth-child(1) > .custom-radio > input').check() - cy.get('#field-firstname').type('AUT',{delay:0}) - cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) - const uuid = () => Cypress._.random(0, 1e6) - const id = uuid() - const testname = `testemail${id}@testing.com` - cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) - cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() - cy.get('#customer-form > .form-footer > .continue').click() - cy.reload() - cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') - cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') - cy.get('#field-address2').type('ADDR2',{delay:0}).as('address2') - cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') - cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') - cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') - cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') - cy.get('.form-footer > .continue').click() - cy.get('#js-delivery > .continue').click() - cy.contains('Card').click({force:true}) - //Credit card inputing - cy.CreditCardFillingIframe() - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { - cy.clearCookies() - //Payments API item - cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) - cy.get('[class="h3 product-title"]').eq(0).click() - cy.get('.add > .btn').click() - cy.get('.cart-content-btn > .btn-primary').click() - cy.get('.text-sm-center > .btn').click() - // Creating random user all the time - cy.get(':nth-child(1) > .custom-radio > input').check() - cy.get('#field-firstname').type('AUT',{delay:0}) - cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) - const uuid = () => Cypress._.random(0, 1e6) - const id = uuid() - const testname = `testemail${id}@testing.com` - cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) - cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() - cy.get('#customer-form > .form-footer > .continue').click() - cy.reload() - cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') - cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') - cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') - cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') - cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') - cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') - cy.get('.form-footer > .continue').click() - cy.get('#js-delivery > .continue').click() - cy.contains('Card').click({force:true}) - //Credit card inputing - cy.NotSecureCreditCardFillingIframe() - cy.get('.condition-label > .js-terms').click({force:true}) - cy.get('.ps-shown-by-js > .btn').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339387: 52 Paypal Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('PayPal').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { - cy.visit('/admin1/index.php?controller=AdminOrders') - cy.get(':nth-child(1) > .column-payment').click() - //Check partial refunding on Payments API - seems that Paypal has only Partial Refunding without Refund button - cy.get('.form-inline > :nth-child(2) > .input-group > .form-control').type('1.51',{delay:0}) - cy.get(':nth-child(2) > .input-group > .input-group-btn > .btn').click() - cy.get('.swal-modal').should('exist') - cy.get(':nth-child(2) > .swal-button').click() - cy.get('#mollie_order > :nth-child(1) > .alert').contains('Refund was made successfully!') -}); -it('C339389: 54 SOFORT Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('SOFORT').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { - cy.visit('/admin1/index.php?controller=AdminOrders') - cy.get(':nth-child(1) > .column-payment').click() - cy.get('#mollie_order > :nth-child(1)').should('exist') - //Refunding is unavailable - information from Mollie Dashboard - but checking the UI itself -}); -it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Przelewy24').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('.input-float > input').type('testing@testing.com') - cy.get('[class="button form__button"]').click() - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339393: 58 Giropay Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('giropay').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339395: 60 EPS Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('eps').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('KBC/CBC').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('.grid-button-kbc-cbc').click() - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339399: 64 Belfius Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Belfius').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it.skip('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { // skipping temporary, bug - cy.visit('/en/index.php?controller=history') - cy.get('a').click() - // - cy.contains('Reorder').click() - cy.contains('LT').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Bank transfer').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // skipping temporary, bug - cy.OrderRefundingPartialPaymentsAPI() -}); }) diff --git a/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js b/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js new file mode 100755 index 000000000..50242d4b4 --- /dev/null +++ b/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js @@ -0,0 +1,37 @@ +/// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +let failEarly = false; +afterEach(() => { + expect(windowConsoleError).to.not.be.called; + if (failEarly) throw new Error("Failing Early due to an API or other module configuration problem. If running on CI, please check Cypress VIDEOS/SCREENSHOTS in the Artifacts for more details.") +}) +afterEach(function() { + if (this.currentTest.state === "failed") failEarly = true +}); +describe('PS1785 Enabling Payments', () => { + beforeEach(() => { + cy.viewport(1920,1080) + login('MollieBOFOLoggingIn') + }) + it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.ConfPaymentsAPI1784() + cy.get('[type="submit"]').first().click({force:true}) + cy.get('[class="alert alert-success"]').should('be.visible') +}) +}) diff --git a/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js new file mode 100755 index 000000000..465b4e8ba --- /dev/null +++ b/cypress/e2e/ps1785/05_mollie.ps1785.PaymentTestsPaymentsAPI.js @@ -0,0 +1,518 @@ +/// +function prepareCookie() + { + const name = 'PrestaShop-'; + + cy.request( + { + url: '/' + } + ).then((res) => { + + const cookies = res.requestHeaders.cookie.split(/; */); + + cookies.forEach(cookie => { + + const parts = cookie.split('='); + const key = parts[0] + const value = parts[1]; + + if (key.startsWith(name)) { + cy.setCookie( + key, + value, + { + sameSite: 'None', + secure: true + } + ); + } + }); + + }); + } +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@demo.com',{delay: 0, log: false}) + cy.get('#passwd').type('demodemo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@demo.com') + cy.get('#login-form [name="password"]').eq(0).type('demodemo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +afterEach(() => { + expect(windowConsoleError).to.not.be.called; +}) +describe('PS1785 Tests Suite', () => { + beforeEach(() => { + login('MollieBOFOLoggingIn') + cy.viewport(1920,1080) + }) +it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') +}) +it('C339379: 44 Bancontact Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Bancontact').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) +it('C339381: 46 iDEAL Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + cy.get('a').click() + cy.contains('Reorder').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('iDEAL').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('.payment-method-list > :nth-child(1)').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) +it('C339383: 48 Credit Card Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + cy.get('a').click() + cy.contains('Reorder').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Card').click({force:true}) + //Credit card inputing + cy.CreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) +it('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { + cy.clearCookies() + //Payments API item + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.get('[class="h3 product-title"]').eq(0).click() + cy.get('.add > .btn').click() + cy.get('.cart-content-btn > .btn-primary').click() + cy.get('.text-sm-center > .btn').click() + // Creating random user all the time + cy.get(':nth-child(1) > .custom-radio > input').check() + cy.get('#field-firstname').type('AUT',{delay:0}) + cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) + const uuid = () => Cypress._.random(0, 1e6) + const id = uuid() + const testname = `testemail${id}@testing.com` + cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) + cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() + cy.get('#customer-form > .form-footer > .continue').click() + cy.reload() + cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') + cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') + cy.get('#field-address2').type('ADDR2',{delay:0}).as('address2') + cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') + cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') + cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') + cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') + cy.get('.form-footer > .continue').click() + cy.get('#js-delivery > .continue').click() + cy.contains('Card').click({force:true}) + //Credit card inputing + cy.CreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { + cy.clearCookies() + //Payments API item + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.get('[class="h3 product-title"]').eq(0).click() + cy.get('.add > .btn').click() + cy.get('.cart-content-btn > .btn-primary').click() + cy.get('.text-sm-center > .btn').click() + // Creating random user all the time + cy.get(':nth-child(1) > .custom-radio > input').check() + cy.get('#field-firstname').type('AUT',{delay:0}) + cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) + const uuid = () => Cypress._.random(0, 1e6) + const id = uuid() + const testname = `testemail${id}@testing.com` + cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) + cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() + cy.get('#customer-form > .form-footer > .continue').click() + cy.reload() + cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') + cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') + cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') + cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') + cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') + cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') + cy.get('.form-footer > .continue').click() + cy.get('#js-delivery > .continue').click() + cy.contains('Card').click({force:true}) + //Credit card inputing + cy.NotSecureCreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + cy.get('.ps-shown-by-js > .btn').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339387: 52 Paypal Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('PayPal').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { + cy.visit('/admin1/index.php?controller=AdminOrders') + cy.get(':nth-child(1) > .column-payment').click() + //Check partial refunding on Payments API - seems that Paypal has only Partial Refunding without Refund button + cy.get('.form-inline > :nth-child(2) > .input-group > .form-control').type('1.51',{delay:0}) + cy.get(':nth-child(2) > .input-group > .input-group-btn > .btn').click() + cy.get('.swal-modal').should('exist') + cy.get(':nth-child(2) > .swal-button').click() + cy.get('#mollie_order > :nth-child(1) > .alert').contains('Refund was made successfully!') +}); +it('C339389: 54 SOFORT Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('SOFORT').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { + cy.visit('/admin1/index.php?controller=AdminOrders') + cy.get(':nth-child(1) > .column-payment').click() + cy.get('#mollie_order > :nth-child(1)').should('exist') + //Refunding is unavailable - information from Mollie Dashboard - but checking the UI itself +}); +it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Przelewy24').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('.input-float > input').type('testing@testing.com') + cy.get('[class="button form__button"]').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339393: 58 Giropay Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('giropay').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339395: 60 EPS Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('eps').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('KBC/CBC').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('.grid-button-kbc-cbc').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339399: 64 Belfius Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Belfius').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it.skip('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { // skipping temporary, bug + cy.visit('/en/index.php?controller=history') + cy.get('a').click() + // + cy.contains('Reorder').click() + cy.contains('LT').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Bank transfer').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it.skip('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // skipping temporary, bug + cy.OrderRefundingPartialPaymentsAPI() +}); +}) diff --git a/cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js b/cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js similarity index 100% rename from cypress/e2e/ps1785/04_mollie.ps1785.Subscriptions.js rename to cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js From 015e5b4aea66512760be3d497d7f26153fcf3944 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 13:52:10 +0300 Subject: [PATCH 105/109] ps8 tests refactored --- ...=> 03_mollie.ps8.PaymentTestsOrdersAPI.js} | 455 ---------------- ...e.ps8.EnablingPaymentsPaymentsAPI.specs.js | 42 ++ .../05_mollie.ps8.PaymentTestsPaymentsAPI.js | 510 ++++++++++++++++++ ...ions.js => 06_mollie.ps8.Subscriptions.js} | 0 4 files changed, 552 insertions(+), 455 deletions(-) rename cypress/e2e/ps8/{03_mollie.ps8.PaymentTests.js => 03_mollie.ps8.PaymentTestsOrdersAPI.js} (57%) create mode 100755 cypress/e2e/ps8/04_mollie.ps8.EnablingPaymentsPaymentsAPI.specs.js create mode 100755 cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js rename cypress/e2e/ps8/{04_mollie.ps8.Subscriptions.js => 06_mollie.ps8.Subscriptions.js} (100%) diff --git a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js similarity index 57% rename from cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js rename to cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js index 7d492bbe4..d3204609d 100755 --- a/cypress/e2e/ps8/03_mollie.ps8.PaymentTests.js +++ b/cypress/e2e/ps8/03_mollie.ps8.PaymentTestsOrdersAPI.js @@ -670,459 +670,4 @@ it.skip('40 Gift Card Checkouting [Orders API]', () => { it.skip('41 Gift Card Order Shipping, Refunding [Orders API]', () => { cy.OrderRefundingShippingOrdersAPI() }) -it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.ConfPaymentsAPI1784() - cy.get('[type="submit"]').first().click({force:true}) - cy.get('[class="alert alert-success"]').should('be.visible') -}) -it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') -}) -it('C339379: 44 Bancontact Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Bancontact').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}) -it('C339381: 46 iDEAL Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('iDEAL').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('.payment-method-list > :nth-child(1)').click() - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}) -it('C339383: 48 Credit Card Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - cy.contains('Reorder').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Card').click({force:true}) - //Credit card inputing - cy.CreditCardFillingIframe() - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}) -it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { // possibly a PS8 issue, that Cart is celaning the cookies... - cy.clearCookies() - //Payments API item - cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) - cy.get('[class="h3 product-title"]').eq(0).click() - cy.get('.add > .btn').click() - cy.get('.cart-content-btn > .btn-primary').click() - cy.wait(2000) - cy.visit('/en/') - cy.get('.blockcart').click() - cy.get('.text-sm-center > .btn').click() - // Creating random user all the time - cy.get(':nth-child(1) > .custom-radio > input').check() - cy.get('#field-firstname').type('AUT',{delay:0}) - cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) - const uuid = () => Cypress._.random(0, 1e6) - const id = uuid() - const testname = `testemail${id}@testing.com` - cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) - cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() - cy.get('#customer-form > .form-footer > .continue').click() - cy.reload() - cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') - cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') - cy.get('#field-address2').type('ADDR2',{delay:0}).as('address2') - cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') - cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') - cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') - cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') - cy.get('.form-footer > .continue').click() - cy.get('#js-delivery > .continue').click() - cy.contains('Card').click({force:true}) - //Credit card inputing - cy.CreditCardFillingIframe() - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { - cy.clearCookies() - //Payments API item - cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) - cy.get('[class="h3 product-title"]').eq(0).click() - cy.get('.add > .btn').click() - cy.get('.cart-content-btn > .btn-primary').click() - cy.get('.text-sm-center > .btn').click() - // Creating random user all the time - cy.get(':nth-child(1) > .custom-radio > input').check() - cy.get('#field-firstname').type('AUT',{delay:0}) - cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) - const uuid = () => Cypress._.random(0, 1e6) - const id = uuid() - const testname = `testemail${id}@testing.com` - cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) - cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() - cy.get('#customer-form > .form-footer > .continue').click() - cy.reload() - cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) - cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') - cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') - cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') - cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') - cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') - cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') - cy.get('.form-footer > .continue').click() - cy.get('#js-delivery > .continue').click() - cy.contains('Card').click({force:true}) - //Credit card inputing - cy.NotSecureCreditCardFillingIframe() - cy.get('.condition-label > .js-terms').click({force:true}) - cy.get('.ps-shown-by-js > .btn').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}) -it('C339387: 52 Paypal Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('PayPal').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { - cy.visit('/admin1/index.php?controller=AdminOrders') - cy.get(':nth-child(1) > .column-payment').click() - //Check partial refunding on Payments API - seems that Paypal has only Partial Refunding without Refund button - cy.get('.form-inline > :nth-child(2) > .input-group > .form-control').type('1.51',{delay:0}) - cy.get(':nth-child(2) > .input-group > .input-group-btn > .btn').click() - cy.get('.swal-modal').should('exist') - cy.get(':nth-child(2) > .swal-button').click() - cy.get('#mollie_order > :nth-child(1) > .alert').contains('Refund was made successfully!') -}); -it('C339389: 54 SOFORT Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('SOFORT').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { - cy.visit('/admin1/index.php?controller=AdminOrders') - cy.get(':nth-child(1) > .column-payment').click() - cy.get('#mollie_order > :nth-child(1)').should('exist') - //Refunding is unavailable - information from Mollie Dashboard - but checking the UI itself -}); -it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Przelewy24').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('.input-float > input').type('testing@testing.com') - cy.get('[class="button form__button"]').click() - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339393: 58 Giropay Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('giropay').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339395: 60 EPS Checkouting [Payments API]', () => { - cy.visit('/de/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('eps').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('KBC/CBC').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('.grid-button-kbc-cbc').click() - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339399: 64 Belfius Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Belfius').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { - cy.OrderRefundingPartialPaymentsAPI() -}); -it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { - cy.visit('/en/index.php?controller=history') - // - cy.contains('Reorder').click() - cy.contains('DE').click() - //Billing country LT, DE etc. - cy.get('.clearfix > .btn').click() - cy.get('#js-delivery > .continue').click() - //Payment method choosing - cy.contains('Bank transfer').click({force:true}) - cy.get('.condition-label > .js-terms').click({force:true}) - prepareCookie(); - cy.get('.ps-shown-by-js > .btn').click() - cy.setCookie( - 'SESSIONID', - "cypress-dummy-value", - { - domain: '.www.mollie.com', - sameSite: 'None', - secure: true, - httpOnly: true - } - ); // reload current page to activate cookie - cy.reload(); - cy.get('[value="paid"]').click() - cy.get('[class="button form__button"]').click() - cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') -}); -it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why - cy.OrderRefundingPartialPaymentsAPI() -}) }) diff --git a/cypress/e2e/ps8/04_mollie.ps8.EnablingPaymentsPaymentsAPI.specs.js b/cypress/e2e/ps8/04_mollie.ps8.EnablingPaymentsPaymentsAPI.specs.js new file mode 100755 index 000000000..46bd09c7a --- /dev/null +++ b/cypress/e2e/ps8/04_mollie.ps8.EnablingPaymentsPaymentsAPI.specs.js @@ -0,0 +1,42 @@ +/// +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +let failEarly = false; +afterEach(() => { + expect(windowConsoleError).to.not.be.called; + if (failEarly) throw new Error("Failing Early due to an API or other module configuration problem. If running on CI, please check Cypress VIDEOS/SCREENSHOTS in the Artifacts for more details.") +}) +afterEach(function() { + if (this.currentTest.state === "failed") failEarly = true +}); +describe('PS8 Enabling Payments', () => { + beforeEach(() => { + cy.viewport(1920,1080) + login('MollieBOFOLoggingIn') + }) +it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.ConfPaymentsAPI1784() + cy.get('[type="submit"]').first().click({force:true}) + cy.get('[class="alert alert-success"]').should('be.visible') +}) +}) diff --git a/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js new file mode 100755 index 000000000..59b58db74 --- /dev/null +++ b/cypress/e2e/ps8/05_mollie.ps8.PaymentTestsPaymentsAPI.js @@ -0,0 +1,510 @@ +/// +function prepareCookie() + { + const name = 'PrestaShop-'; + + cy.request( + { + url: '/' + } + ).then((res) => { + + const cookies = res.requestHeaders.cookie.split(/; */); + + cookies.forEach(cookie => { + + const parts = cookie.split('='); + const key = parts[0] + const value = parts[1]; + + if (key.startsWith(name)) { + cy.setCookie( + key, + value, + { + sameSite: 'None', + secure: true + } + ); + } + }); + + }); + } +//Caching the BO and FO session +const login = (MollieBOFOLoggingIn) => { + cy.session(MollieBOFOLoggingIn,() => { + cy.visit('/admin1/') + cy.url().should('contain', 'https').as('Check if HTTPS exists') + cy.get('#email').type('demo@prestashop.com',{delay: 0, log: false}) + cy.get('#passwd').type('prestashop_demo',{delay: 0, log: false}) + cy.get('#submit_login').click().wait(1000).as('Connection successsful') + cy.visit('/en/my-account') + cy.get('#login-form [name="email"]').eq(0).type('demo@prestashop.com') + cy.get('#login-form [name="password"]').eq(0).type('prestashop_demo') + cy.get('#login-form [type="submit"]').eq(0).click({force:true}) + cy.get('#history-link > .link-item').click() + }) + } +//Checking the console for errors +let windowConsoleError; +Cypress.on('window:before:load', (win) => { + windowConsoleError = cy.spy(win.console, 'error'); +}) +afterEach(() => { + expect(windowConsoleError).to.not.be.called; +}) +describe('PS8 Tests Suite', () => { + beforeEach(() => { + cy.viewport(1920,1080) + login('MollieBOFOLoggingIn') + }) +it('C339378: 43 Check if Bancontact QR payment dropdown exists [Payments API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.get('[name="MOLLIE_BANCONTACT_QR_CODE_ENABLED"]').should('exist') +}) +it('C339379: 44 Bancontact Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Bancontact').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339380: 45 Bancontact Order BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) +it('C339381: 46 iDEAL Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + cy.contains('Reorder').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('iDEAL').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('.payment-method-list > :nth-child(1)').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339382: 47 iDEAL Order BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) +it('C339383: 48 Credit Card Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + cy.contains('Reorder').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Card').click({force:true}) + //Credit card inputing + cy.CreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339384: 49 Credit Card Order BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}) +it.skip('C339385: 50 Credit Card Guest Checkouting [Payments API]', () => { // possibly a PS8 issue, that Cart is celaning the cookies... + cy.clearCookies() + //Payments API item + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.get('[class="h3 product-title"]').eq(0).click() + cy.get('.add > .btn').click() + cy.get('.cart-content-btn > .btn-primary').click() + cy.wait(2000) + cy.visit('/en/') + cy.get('.blockcart').click() + cy.get('.text-sm-center > .btn').click() + // Creating random user all the time + cy.get(':nth-child(1) > .custom-radio > input').check() + cy.get('#field-firstname').type('AUT',{delay:0}) + cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) + const uuid = () => Cypress._.random(0, 1e6) + const id = uuid() + const testname = `testemail${id}@testing.com` + cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) + cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() + cy.get('#customer-form > .form-footer > .continue').click() + cy.reload() + cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') + cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') + cy.get('#field-address2').type('ADDR2',{delay:0}).as('address2') + cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') + cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') + cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') + cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') + cy.get('.form-footer > .continue').click() + cy.get('#js-delivery > .continue').click() + cy.contains('Card').click({force:true}) + //Credit card inputing + cy.CreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it.skip('C339386: 51 Credit Card Guest Checkouting with not 3DS secure card [Payments API]', () => { + cy.clearCookies() + //Payments API item + cy.visit('/en/', { headers: {"Accept-Encoding": "gzip, deflate"}}) + cy.get('[class="h3 product-title"]').eq(0).click() + cy.get('.add > .btn').click() + cy.get('.cart-content-btn > .btn-primary').click() + cy.get('.text-sm-center > .btn').click() + // Creating random user all the time + cy.get(':nth-child(1) > .custom-radio > input').check() + cy.get('#field-firstname').type('AUT',{delay:0}) + cy.get(':nth-child(3) > .col-md-6 > .form-control').type('AUT',{delay:0}) + const uuid = () => Cypress._.random(0, 1e6) + const id = uuid() + const testname = `testemail${id}@testing.com` + cy.get(':nth-child(4) > .col-md-6 > .form-control').type(testname, {delay: 0}) + cy.get(':nth-child(6) > .col-md-6 > .input-group > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(9) > .col-md-6 > .custom-checkbox > label > input').check() + cy.get('#customer-form > .form-footer > .continue').click() + cy.reload() + cy.get(':nth-child(6) > .col-md-6 > .form-control').type('123456',{delay:0}) + cy.get(':nth-child(7) > .col-md-6 > .form-control').type('123456',{delay:0}).as('vat number') + cy.get(':nth-child(8) > .col-md-6 > .form-control').type('ADDR',{delay:0}).as('address') + cy.get(':nth-child(10) > .col-md-6 > .form-control').type('54469',{delay:0}).as('zip') + cy.get(':nth-child(11) > .col-md-6 > .form-control').type('CIT',{delay:0}).as('city') + cy.get(':nth-child(12) > .col-md-6 > .form-control').select('Lithuania').as('country') + cy.get(':nth-child(13) > .col-md-6 > .form-control').type('+370 000',{delay:0}).as('telephone') + cy.get('.form-footer > .continue').click() + cy.get('#js-delivery > .continue').click() + cy.contains('Card').click({force:true}) + //Credit card inputing + cy.NotSecureCreditCardFillingIframe() + cy.get('.condition-label > .js-terms').click({force:true}) + cy.get('.ps-shown-by-js > .btn').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}) +it('C339387: 52 Paypal Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('PayPal').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339388: 53 Paypal BO Refunding, Partial Refunding [Payments API]', () => { + cy.visit('/admin1/index.php?controller=AdminOrders') + cy.get(':nth-child(1) > .column-payment').click() + //Check partial refunding on Payments API - seems that Paypal has only Partial Refunding without Refund button + cy.get('.form-inline > :nth-child(2) > .input-group > .form-control').type('1.51',{delay:0}) + cy.get(':nth-child(2) > .input-group > .input-group-btn > .btn').click() + cy.get('.swal-modal').should('exist') + cy.get(':nth-child(2) > .swal-button').click() + cy.get('#mollie_order > :nth-child(1) > .alert').contains('Refund was made successfully!') +}); +it('C339389: 54 SOFORT Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('SOFORT').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339390: 55 SOFORT BO Refunding, Partial Refunding [Payments API]', () => { + cy.visit('/admin1/index.php?controller=AdminOrders') + cy.get(':nth-child(1) > .column-payment').click() + cy.get('#mollie_order > :nth-child(1)').should('exist') + //Refunding is unavailable - information from Mollie Dashboard - but checking the UI itself +}); +it('C339391: 56 Przelewy24 Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Przelewy24').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('.input-float > input').type('testing@testing.com') + cy.get('[class="button form__button"]').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339392: 57 Przelewy24 BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339393: 58 Giropay Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('giropay').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339394: 59 Giropay BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339395: 60 EPS Checkouting [Payments API]', () => { + cy.visit('/de/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('eps').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339396: 61 EPS BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339397: 62 KBC/CBC Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('KBC/CBC').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('.grid-button-kbc-cbc').click() + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339398: 63 KBC/CBC BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339399: 64 Belfius Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Belfius').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339400: 65 Belfius BO Refunding, Partial Refunding [Payments API]', () => { + cy.OrderRefundingPartialPaymentsAPI() +}); +it('C339401: 66 Bank Transfer Checkouting [Payments API]', () => { + cy.visit('/en/index.php?controller=history') + // + cy.contains('Reorder').click() + cy.contains('DE').click() + //Billing country LT, DE etc. + cy.get('.clearfix > .btn').click() + cy.get('#js-delivery > .continue').click() + //Payment method choosing + cy.contains('Bank transfer').click({force:true}) + cy.get('.condition-label > .js-terms').click({force:true}) + prepareCookie(); + cy.get('.ps-shown-by-js > .btn').click() + cy.setCookie( + 'SESSIONID', + "cypress-dummy-value", + { + domain: '.www.mollie.com', + sameSite: 'None', + secure: true, + httpOnly: true + } + ); // reload current page to activate cookie + cy.reload(); + cy.get('[value="paid"]').click() + cy.get('[class="button form__button"]').click() + cy.get('#content-hook_order_confirmation > .card-block').should('be.visible') +}); +it('C339402: 67 Bank Transfer BO Refunding, Partial Refunding [Payments API]', () => { // somehow an error in console is thrown, will check why + cy.OrderRefundingPartialPaymentsAPI() +}) +}) diff --git a/cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js similarity index 100% rename from cypress/e2e/ps8/04_mollie.ps8.Subscriptions.js rename to cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js From df9a6eb69c6ea4ba0cf52d2a58339ba875b99e66 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 13:53:25 +0300 Subject: [PATCH 106/109] Update 04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js --- ...ollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js b/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js index 50242d4b4..23a42ed9c 100755 --- a/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js +++ b/cypress/e2e/ps1785/04_mollie.ps1785.EnablingPaymentsPaymentsAPI.specs.js @@ -27,11 +27,11 @@ describe('PS1785 Enabling Payments', () => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') }) - it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { - cy.visit('/admin1/') - cy.OpeningModuleDashboardURL() - cy.ConfPaymentsAPI1784() - cy.get('[type="submit"]').first().click({force:true}) - cy.get('[class="alert alert-success"]').should('be.visible') +it('C339377: 42 [SWITCH TO PAYMENTS API] Enabling All payments in Module BO [Payments API]', () => { + cy.visit('/admin1/') + cy.OpeningModuleDashboardURL() + cy.ConfPaymentsAPI1784() + cy.get('[type="submit"]').first().click({force:true}) + cy.get('[class="alert alert-success"]').should('be.visible') }) }) From b8d19b00eced598d454deb7fc5639ce9640273f4 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 13:54:20 +0300 Subject: [PATCH 107/109] updating urls --- .docker/.htaccess8 | 20 +++---- .github/workflows/E2E_On_PR.yml | 2 +- docker-compose.8.yml | 2 +- tests/seed/database/prestashop_8.sql | 90 ++++++++++++++-------------- 4 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.docker/.htaccess8 b/.docker/.htaccess8 index b1f21a2bf..d7343aab0 100755 --- a/.docker/.htaccess8 +++ b/.docker/.htaccess8 @@ -10,29 +10,29 @@ SetEnv HTTP_MOD_REWRITE On RewriteEngine on -#Domain: demoshop8debug.ngrok.io +#Domain: demoshop8.ngrok.io RewriteRule . - [E=REWRITEBASE:/] RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L] RewriteRule ^upload/.+$ %{ENV:REWRITEBASE}index.php [QSA,L] # Images -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2$3.jpg [L] -RewriteCond %{HTTP_HOST} ^demoshop8debug.ngrok.io$ +RewriteCond %{HTTP_HOST} ^demoshop8.ngrok.io$ RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.jpg$ %{ENV:REWRITEBASE}img/c/$1$2.jpg [L] # AlphaImageLoader for IE and fancybox RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L] diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index 7c4f62413..a76ed6466 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -28,7 +28,7 @@ jobs: subdomain: 'demoshop8debug' port: '8142' yml: 'docker-compose.8.yml' - url: 'https://demoshop8debug.ngrok.io' + url: 'https://demoshop8.ngrok.io' test_spec: '**/cypress/e2e/ps8/**' TestRailID: R6470 env: diff --git a/docker-compose.8.yml b/docker-compose.8.yml index 72da1c1b6..af308d9dd 100755 --- a/docker-compose.8.yml +++ b/docker-compose.8.yml @@ -36,7 +36,7 @@ services: DB_PASSWD: $${DB_PASSWD} DB_NAME: prestashop DB_SERVER: mysql - PS_DOMAIN: demoshop8debug.ngrok.io:8142 + PS_DOMAIN: demoshop8.ngrok.io:8142 PS_FOLDER_INSTALL: install PS_FOLDER_ADMIN: admin1 depends_on: diff --git a/tests/seed/database/prestashop_8.sql b/tests/seed/database/prestashop_8.sql index 93eb8894c..0b7db8dc9 100755 --- a/tests/seed/database/prestashop_8.sql +++ b/tests/seed/database/prestashop_8.sql @@ -3053,8 +3053,8 @@ INSERT INTO `ps_configuration` (`id_configuration`, `id_shop_group`, `id_shop`, (231, NULL, NULL, 'HOMESLIDER_PAUSE', '7700', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (232, NULL, NULL, 'HOMESLIDER_LOOP', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (233, NULL, NULL, 'PS_BASE_DISTANCE_UNIT', 'm', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), -(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), -(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8debug.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(234, NULL, NULL, 'PS_SHOP_DOMAIN', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), +(235, NULL, NULL, 'PS_SHOP_DOMAIN_SSL', 'demoshop8.ngrok.io', '0000-00-00 00:00:00', '2023-08-28 13:26:18'), (236, NULL, NULL, 'PS_SHOP_NAME', 'PrestaShop', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), (237, NULL, NULL, 'PS_SHOP_EMAIL', 'demo@prestashop.com', '0000-00-00 00:00:00', '2023-08-28 13:26:21'), (238, NULL, NULL, 'PS_MAIL_METHOD', '1', '0000-00-00 00:00:00', '0000-00-00 00:00:00'), @@ -3425,37 +3425,37 @@ CREATE TABLE `ps_connections_source` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_connections_source` (`id_connections_source`, `id_connections`, `http_referer`, `request_uri`, `keywords`, `date_add`) VALUES -(1, 2, '', 'demoshop8debug.ngrok.io/', '', '2023-08-28 13:41:41'), -(2, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), -(3, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), -(4, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), -(5, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), -(6, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), -(7, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), -(8, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), -(9, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), -(10, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), -(11, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:03'), -(12, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), -(13, 2, 'http://demoshop8debug.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8debug.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), -(14, 2, 'http://demoshop8debug.ngrok.io/en/registration', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:48:30'), -(15, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), -(16, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:48:44'), -(17, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), -(18, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/address', '', '2023-08-28 13:49:11'), -(19, 2, 'http://demoshop8debug.ngrok.io/en/address', 'demoshop8debug.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), -(20, 2, 'http://demoshop8debug.ngrok.io/en/addresses', 'demoshop8debug.ngrok.io/en/', '', '2023-08-28 13:50:35'), -(21, 2, 'http://demoshop8debug.ngrok.io/en/', 'demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), -(22, 2, 'http://demoshop8debug.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8debug.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), -(23, 2, 'http://demoshop8debug.ngrok.io/en/cart?action=show', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:50'), -(24, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:52'), -(25, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:50:55'), -(26, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), -(27, 2, 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8debug.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), -(28, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order', '', '2023-08-28 13:51:14'), -(29, 2, 'http://demoshop8debug.ngrok.io/en/order', 'demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), -(30, 2, 'http://demoshop8debug.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8debug.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), -(31, 2, 'http://demoshop8debug.ngrok.io/en/my-account', 'demoshop8debug.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); +(1, 2, '', 'demoshop8.ngrok.io/', '', '2023-08-28 13:41:41'), +(2, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:42:41'), +(3, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:15'), +(4, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:43:23'), +(5, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:23'), +(6, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:44:30'), +(7, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:16'), +(8, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:46:41'), +(9, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:09'), +(10, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:47:56'), +(11, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:48:03'), +(12, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', '', '2023-08-28 13:48:07'), +(13, 2, 'http://demoshop8.ngrok.io/en/login?back=http%3A%2F%2Flocalhost%3A8142%2Fen%2F', 'demoshop8.ngrok.io/en/registration', '', '2023-08-28 13:48:09'), +(14, 2, 'http://demoshop8.ngrok.io/en/registration', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:48:30'), +(15, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/my-account', '', '2023-08-28 13:48:33'), +(16, 2, 'http://demoshop8.ngrok.io/en/my-account', 'demoshop8.ngrok.io/en/address', '', '2023-08-28 13:48:44'), +(17, 2, 'http://demoshop8.ngrok.io/en/address', 'demoshop8.ngrok.io/en/addresses', '', '2023-08-28 13:49:09'), +(18, 2, 'http://demoshop8.ngrok.io/en/addresses', 'demoshop8.ngrok.io/en/address', '', '2023-08-28 13:49:11'), +(19, 2, 'http://demoshop8.ngrok.io/en/address', 'demoshop8.ngrok.io/en/addresses', '', '2023-08-28 13:50:31'), +(20, 2, 'http://demoshop8.ngrok.io/en/addresses', 'demoshop8.ngrok.io/en/', '', '2023-08-28 13:50:35'), +(21, 2, 'http://demoshop8.ngrok.io/en/', 'demoshop8.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', '', '2023-08-28 13:50:41'), +(22, 2, 'http://demoshop8.ngrok.io/en/art/4-16-the-adventure-begins-framed-poster.html', 'demoshop8.ngrok.io/en/cart?action=show', '', '2023-08-28 13:50:48'), +(23, 2, 'http://demoshop8.ngrok.io/en/cart?action=show', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:50'), +(24, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:52'), +(25, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:50:55'), +(26, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:04'), +(27, 2, 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', 'demoshop8.ngrok.io/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', '', '2023-08-28 13:51:12'), +(28, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order', '', '2023-08-28 13:51:14'), +(29, 2, 'http://demoshop8.ngrok.io/en/order', 'demoshop8.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', '', '2023-08-28 13:51:23'), +(30, 2, 'http://demoshop8.ngrok.io/en/order-confirmation?id_cart=6&id_module=53&id_order=6&key=4c26b11e96bb59693af803acba66be93', 'demoshop8.ngrok.io/en/my-account', '', '2023-08-28 13:51:25'), +(31, 2, 'http://demoshop8.ngrok.io/en/my-account', 'demoshop8.ngrok.io/en/order-history', '', '2023-08-28 13:51:28'); DROP TABLE IF EXISTS `ps_contact`; CREATE TABLE `ps_contact` ( @@ -10243,17 +10243,17 @@ CREATE TABLE `ps_pagenotfound` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8; INSERT INTO `ps_pagenotfound` (`id_pagenotfound`, `id_shop`, `id_shop_group`, `request_uri`, `http_referer`, `date_add`) VALUES -(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), -(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), -(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), -(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), -(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), -(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), -(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), -(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), -(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), -(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), -(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8debug.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); +(1, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:42:41'), +(2, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:15'), +(3, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:43:23'), +(4, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:23'), +(5, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:44:29'), +(6, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/modules/manage?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:16'), +(7, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:46:41'), +(8, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:09'), +(9, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/international/localization/?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:47:56'), +(10, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:04'), +(11, 1, 1, '/admin1/themes/new-theme/public/index.php?controller=AdminDashboard&token=7ce3ba8406914d581737513944a076fe', 'http://demoshop8.ngrok.io/admin1/index.php/improve/payment/preferences?_token=iHz2B3KMeESrucKO9NHNUL8lnnCUG7s9nDPyWcZUiVM', '2023-08-28 11:51:12'); DROP TABLE IF EXISTS `ps_page_type`; CREATE TABLE `ps_page_type` ( @@ -12272,7 +12272,7 @@ CREATE TABLE `ps_shop_url` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; INSERT INTO `ps_shop_url` (`id_shop_url`, `id_shop`, `domain`, `domain_ssl`, `physical_uri`, `virtual_uri`, `main`, `active`) VALUES -(1, 1, 'demoshop8debug.ngrok.io', 'demoshop8debug.ngrok.io', '/', '', 1, 1); +(1, 1, 'demoshop8.ngrok.io', 'demoshop8.ngrok.io', '/', '', 1, 1); DROP TABLE IF EXISTS `ps_smarty_cache`; CREATE TABLE `ps_smarty_cache` ( From 89e4d1fcb66998fe737b2a60d008b263878af404 Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 13:56:24 +0300 Subject: [PATCH 108/109] small typo --- .github/workflows/E2E_On_PR.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/E2E_On_PR.yml b/.github/workflows/E2E_On_PR.yml index a76ed6466..118f13021 100755 --- a/.github/workflows/E2E_On_PR.yml +++ b/.github/workflows/E2E_On_PR.yml @@ -17,7 +17,7 @@ jobs: include: - prestashop: 'PS1785' make: 'make e2eh1785' - subdomain: 'demoshop1785debug' + subdomain: 'demoshop1785' port: '8002' yml: 'docker-compose.1785.yml' url: 'https://demoshop1785.ngrok.io' @@ -25,7 +25,7 @@ jobs: TestRailID: R4954 - prestashop: 'PS8' make: 'make e2eh8' - subdomain: 'demoshop8debug' + subdomain: 'demoshop8' port: '8142' yml: 'docker-compose.8.yml' url: 'https://demoshop8.ngrok.io' From 924879ff19a62a636386dae97d88bd45e0deb68d Mon Sep 17 00:00:00 2001 From: SimonasB88 Date: Mon, 9 Oct 2023 14:27:30 +0300 Subject: [PATCH 109/109] small typo --- cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js | 2 +- cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js b/cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js index b88609478..b4dce2df7 100755 --- a/cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js +++ b/cypress/e2e/ps1785/06_mollie.ps1785.Subscriptions.js @@ -22,7 +22,7 @@ windowConsoleError = cy.spy(win.console, 'error'); afterEach(() => { expect(windowConsoleError).to.not.be.called; }) -describe('PS1785 Subscriptions Test Suit', () => { +describe('PS1785 Subscriptions Test Suite', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn') diff --git a/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js index 3fa8b4922..c570728c9 100755 --- a/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js +++ b/cypress/e2e/ps8/06_mollie.ps8.Subscriptions.js @@ -22,7 +22,7 @@ windowConsoleError = cy.spy(win.console, 'error'); afterEach(() => { expect(windowConsoleError).to.not.be.called; }) -describe('PS8 Subscriptions Test Suit', () => { +describe('PS8 Subscriptions Test Suite', () => { beforeEach(() => { cy.viewport(1920,1080) login('MollieBOFOLoggingIn')