Merge branch 'master' into feature/america

client/src/translations/en_us/common.json

@@ -1020,6 +1020,7 @@
 				"cancel": "Cancel",
 				"clear": "Clear",
 				"close": "Close",
+				"copied": "Copied!",
 				"copylink": "Copy Link",
 				"create": "Create",
 				"delete": "Delete",
@@ -1036,6 +1037,7 @@
 				"saveandnew": "Save and New",
 				"selectall": "Select All",
 				"send": "Send",
+				"sendbysms": "Send by SMS",
 				"senderrortosupport": "Send Error to Support",
 				"submit": "Submit",
 				"tryagain": "Try Again",
@@ -1097,6 +1099,7 @@
 				"passwordsdonotmatch": "The passwords you have entered do not match.",
 				"print": "Print",
 				"refresh": "Refresh",
+				"reports": "Reports",
 				"required": "Required",
 				"saturday": "Saturday",
 				"search": "Search...",
@@ -1196,24 +1199,25 @@
 		},
 		"job_payments": {
 			"buttons": {
-				"goback": "Cancel",
+				"goback": "Go Back",
 				"proceedtopayment": "Proceed to Payment",
 				"refundpayment": "Refund Payment"
 			},
 			"notifications": {
 				"error": {
 					"description": "Please try again. Make sure the refund amount does not exceeds the payment amount.",
-					"title": "Error Refunding Payment"
+					"openingip": "Error connecting to IntelliPay service.",
+					"title": "Error placing refund"
 				}
 			},
 			"titles": {
 				"amount": "Amount",
-				"dateOfPayment": "Date",
-				"descriptions": "Description",
+				"dateOfPayment": "Date of Payment",
+				"descriptions": "Payment Details",
 				"payer": "Payer",
 				"payername": "Payer Name",
-				"paymentid": "Payment ID",
-				"paymenttype": "Type",
+				"paymentid": "Payment Reference ID",
+				"paymenttype": "Payment Type",
 				"refundamount": "Refund Amount",
 				"transactionid": "Transaction ID"
 			}
@@ -1934,7 +1938,7 @@
 				"customers": "Customers",
 				"dashboard": "Dashboard",
 				"enterbills": "Enter Bills",
-				"entercardpayment": "Enter Card Payments",
+				"entercardpayment": "New Card Charge",
 				"enterpayment": "Enter Payments",
 				"entertimeticket": "Enter Time Tickets",
 				"export": "Export",
@@ -1946,7 +1950,6 @@
 				"newjob": "Create New Job",
 				"owners": "Owners",
 				"parts-queue": "Parts Queue",
-				"paymentremindersms": "Send Payment Reminder via SMS",
 				"phonebook": "Phonebook",
 				"productionboard": "Production Board - Visual",
 				"productionlist": "Production Board - List",
@@ -2232,6 +2235,9 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": "Generate Payment Link"
+			},
 			"errors": {
 				"exporting": "Error exporting payment(s). {{error}}",
 				"exporting-partner": "Error exporting to partner. Please check the partner interaction log for more errors."
@@ -2261,6 +2267,7 @@
 				"markforreexport": "Mark for Re-export",
 				"new": "New Payment",
 				"signup": "Please contact support to sign up for electronic payments.",
+				"smspaymentreminder": "This is {{shopname}} reminding you about your balance of {{amount}}. To pay, click the following link {{payment_link}}.",
 				"title": "Payments",
 				"totalpayments": "Total Payments"
 			},

client/src/translations/es/common.json

@@ -63,7 +63,6 @@
 				"scheduledfor": "Cita programada para:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
-				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -1020,6 +1019,7 @@
 				"cancel": "",
 				"clear": "",
 				"close": "",
+				"copied": "",
 				"copylink": "",
 				"create": "",
 				"delete": "Borrar",
@@ -1036,6 +1036,7 @@
 				"saveandnew": "",
 				"selectall": "",
 				"send": "",
+				"sendbysms": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1097,6 +1098,7 @@
 				"passwordsdonotmatch": "",
 				"print": "",
 				"refresh": "",
+				"reports": "",
 				"required": "",
 				"saturday": "",
 				"search": "Buscar...",
@@ -1203,6 +1205,7 @@
 			"notifications": {
 				"error": {
 					"description": "",
+					"openingip": "",
 					"title": ""
 				}
 			},
@@ -1946,7 +1949,6 @@
 				"newjob": "",
 				"owners": "propietarios",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -2232,6 +2234,9 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": ""
+			},
 			"errors": {
 				"exporting": "",
 				"exporting-partner": ""
@@ -2261,6 +2266,7 @@
 				"markforreexport": "",
 				"new": "",
 				"signup": "",
+				"smspaymentreminder": "",
 				"title": "",
 				"totalpayments": ""
 			},

client/src/translations/fr/common.json

@@ -63,7 +63,6 @@
 				"scheduledfor": "Rendez-vous prévu pour:",
 				"severalerrorsfound": "",
 				"smartscheduling": "",
-				"smspaymentreminder": "",
 				"suggesteddates": ""
 			},
 			"successes": {
@@ -1020,6 +1019,7 @@
 				"cancel": "",
 				"clear": "",
 				"close": "",
+				"copied": "",
 				"copylink": "",
 				"create": "",
 				"delete": "Effacer",
@@ -1036,6 +1036,7 @@
 				"saveandnew": "",
 				"selectall": "",
 				"send": "",
+				"sendbysms": "",
 				"senderrortosupport": "",
 				"submit": "",
 				"tryagain": "",
@@ -1097,6 +1098,7 @@
 				"passwordsdonotmatch": "",
 				"print": "",
 				"refresh": "",
+				"reports": "",
 				"required": "",
 				"saturday": "",
 				"search": "Chercher...",
@@ -1203,6 +1205,7 @@
 			"notifications": {
 				"error": {
 					"description": "",
+					"openingip": "",
 					"title": ""
 				}
 			},
@@ -1946,7 +1949,6 @@
 				"newjob": "",
 				"owners": "Propriétaires",
 				"parts-queue": "",
-				"paymentremindersms": "",
 				"phonebook": "",
 				"productionboard": "",
 				"productionlist": "",
@@ -2232,6 +2234,9 @@
 			}
 		},
 		"payments": {
+			"actions": {
+				"generatepaymentlink": ""
+			},
 			"errors": {
 				"exporting": "",
 				"exporting-partner": ""
@@ -2261,6 +2266,7 @@
 				"markforreexport": "",
 				"new": "",
 				"signup": "",
+				"smspaymentreminder": "",
 				"title": "",
 				"totalpayments": ""
 			},