reactioncommerce · aldeed · Nov 26, 2018 · Nov 21, 2018 · Nov 21, 2018 · Nov 21, 2018
diff --git a/imports/plugins/core/catalog/client/containers/publishContainer.js b/imports/plugins/core/catalog/client/containers/publishContainer.js
@@ -11,7 +11,6 @@ import PublishControls from "../components/publishControls";
  */
 class PublishContainer extends Component {
   publishToCatalog(collection, documentIds) {
-    Meteor.call("taxes/updateTaxCode", this.props.documents);
     Meteor.call(`catalog/publish/${collection}`, documentIds, (error, result) => {
       if (result) {
         Alerts.toast(i18next.t("admin.catalogProductPublishSuccess", { defaultValue: "Product published to catalog" }), "success");

diff --git a/imports/plugins/core/checkout/client/components/addEmail.js b/imports/plugins/core/checkout/client/components/addEmail.js
diff --git a/imports/plugins/core/checkout/client/components/completedOrder.js b/imports/plugins/core/checkout/client/components/completedOrder.js
@@ -4,7 +4,6 @@ import { Components } from "@reactioncommerce/reaction-components";
 import CompletedShopOrders from "./completedShopOrders";
 import CompletedOrderPaymentMethod from "./completedOrderPaymentMethods";
 import CompletedOrderSummary from "./completedOrderSummary";
-import AddEmail from "./addEmail";
 
 /**
  * @summary Displays a summary/information about the order the user has just completed
@@ -36,8 +35,10 @@ const CompletedOrder = ({ order, paymentMethods, isProfilePage }) => {
         {/* This is the left side / main content */}
         <h3><Components.Translation defaultValue="Thank You" i18nKey={"cartCompleted.thankYou"} /></h3>
         <p><strong>Order ID </strong>{order._id}</p>
-        {/* show a different message depending on whether we have an email or not */}
-        <AddEmail order={order} orderEmail={order.email} />
+        <p>
+          <Components.Translation defaultValue="Order updates will be sent to" i18nKey="cartCompleted.trackYourDelivery" />
+          &nbsp;<strong>{order.email}</strong>
+        </p>
         {/* This is the left side / main content*/}
       </div>
     );

diff --git a/imports/plugins/core/core/server/methods/shop/getBaseLanguage.js b/imports/plugins/core/core/server/methods/shop/getBaseLanguage.js
diff --git a/imports/plugins/core/core/server/methods/shop/getCurrencyRates.js b/imports/plugins/core/core/server/methods/shop/getCurrencyRates.js
diff --git a/imports/plugins/core/core/server/methods/shop/getLocale.js b/imports/plugins/core/core/server/methods/shop/getLocale.js
@@ -72,7 +72,6 @@ export default function getLocale() {
 
   // localeCurrency is an array of allowed currencies
   _.each(localeCurrency, (currency) => {
-    let exchangeRate;
     if (shop.currencies[currency]) {
       result.currency = shop.currencies[currency];
       // only fetch rates if locale and shop currency are not equal
@@ -82,10 +81,8 @@ export default function getLocale() {
         const exchangeConfig = settings.openexchangerates || {};
 
         if (exchangeConfig.appId) {
-          exchangeRate = Meteor.call("shop/getCurrencyRates", currency);
-
-          if (typeof exchangeRate === "number") {
-            result.currency.exchangeRate = exchangeRate;
+          if (typeof result.currency.rate === "number") {
+            result.currency.exchangeRate = result.currency.rate;
           } else {
             Logger.warn("Failed to get currency exchange rates.");
           }

diff --git a/imports/plugins/core/core/server/methods/shop/getWorkflow.js b/imports/plugins/core/core/server/methods/shop/getWorkflow.js
diff --git a/imports/plugins/core/core/server/methods/shop/index.js b/imports/plugins/core/core/server/methods/shop/index.js
@@ -3,10 +3,7 @@ import createShop from "./createShop";
 import createTag from "./createTag";
 import fetchCurrencyRate from "./fetchCurrencyRate";
 import flushCurrencyRate from "./flushCurrencyRate";
-import getBaseLanguage from "./getBaseLanguage";
-import getCurrencyRates from "./getCurrencyRates";
 import getLocale from "./getLocale";
-import getWorkflow from "./getWorkflow";
 import hideHeaderTag from "./hideHeaderTag";
 import locateAddress from "./locateAddress";
 import removeHeaderTag from "./removeHeaderTag";
@@ -32,10 +29,7 @@ export default {
   "shop/createTag": createTag,
   "shop/fetchCurrencyRate": fetchCurrencyRate,
   "shop/flushCurrencyRate": flushCurrencyRate,
-  "shop/getBaseLanguage": getBaseLanguage,
-  "shop/getCurrencyRates": getCurrencyRates,
   "shop/getLocale": getLocale,
-  "shop/getWorkflow": getWorkflow,
   "shop/hideHeaderTag": hideHeaderTag,
   "shop/locateAddress": locateAddress,
   "shop/removeHeaderTag": removeHeaderTag,

diff --git a/imports/plugins/core/email/server/i18n/ar.json b/imports/plugins/core/email/server/i18n/ar.json
@@ -81,7 +81,6 @@
           "saveFailed": "فشل حفظ إعدادات البريد {{error}}",
           "cantSendEmail": "خطأ الخادم: لا يمكن إرسال إشعار البريد الإلكتروني.",
           "emailSent": "إشعار البريد الإلكتروني المرسلة.",
-          "addOrderEmailFailed": "أخفقت إضافة رسالة إلكترونية إلى الطلب",
           "addCartEmailFailed": "أخفقت إضافة البريد الإلكتروني إلى سلة التسوق"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/bg.json b/imports/plugins/core/email/server/i18n/bg.json
@@ -81,7 +81,6 @@
           "saveFailed": "Неуспех при запазване на настройките поща. {{error}}",
           "cantSendEmail": "Грешка в сървъра: Не може да се изпрати уведомление по имейл.",
           "emailSent": "изпратено уведомление Email.",
-          "addOrderEmailFailed": "Добавянето на имейл към поръчката не бе успешно",
           "addCartEmailFailed": "Добавянето на имейл в кошницата не бе успешно"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/cs.json b/imports/plugins/core/email/server/i18n/cs.json
@@ -81,7 +81,6 @@
           "saveFailed": "Nepodařilo se uložit nastavení pošty. {{error}}",
           "cantSendEmail": "Chyba serveru: Nelze odeslat e-mailové oznámení.",
           "emailSent": "Upozornění na e-mail odeslán.",
-          "addOrderEmailFailed": "Přidání e-mailu na objednávku selhalo",
           "addCartEmailFailed": "Přidání e-mailu do košíku se nezdařilo"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/de.json b/imports/plugins/core/email/server/i18n/de.json
@@ -81,7 +81,6 @@
           "saveFailed": "Die E-Mail-Einstellungen konnten nicht gespeichert werden.  {{error}}",
           "cantSendEmail": "Server-Fehler: Kann keine E-Mail-Benachrichtigung senden.",
           "emailSent": "E-Mail-Benachrichtigung gesendet.",
-          "addOrderEmailFailed": "Hinzufügen von E-Mails zur Bestellung fehlgeschlagen",
           "addCartEmailFailed": "Hinzufügen von E-Mails zum Warenkorb fehlgeschlagen"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/el.json b/imports/plugins/core/email/server/i18n/el.json
@@ -81,7 +81,6 @@
           "saveFailed": "Αποτυχία για να αποθηκεύσετε τις ρυθμίσεις αλληλογραφίας. {{error}}",
           "cantSendEmail": "Σφάλμα διακομιστή: Δεν είναι δυνατή η αποστολή ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου.",
           "emailSent": "ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου που αποστέλλονται.",
-          "addOrderEmailFailed": "Η προσθήκη ηλεκτρονικού ταχυδρομείου στην παραγγελία απέτυχε",
           "addCartEmailFailed": "Η προσθήκη ηλεκτρονικού ταχυδρομείου στο καλάθι απέτυχε"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/en.json b/imports/plugins/core/email/server/i18n/en.json
@@ -81,7 +81,6 @@
           "saveFailed": "Failed to save mail settings. {{error}}",
           "cantSendEmail": "Server Error: Can't send email notification.",
           "emailSent": "Email notification sent.",
-          "addOrderEmailFailed": "Adding email to order failed",
           "addCartEmailFailed": "Adding email to cart failed"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/es.json b/imports/plugins/core/email/server/i18n/es.json
@@ -81,7 +81,6 @@
           "saveFailed": "Error al guardar las opciones de correo. {{error}}",
           "cantSendEmail": "Error de servidor: No se puede enviar una notificación por correo electrónico.",
           "emailSent": "notificación por correo electrónico enviado.",
-          "addOrderEmailFailed": "No se pudo agregar el correo electrónico al pedido.",
           "addCartEmailFailed": "Error al agregar el correo electrónico al carro"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/fr.json b/imports/plugins/core/email/server/i18n/fr.json
@@ -81,7 +81,6 @@
           "saveFailed": "Impossible de sauvegarder les paramètres de messagerie. {{error}}",
           "cantSendEmail": "Erreur de serveur: Vous ne pouvez pas envoyer une notification par e-mail.",
           "emailSent": "notification par courrier électronique envoyé.",
-          "addOrderEmailFailed": "L'ajout d'un e-mail à la commande a échoué",
           "addCartEmailFailed": "L'ajout d'un e-mail au panier a échoué"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/hr.json b/imports/plugins/core/email/server/i18n/hr.json
@@ -81,7 +81,6 @@
           "saveFailed": "Neuspjelo spremanje postavki pošte. {{error}}",
           "cantSendEmail": "Pogreška poslužitelja: Ne mogu poslati e-mail obavijesti.",
           "emailSent": "poslao e-mail obavijesti.",
-          "addOrderEmailFailed": "Dodavanje e-pošte na narudžbu nije uspjelo",
           "addCartEmailFailed": "Dodavanje e-pošte u košaricu nije uspjelo"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/hu.json b/imports/plugins/core/email/server/i18n/hu.json
@@ -81,7 +81,6 @@
           "saveFailed": "Nem sikerült menteni mail beállításokat. {{error}}",
           "cantSendEmail": "Szerver hiba: Nem lehet elküldeni e-mail értesítést.",
           "emailSent": "E-mail értesítést küldeni.",
-          "addOrderEmailFailed": "E-mail hozzáadása megrendeléshez nem sikerült",
           "addCartEmailFailed": "E-mail hozzáadása a kosárba nem sikerült"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/it.json b/imports/plugins/core/email/server/i18n/it.json
@@ -81,7 +81,6 @@
           "saveFailed": "Impossibile salvare le impostazioni di posta elettronica. {{error}}",
           "cantSendEmail": "Errore del server: Non è possibile inviare e-mail di notifica.",
           "emailSent": "Email di notifica inviato.",
-          "addOrderEmailFailed": "L'aggiunta dell'email all'ordine non è riuscita",
           "addCartEmailFailed": "L'aggiunta di email al carrello non è riuscita"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/my.json b/imports/plugins/core/email/server/i18n/my.json
@@ -81,7 +81,6 @@
           "saveFailed": "mail settings ကိုကယ်တင်ရန်မအောင်မြင်ခဲ့ပါ။ {{error}}",
           "cantSendEmail": "Server ကိုအမှား: အီးမေးလ်အကြောင်းကြားစာမပို့နိုင်သ။",
           "emailSent": "အီးမေးလ်အကြောင်းကြားစာကိုစေလွှတ်။ ,",
-          "addOrderEmailFailed": "မအောင်မြင်မိန့်အီးမေးလ်ပေါင်းထည့်ခြင်း",
           "addCartEmailFailed": "လှည်းအီးမေးလ်မအောင်မြင်ပါထည့်သွင်းခြင်း"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/nl.json b/imports/plugins/core/email/server/i18n/nl.json
@@ -81,7 +81,6 @@
           "saveFailed": "Kan mail instellingen op te slaan. {{error}}",
           "cantSendEmail": "Server Error: Kan geen email melding sturen.",
           "emailSent": "E-mail melding verzonden.",
-          "addOrderEmailFailed": "Het toevoegen van e-mail naar bestelling mislukt",
           "addCartEmailFailed": "Het toevoegen van e-mail naar cart is mislukt"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/pl.json b/imports/plugins/core/email/server/i18n/pl.json
@@ -81,7 +81,6 @@
           "saveFailed": "Nie udało się zapisać ustawienia poczty. {{error}}",
           "cantSendEmail": "Błąd serwera: nie można wysłać powiadomienie e-mail.",
           "emailSent": "Powiadomienie e-mail wysłana.",
-          "addOrderEmailFailed": "Dodanie poczty e-mail do zamówienia nie powiodło się",
           "addCartEmailFailed": "Dodanie poczty e-mail do koszyka nie powiodło się"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/pt.json b/imports/plugins/core/email/server/i18n/pt.json
@@ -81,7 +81,6 @@
           "saveFailed": "Falha ao guardar definições do correio. {{error}}",
           "cantSendEmail": "Erro de servidor: Não é possível enviar uma notificação de e-mail.",
           "emailSent": "notificação de e-mail enviado.",
-          "addOrderEmailFailed": "Adicionando e-mail ao pedido falhou",
           "addCartEmailFailed": "Adicionar email ao carrinho falhou"
         }
       }

diff --git a/imports/plugins/core/email/server/i18n/ro.json b/imports/plugins/core/email/server/i18n/ro.json
@@ -81,7 +81,6 @@
           "saveFailed": "pentru a salva setările de mail a eșuat. {{error}}",
           "cantSendEmail": "Eroare de server: Nu se poate trimite o notificare de e-mail.",
           "emailSent": "Notificare e-mail trimis.",
-          "addOrderEmailFailed": "Adăugarea e-mailului la comandă a eșuat",
           "addCartEmailFailed": "Adăugarea e-mailului în căruciar a eșuat"
         }
       }