- Fix translation

- Fix error display
reactioncommerce · Oct 25, 2017 · 8ab74e0 · 8ab74e0
1 parent 214c958
commit 8ab74e0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/imports/plugins/core/accounts/client/templates/profile/userOrdersList.js b/imports/plugins/core/accounts/client/templates/profile/userOrdersList.js
@@ -28,9 +28,12 @@ function getOrders() {
 Template.userOrdersList.helpers({
   hasData(data) {
     if (data.hash.data) {
-      return data.hash.data;
+      if (data.hash.data.count() > 0) {
+        return true;
+      }
+      return false;
     }
-    return true;
+    return false;
   },
 
   // Returns React Component

diff --git a/imports/plugins/core/checkout/client/components/completedOrderSummary.js b/imports/plugins/core/checkout/client/components/completedOrderSummary.js
@@ -13,11 +13,10 @@ import ShopOrderSummary from "./shopOrderSummary";
  * @return {Node} React node containing the order summary broken down by shop
  */
 const CompletedOrderSummary = ({ shops, orderSummary, isProfilePage }) => {
-  const title = isProfilePage ? "Order Summary" : "Your Items";
   return (
     <div>
       <div className="order-details-content-title">
-        <p><Components.Translation defaultValue={title} i18nKey={title || "cartCompleted.yourCart"} /></p>
+        <p><Components.Translation defaultValue="Order Summary" i18nKey={"cartCompleted.orderSummary"} /></p>
       </div>
       <div className="order-details-info-box">
         {shops.map((shop) => {

diff --git a/imports/plugins/core/checkout/server/i18n/en.json b/imports/plugins/core/checkout/server/i18n/en.json
@@ -7,7 +7,7 @@
         "limitedSupply": "Limited supply"
       },
       "cartCompleted": {
-        "yourCart": "Your Cart",
+        "orderSummary": "Order Summary",
         "discountTotal": "Discount Total",
         "orderTotal": "Order Total",
         "fulfilledBy": "Fulfilled by",