Merge branch 'master' of tzw/fcs into master

2020-06-29 14:21:46 +00:00
parent 934a4c6fa4 8e65a533db
commit 71ec259fc7
25 changed files with 746 additions and 136 deletions
--- a/assets/local/localization_en.json
+++ b/assets/local/localization_en.json
@@ -570,8 +570,9 @@

    "customer.list.title":"CUSTOMERS",
    "customer.form.title":"CUSTOMER",
+    "customer.invite":"Invite",

-    "contact": "CONTACTS",
+    "contact": "CONTACT US",

    "fcs.btn": "FCS Profile",
    "fcs.profile": "FCS PROFILE",
@@ -594,6 +595,8 @@

    "discount.btn":"Discounts",
    "discount.title":"Discounts",
-    "discount.new":"Discount"
+    "discount.new":"DISCOUNT",
+
+    "custom.form.title":"CUSTOM"

 }