@salla.sa/twilight-components 1.0.24 → 1.0.26

package/dist/collection/components/salla-login/salla-login.js

@@ -11,21 +11,21 @@ export class SallaLogin {
       e.key == 'Enter' && submitMethod();
     };
     this.loginBySMS = async () => {
-      const { phone, countryCode } = await this.loginTelInput.getValues();
+      const { mobile, countryCode } = await this.loginTelInput.getValues();
       const isPhoneValid = await this.loginTelInput.isValid();
       if (!isPhoneValid)
         return;
       this.smsBtn.load()
         .then(() => this.smsBtn.disable())
-        .then(() => salla.auth.api.login({ type: 'mobile', phone: phone, country_code: countryCode }))
+        .then(() => salla.auth.api.login({ type: 'mobile', phone: mobile, country_code: countryCode }))
         .then(() => this.smsBtn.stop() && this.smsBtn.enable())
         .then(() => this.showTab(this.verifyTab))
-        .then(() => this.verifyTab.by = 'sms')
-        .then(() => this.verifyTab.show({ phone: phone, country_code: countryCode }));
+        .then(() => (this.verifyTab.by = 'sms') && (this.verifyTab.url = 'auth/mobile/verify'))
+        .then(() => this.verifyTab.show({ phone: mobile, country_code: countryCode }));
     };
     this.loginByEmail = () => {
       if (!Helper.isValidEmail(this.loginEmail.value)) {
-        this.validateField(this.loginEmail, this.isEmailValid);
+        this.validateField(this.loginEmail, this.emailErrorMsg);
         return;
       }
       this.emailBtn.load()
@@ -37,7 +37,7 @@ export class SallaLogin {
         .then(() => this.verifyTab.show({ email: this.loginEmail.value }));
     };
     this.newUser = async () => {
-      const { phone: regPhone, countryCode, countryKey } = await this.regTelInput.getValues();
+      const { mobile: regPhone, countryCode, countryKey } = await this.regTelInput.getValues();
       await this.newUserValidation();
       await this.regBtn.load();
       await this.regBtn.disable();
@@ -45,7 +45,7 @@ export class SallaLogin {
         .then(code => salla.auth.api.register({
         first_name: this.firstName.value,
         last_name: this.lastName.value,
-        phone: regPhone || this.loginTelInput.phone,
+        phone: regPhone || this.loginTelInput.mobile,
         email: this.regEmail.value || this.loginEmail.value,
         country_code: countryCode,
         country_key: countryKey,
@@ -58,6 +58,7 @@ export class SallaLogin {
     this.title = this.host.title || salla.lang.get('blocks.header.login');
     this.host.removeAttribute('title');
     salla.event.on('languages::translations.loaded', () => {
+      var _a;
       this.loginTypeTitle = salla.lang.get('blocks.header.select_login_way');
       this.loginText = salla.lang.get('blocks.header.login');
       this.smsLabel = salla.lang.get('blocks.header.sms');
@@ -67,15 +68,18 @@ export class SallaLogin {
       this.bySMSText = salla.lang.get('blocks.header.login_by_sms');
       this.byEmailText = salla.lang.get('blocks.header.login_by_email');
       this.title = salla.lang.get('blocks.header.login');
-      this.isEmailValid = salla.lang.get('common.elements.email_is_valid');
+      this.emailErrorMsg = salla.lang.get('common.elements.email_is_valid');
       this.firstNameLabel = salla.lang.get('blocks.header.your_name');
       this.lastNameLabel = salla.lang.get('pages.profile.last_name');
-      this.firstNameRequired = salla.lang.get('common.errors.field_required', { attribute: this.firstNameLabel });
-      this.lastNameRequired = salla.lang.get('common.errors.field_required', { attribute: this.lastNameLabel });
+      this.firstNameErrorMsg = salla.lang.get('common.errors.field_required', { attribute: this.firstNameLabel });
+      this.lastNameErrorMsg = salla.lang.get('common.errors.field_required', { attribute: this.lastNameLabel });
+      (_a = this.modal) === null || _a === void 0 ? void 0 : _a.setTitle(this.title);
+      this.showTab(this.isEmailAllowed ? this.homeTab : this.mobileTab);
     });
     salla.auth.event.onVerificationFailed(() => {
       //
     });
+    salla.event.on('login::show', () => this.show());
   }
   /**
    * @param {CustomEvent|{details:{case:'new_customer'|'authenticated', redirect_url:string|null}}} event
@@ -106,16 +110,21 @@ export class SallaLogin {
     return this.modal.show();
   }
   showTab(tab, evt) {
+    var _a, _b;
     evt === null || evt === void 0 ? void 0 : evt.preventDefault();
     [this.homeTab, this.mobileTab, this.emailTab, this.verifyTab, this.registrationTab].map(el => Helper.toggleElement(el, 'visible', 'hidden', () => el == tab));
-    setTimeout(() => { [this.homeTab, this.mobileTab, this.emailTab, this.verifyTab, this.registrationTab].map(el => Helper.toggleElement(el, 's-login-active', 's-login-unactive', () => el == tab)); }, 200);
-    setTimeout(() => { this.host.querySelector('.s-login-wrapper').setAttribute('style', 'height:' + (tab === null || tab === void 0 ? void 0 : tab.scrollHeight) + 'px'); });
+    setTimeout(() => {
+      [this.homeTab, this.mobileTab, this.emailTab, this.verifyTab, this.registrationTab].map(el => Helper.toggleElement(el, 's-login-active', 's-login-unactive', () => el == tab));
+    }, 200);
+    setTimeout(() => {
+      this.host.querySelector('.s-login-wrapper').setAttribute('style', 'height:' + (tab === null || tab === void 0 ? void 0 : tab.scrollHeight) + 'px');
+    });
     if ([this.mobileTab, this.emailTab].includes(tab)) {
       this.regType = tab === this.mobileTab ? 'phone' : 'email';
     }
     let isRegistrationTab = tab == this.registrationTab;
-    isRegistrationTab && this.firstName.focus();
-    this.modal.setTitle(isRegistrationTab ? salla.lang.get('common.titles.registration') : this.title);
+    isRegistrationTab && ((_a = this.firstName) === null || _a === void 0 ? void 0 : _a.focus());
+    (_b = this.modal) === null || _b === void 0 ? void 0 : _b.setTitle(isRegistrationTab ? salla.lang.get('common.titles.registration') : this.title);
     if (!isRegistrationTab) {
       Helper.toggleElement(this.regMobileBlock, 's-hidden', 's-block', () => this.regType === 'phone')
         .toggleElement(this.regEmailBlock, 's-hidden', 's-block', () => this.regType === 'email');
@@ -126,9 +135,9 @@ export class SallaLogin {
     const isPhoneReg = this.regType == "phone", isEmailReg = this.regType == "email", isFirstNameValid = this.firstName.value.length > 0, isLastNameValid = this.lastName.value.length > 0, isEmailValid = Helper.isValidEmail(this.regEmail.value || isEmailReg && this.loginEmail.value), isPhoneValid = await this.regTelInput.isValid() || isPhoneReg && await this.loginTelInput.isValid();
     if (isEmailValid && isPhoneValid && isFirstNameValid && isLastNameValid)
       return;
-    !isEmailValid && this.validateField(this.regEmail, this.isEmailValid);
-    !isFirstNameValid && this.validateField(this.firstName, this.firstNameRequired);
-    !isLastNameValid && this.validateField(this.lastName, this.lastNameRequired);
+    !isEmailValid && this.validateField(this.regEmail, this.emailErrorMsg);
+    !isFirstNameValid && this.validateField(this.firstName, this.firstNameErrorMsg);
+    !isLastNameValid && this.validateField(this.lastName, this.lastNameErrorMsg);
     throw ('Please insert required fields');
   }
   validateField(field, errorMsg) {
@@ -153,14 +162,15 @@ export class SallaLogin {
         h("div", { class: "s-login-tab", ref: tab => this.mobileTab = tab },
           h("label", { class: "s-login-label" }, this.mobileLabel),
           h("salla-tel-input", { ref: el => this.loginTelInput = el, onKeyDown: e => this.typing(e, this.loginBySMS) }),
-          h("salla-button", { wide: true, onClick: () => this.loginBySMS(), ref: b => this.smsBtn = b }, this.enterText),
-          this.isEmailAllowed ? h("a", { href: "#", onClick: () => this.showTab(this.emailTab), class: "s-login-link" }, this.byEmailText) : ''),
+          h("salla-button", { "loader-position": 'center', wide: true, onClick: () => this.loginBySMS(), ref: b => this.smsBtn = b }, this.enterText),
+          this.isEmailAllowed ?
+            h("a", { href: "#", onClick: () => this.showTab(this.emailTab), class: "s-login-link" }, this.byEmailText) : ''),
         this.isEmailAllowed ?
           h("div", { class: "s-login-tab", ref: tab => this.emailTab = tab },
             h("label", { class: "s-login-label" }, this.emailLabel),
             h("input", { type: "email", ref: el => this.loginEmail = el, onKeyDown: e => this.typing(e, this.loginByEmail), placeholder: "your@email.com", class: "s-login-input s-ltr" }),
             h("span", { class: "s-login-error-message" }),
-            h("salla-button", { wide: true, onClick: () => this.loginByEmail(), ref: b => this.emailBtn = b }, this.enterText),
+            h("salla-button", { "loader-position": 'center', wide: true, onClick: () => this.loginByEmail(), ref: b => this.emailBtn = b }, this.enterText),
             h("a", { href: "#", onClick: () => this.showTab(this.mobileTab), class: "s-login-link" }, this.bySMSText)) : '',
         h("salla-verify", { "without-modal": true, ref: tab => this.verifyTab = tab, autoReload: false, "is-show-back": true }),
         h("div", { ref: tab => this.registrationTab = tab },
@@ -172,12 +182,12 @@ export class SallaLogin {
           h("span", { class: "s-login-error-message" }),
           h("div", { ref: el => this.regMobileBlock = el, class: "mb-1.5" },
             h("label", { class: "s-login-label" }, this.mobileLabel),
-            h("salla-tel-input", { phone: '', ref: el => this.regTelInput = el, onKeyDown: e => this.typing(e, this.newUser) })),
+            h("salla-tel-input", { ref: el => this.regTelInput = el, onKeyDown: e => this.typing(e, this.newUser) })),
           h("div", { ref: el => this.regEmailBlock = el, class: "mb-1.5" },
             h("label", { class: "s-login-label" }, this.emailLabel),
             h("input", { type: "email", ref: el => this.regEmail = el, onKeyDown: e => this.typing(e, this.newUser), placeholder: "your@email.com", class: "s-login-input s-ltr" }),
             h("span", { class: "s-login-error-message" })),
-          h("salla-button", { wide: true, onClick: () => this.newUser(), ref: b => this.regBtn = b }, salla.lang.get('blocks.header.register'))))));
+          h("salla-button", { "loader-position": 'center', wide: true, onClick: () => this.newUser(), ref: b => this.regBtn = b }, salla.lang.get('blocks.header.register'))))));
   }
   static get is() { return "salla-login"; }
   static get originalStyleUrls() { return {
@@ -216,11 +226,11 @@ export class SallaLogin {
     "enterText": {},
     "bySMSText": {},
     "byEmailText": {},
-    "isEmailValid": {},
+    "emailErrorMsg": {},
     "firstNameLabel": {},
     "lastNameLabel": {},
-    "firstNameRequired": {},
-    "lastNameRequired": {}
+    "firstNameErrorMsg": {},
+    "lastNameErrorMsg": {}
   }; }
   static get methods() { return {
     "show": {

package/dist/collection/components/salla-product-availability/salla-product-availability.js

@@ -1,73 +1,103 @@
-import { Component, Host, h, Prop, Watch, Element, Method } from '@stencil/core';
+import { Component, Host, h, Prop, Watch, Element, State } from '@stencil/core';
 import Helper from "../../Helpers/Helper";
 export class SallaProductAvailability {
   constructor() {
     this.isUser = Helper.isUser();
-    this.buttonText = salla.lang.get('pages.products.notify_availability');
-    this.countryCode = salla.config.country_code || 'SA';
-    this.subscribeText = salla.lang.get('common.elements.submit');
-    this.cancelText = salla.lang.get('common.elements.cancel');
-    this.subTitle = salla.lang.get('pages.products.notify_availability_subtitle');
-    this.mobileLabel = salla.lang.get('common.elements.mobile');
-    this.emailLabel = salla.lang.get('common.elements.email');
-    this.mobilePlaceholder = salla.lang.get('common.elements.mobile_placeholder');
-    this.emailPlaceholder = salla.lang.get('common.elements.email_placeholder');
-    this.productId = salla.config.page.id;
-    this.subscribedMessage = salla.lang.get('pages.products.notify_availability_success');
+    this.productId = salla.get('page.id');
     this.isSubscribed = false;
+    // @Method()
+    this.submit = async () => {
+      if (this.isUser) {
+        return salla.api.product.availabilitySubscribe(this.productId)
+          .then(() => this.isSubscribed = true);
+      }
+      let { mobile, countryCode } = await this.mobileInput.getValues(), data = { id: this.productId, country_code: countryCode };
+      mobile !== '' && (data['mobile'] = mobile);
+      this.email.value !== '' && (data['email'] = this.email.value);
+      await this.validateform({ mobile: mobile, email: this.email.value });
+      return this.btn.load()
+        .then(() => this.btn.disable())
+        .then(() => salla.api.product.availabilitySubscribe(data))
+        .then(() => this.isSubscribed = true) //no need to wait until finishing alert animation
+        .then(() => this.btn.stop())
+        .then(() => this.modal.hide())
+        .catch(() => this.btn.stop() && this.btn.enable());
+    };
+    // helpers
+    this.typing = (e, submitMethod) => {
+      const error = e.target.nextElementSibling;
+      e.target.classList.remove('s-has-error');
+      (error === null || error === void 0 ? void 0 : error.classList.contains('s-product-availability-error-msg')) && (error.innerText = '');
+      e.key == 'Enter' && submitMethod();
+    };
     if (this.isUser) {
       return;
     }
     this.channelsWatcher(this.channels);
     this.title_ = this.host.title || salla.lang.get('pages.products.notify_availability_title');
     this.host.removeAttribute('title');
+    salla.event.on('languages::translations.loaded', () => {
+      var _a;
+      this.title_ = this.host.title || salla.lang.get('pages.products.notify_availability_title');
+      this.subscribeText = salla.lang.get('common.elements.submit');
+      this.cancelText = salla.lang.get('common.elements.cancel');
+      this.subTitle = salla.lang.get('pages.products.notify_availability_subtitle');
+      this.mobileLabel = salla.lang.get('common.elements.mobile');
+      this.emailLabel = salla.lang.get('common.elements.email');
+      this.emailPlaceholder = salla.lang.get('common.elements.email_placeholder');
+      this.subscribedMessage = salla.lang.get('pages.products.notify_availability_success');
+      this.buttonText = salla.lang.get('pages.products.notify_availability');
+      this.emailErrorMsg = salla.lang.get('common.elements.email_is_valid');
+      (_a = this.modal) === null || _a === void 0 ? void 0 : _a.setTitle(this.title_);
+    });
   }
   channelsWatcher(newValue) {
     this.channels_ = newValue.split(',');
   }
-  async submit() {
-    if (this.isUser) {
-      return salla.api.product.availabilitySubscribe(this.productId)
-        .then(() => this.isSubscribed = true);
-    }
-    let data = { id: this.productId, country_code: this.countryCode };
-    if (this.mobile.value !== '') {
-      data['mobile'] = this.mobile.value;
+  async validateform(data) {
+    if (this.channels_.includes('email') && !data.mobile) {
+      const isEmailValid = Helper.isValidEmail(this.email.value);
+      if (isEmailValid)
+        return;
+      !isEmailValid && this.validateField(this.email, this.emailErrorMsg);
     }
-    if (this.email.value !== '') {
-      data['email'] = this.email.value;
+    if (this.channels_.includes('sms') && !data.email) {
+      const isPhoneValid = await this.mobileInput.isValid();
+      if (isPhoneValid)
+        return;
     }
-    return this.btn.load()
-      .then(() => this.btn.disable())
-      .then(() => salla.api.product.availabilitySubscribe(data))
-      .then(() => this.isSubscribed = true) //no need to wait until finishing alert animation
-      .then(() => this.btn.stop())
-      .then(() => this.modal.hide())
-      .catch(() => this.btn.stop() && this.btn.enable());
+    throw ('Please insert required fields');
+  }
+  validateField(field, errorMsg) {
+    field.classList.add('s-has-error');
+    field.nextElementSibling['innerText'] = '* ' + errorMsg;
   }
   render() {
     return (h(Host, null,
       this.isSubscribed
-        ? h("div", { class: "s-product-availability-subscribed" }, this.subscribedMessage)
+        ? h("div", { class: "s-product-availability-subscribed" },
+          h("i", { class: "sicon-bell-ring s-product-availability-subs-icon" }),
+          " ",
+          this.subscribedMessage)
         : h("slot", null,
           h("salla-button", { wide: true, onClick: () => this.isUser ? this.submit() : this.modal.show() }, this.buttonText)),
       this.isUser || this.isSubscribed ? '' : this.renderModal()));
   }
   renderModal() {
-    return (h("salla-modal", { ref: modal => this.modal = modal, title: this.title_, subTitle: this.subTitle, icon: "sicon-bell-ring", width: "md" },
+    return (h("salla-modal", { ref: modal => this.modal = modal, title: this.title_, subTitle: this.subTitle, icon: "sicon-bell-ring", width: "sm" },
       h("div", { class: "s-product-availability-body" },
         this.channels_.includes('email') ? [
           h("label", { class: "s-product-availability-label" }, this.emailLabel),
-          h("input", { class: "s-product-availability-input", placeholder: this.emailPlaceholder, ref: el => this.email = el, type: "email" })
+          h("input", { class: "s-product-availability-input", onKeyDown: e => this.typing(e, this.submit), placeholder: this.emailPlaceholder, ref: el => this.email = el, type: "email" }),
+          h("span", { class: "s-product-availability-error-msg" })
         ] : '',
         this.channels_.includes('sms') ? [
           h("label", { class: "s-product-availability-label" }, this.mobileLabel),
-          h("input", { class: "s-product-availability-input", placeholder: this.mobilePlaceholder, ref: el => this.mobile = el, type: "text" }),
-          h("input", { type: "hidden", value: this.countryCode }),
+          h("salla-tel-input", { ref: el => this.mobileInput = el, onKeyDown: e => this.typing(e, this.submit) })
         ] : ''),
       h("div", { slot: "footer", class: "s-product-availability-footer" },
-        h("salla-button", { wide: true, ref: btn => this.btn = btn, onClick: () => this.submit() }, this.subscribeText),
-        h("salla-button", { wide: true, "btn-style": "outline" }, this.cancelText))));
+        h("salla-button", { wide: true, "btn-style": "outline", onClick: () => this.modal.hide() }, this.cancelText),
+        h("salla-button", { "loader-position": 'center', wide: true, ref: btn => this.btn = btn, onClick: () => this.submit() }, this.subscribeText))));
   }
   static get is() { return "salla-product-availability"; }
   static get properties() { return {
@@ -88,168 +118,6 @@ export class SallaProductAvailability {
       "attribute": "channels",
       "reflect": false
     },
-    "buttonText": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "button-text",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('pages.products.notify_availability')"
-    },
-    "countryCode": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "country-code",
-      "reflect": false,
-      "defaultValue": "salla.config.country_code || 'SA'"
-    },
-    "subscribeText": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "subscribe-text",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('common.elements.submit')"
-    },
-    "cancelText": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "cancel-text",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('common.elements.cancel')"
-    },
-    "subTitle": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "sub-title",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('pages.products.notify_availability_subtitle')"
-    },
-    "mobileLabel": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "mobile-label",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('common.elements.mobile')"
-    },
-    "emailLabel": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "email-label",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('common.elements.email')"
-    },
-    "mobilePlaceholder": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "mobile-placeholder",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('common.elements.mobile_placeholder')"
-    },
-    "emailPlaceholder": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "email-placeholder",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('common.elements.email_placeholder')"
-    },
     "productId": {
       "type": "number",
       "mutable": false,
@@ -266,25 +134,7 @@ export class SallaProductAvailability {
       },
       "attribute": "product-id",
       "reflect": false,
-      "defaultValue": "salla.config.page.id"
-    },
-    "subscribedMessage": {
-      "type": "string",
-      "mutable": false,
-      "complexType": {
-        "original": "string",
-        "resolved": "string",
-        "references": {}
-      },
-      "required": false,
-      "optional": false,
-      "docs": {
-        "tags": [],
-        "text": ""
-      },
-      "attribute": "subscribed-message",
-      "reflect": false,
-      "defaultValue": "salla.lang.get('pages.products.notify_availability_success')"
+      "defaultValue": "salla.get('page.id')"
     },
     "isSubscribed": {
       "type": "boolean",
@@ -305,23 +155,17 @@ export class SallaProductAvailability {
       "defaultValue": "false"
     }
   }; }
-  static get methods() { return {
-    "submit": {
-      "complexType": {
-        "signature": "() => Promise<any>",
-        "parameters": [],
-        "references": {
-          "Promise": {
-            "location": "global"
-          }
-        },
-        "return": "Promise<any>"
-      },
-      "docs": {
-        "text": "",
-        "tags": []
-      }
-    }
+  static get states() { return {
+    "subscribeText": {},
+    "cancelText": {},
+    "subTitle": {},
+    "mobileLabel": {},
+    "emailLabel": {},
+    "emailPlaceholder": {},
+    "subscribedMessage": {},
+    "title_": {},
+    "buttonText": {},
+    "emailErrorMsg": {}
   }; }
   static get elementRef() { return "host"; }
   static get watchers() { return [{

package/dist/collection/components/salla-rating/salla-rating.js

@@ -10,7 +10,7 @@ export class SallaRating {
   }
   async show() {
     return this.modal.show()
-      .then(() => salla.feedback.api.order(salla.get('page.id')))
+      .then(() => salla.feedback.api.order(salla.config.get('page.id')))
       .then(res => this.order = res.data)
       .then(() => this.modal.setTitle(salla.lang.get('pages.rating.rate_order') + ' <span class="unicode">(#' + this.order.id + ')</span>'))
       .then(() => this.modal.stopLoading())
@@ -142,7 +142,7 @@ export class SallaRating {
     if (Object.keys(data).length == 0) {
       return;
     }
-    data['order_id'] = salla.get('page.id');
+    data['order_id'] = salla.config.get('page.id');
     data['type'] = this.currentTab.dataset.type;
     this.submitted.push(this.currentIndex);
     return salla.feedback.api[this.currentTab.dataset.type](data);
@@ -175,7 +175,7 @@ export class SallaRating {
             this.order.testimonials_enabled ?
               h("div", { class: "rating-outer-form s-rating-step-wrap s-rating-step s-rating-hidden", "data-type": "store" },
                 h("div", { class: "s-rating-rounded-icon" },
-                  h("img", { src: salla.get('store.logo'), alt: "store name", class: "s-rating-store-logo" })),
+                  h("img", { src: salla.config.get('store.logo'), alt: "store name", class: "s-rating-store-logo" })),
                 h("h2", { class: "s-rating-title" }, salla.lang.get('pages.rating.rate_the_store')),
                 h("div", { class: "s-rating-stars-company" },
                   " ",