From fdec650464aa158c9e5499f5fc721019014e0ef4 Mon Sep 17 00:00:00 2001 From: Joelthorner Date: Thu, 21 Mar 2019 12:22:53 +0100 Subject: [PATCH 1/6] Fix HTML id: [10] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confirmación de pedido --- src/app/data/app-language-en.ts | 365 ++++++++++++++++---------------- 1 file changed, 181 insertions(+), 184 deletions(-) diff --git a/src/app/data/app-language-en.ts b/src/app/data/app-language-en.ts index 5a6f6f7..03d3167 100644 --- a/src/app/data/app-language-en.ts +++ b/src/app/data/app-language-en.ts @@ -560,213 +560,210 @@ export const LANGUAGE_EN = { Order confirmation
Dear %%firstName%% %%lastname%%,
- We confirm your order has been processed correctly.
Please find your order attached as a PDF file.
- Your order details - - - - - - - - - - - - - - - - - ` }, // end 10 From 0031385cd720777cf76c31e1da68a0a7a5a77d67 Mon Sep 17 00:00:00 2001 From: Joelthorner Date: Thu, 21 Mar 2019 12:25:01 +0100 Subject: [PATCH 2/6] Fix HTML id: [10] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confirmación de pedido --- src/app/data/app-language-zho.ts | 369 +++++++++++++++---------------- 1 file changed, 183 insertions(+), 186 deletions(-) diff --git a/src/app/data/app-language-zho.ts b/src/app/data/app-language-zho.ts index 010da29..cf7d76c 100644 --- a/src/app/data/app-language-zho.ts +++ b/src/app/data/app-language-zho.ts @@ -551,216 +551,213 @@ export const LANGUAGE_ZHO = { - - - + + + + + + +
- - - - - - -
- Nº Order:
- Order date:
- State:
- 		- %%orderNumber%%
- %%orderDate%%
- Confirmed
-
-
- - - - - -
- Billing Address:
- %%firstName%% %%lastName%%
- %%address%%
- %%zip%% %%city%%
- %%state%%
- 		- Shipping Address:
- %%shippingFirstName%% %%shippingLastName%%
- %%shippingAddress%%
- %%shippingZip%% %%shippingCity%%
- %%shippingState%%
-
-
 
Order details
 
-
- - - - - - - - - - - - - - + Your order details + + + + + + + + + + + +
ProductQuantityPrice
- - - - - -
- %name% - - %name% -
%productOptions%
-
- 		%quantity%%price%
+ + + + + + + + + + + + + - - - - - - - - - - - -
+ + + - - - - - - - - - - -
+ Nº Order:
+ Order date:
+ State:
+
- - - - - -
- %name% - - %name% -
- 		%quantity% 
- - - - - - - - - - + + +
%%shipperName%% %%shippingTypeName%% - - %%shippingMethodWithPrice%% - -
%%paymentMethod%% - - %%paymentMethodPrice%% - -
+ %%orderNumber%%
+ %%orderDate%%
+ Confirmed
+
+
+ + + + + +
+ Billing Address:
+ %%firstName%% %%lastName%%
+ %%address%%
+ %%zip%% %%city%%
+ %%state%%
+ 		+ Shipping Address:
+ %%shippingFirstName%% %%shippingLastName%%
+ %%shippingAddress%%
+ %%shippingZip%% %%shippingCity%%
+ %%shippingState%%
+
+
 
Order details
 
+
+ + - - + + + - + - - + + + + + - - - - - - - - - - - - + + - -
Discounts - - - %%orderDiscounts%% - - ProductQuantityPrice
Subtotal - - %%orderTotalWithoutTaxes%% - + + + + + + +
+ %name% + + %name% +
%productOptions%
+
%quantity%%price%
Taxes - - %%orderTaxes%% - -
Vouchers - - - %%orderBalanceCodes%% - -
Total - - %%total%% - + + + + + + +
+ %name% + + %name% +
%quantity% 
-
-
 
- + + + +
+ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- Comments:
- %%orderComments%% + 		%%shipperName%% %%shippingTypeName%% + + %%shippingMethodWithPrice%% + +
%%paymentMethod%% + + %%paymentMethodPrice%% + +
Discounts + + - %%orderDiscounts%% + +
Subtotal + + %%orderTotalWithoutTaxes%% + +
Taxes + + %%orderTaxes%% +
Vouchers + + - %%orderBalanceCodes%% + +
Total + + %%total%% + +
-
 
- + + + + + + + - -
 
+ -
- %%textToEmail%% + + Comments:
+ %%orderComments%% +
-
-
 
+ + + + +
+ %%textToEmail%% +
+
+
- 確認訂單
- 亲爱的 %%firstName%% %%lastname%%,
- + 確認訂單
+ 亲爱的 %%firstName%% %%lastname%%,
您的订单已确认并正确处理成功。
已将订单信息以pdf的格式发送给您。
- 注意查收并查看您的订单详情。 -
- - - - - - - - - - - - - ` }, // end 10 From 61a3e0037827238b102d39001c0dba6cef183133 Mon Sep 17 00:00:00 2001 From: Joelthorner Date: Thu, 21 Mar 2019 12:26:26 +0100 Subject: [PATCH 3/6] Fix HTML id: [10] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confirmación de pedido --- src/app/data/app-language-chi.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/app/data/app-language-chi.ts b/src/app/data/app-language-chi.ts index 813f9a2..4078c9e 100644 --- a/src/app/data/app-language-chi.ts +++ b/src/app/data/app-language-chi.ts @@ -530,6 +530,13 @@ export const LANGUAGE_CHI = { name: 'Confirmación de pedido', subject: '确认订单', html: ` + - - - + ` }, // end 10 From 88df7f9c9b0d72759677b73ab769b30da8946063 Mon Sep 17 00:00:00 2001 From: Joelthorner Date: Thu, 21 Mar 2019 12:34:58 +0100 Subject: [PATCH 5/6] Fix HTML id: [10] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confirmación de pedido --- src/app/data/app-language-sv.ts | 225 +++++++++++++++++++++++++++++--- 1 file changed, 210 insertions(+), 15 deletions(-) diff --git a/src/app/data/app-language-sv.ts b/src/app/data/app-language-sv.ts index a4649b0..ffae70d 100644 --- a/src/app/data/app-language-sv.ts +++ b/src/app/data/app-language-sv.ts @@ -779,28 +779,223 @@ export const LANGUAGE_SV = { + + + + + + - -
- - - - - - -
- 订单编号
- 订单日期
- 订单状态
- 		- %%orderNumber%%
- %%orderDate%%
- 已确认
-
-
- - - - - -
- 支付账号
- %%firstName%% %%lastName%%
- %%address%%
- %%zip%% %%city%%
- %%state%%
- 		- 邮寄地址
- %%shippingFirstName%% %%shippingLastName%%
- %%shippingAddress%%
- %%shippingZip%% %%shippingCity%%
- %%shippingState%%
-
-
 
订单详情
 
-
- - - - - - - - - - - - - - - - - - - - - - - - + 注意查收并查看您的订单详情。 + + + + + + + + + + + +
产品名 （款式）数量价格
- - - - - -
- %name% - - %name% -
%productOptions%
-
- 		%quantity%%price%
- - - - - -
- %name% - - %name% -
- 		%quantity% 
+ + + + + + + + + + + + + - - - - - - - - - - - -
+ + + - -
+ 订单编号
+ 订单日期
+ 订单状态
+
- - - - - - - - - - + + +
%%shipperName%% %%shippingTypeName%% - - %%shippingMethodWithPrice%% - -
%%paymentMethod%% - - %%paymentMethodPrice%% - -
+ %%orderNumber%%
+ %%orderDate%%
+ 已确认
+
+
+ + + + + +
+ 支付账号
+ %%firstName%% %%lastName%%
+ %%address%%
+ %%zip%% %%city%%
+ %%state%%
+ 		+ 邮寄地址
+ %%shippingFirstName%% %%shippingLastName%%
+ %%shippingAddress%%
+ %%shippingZip%% %%shippingCity%%
+ %%shippingState%%
+
+
 
订单详情
 
+
+ + - - + + + - + - - + + + + + - - - - - - - - - - - - + + + + -
折扣 - - - %%orderDiscounts%% - - 产品名 （款式）数量价格
小計 - - %%orderTotalWithoutTaxes%% - + + + + + + +
+ %name% + + %name% +
%productOptions%
+
%quantity%%price%
稅收 - - %%orderTaxes%% - -
優惠券 - - - %%orderBalanceCodes%% - -
總 - - %%total%% - + + + + + + +
+ %name% + + %name% +
%quantity% 
-
-
 
- + +
+ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- 订单评论
- %%orderComments%% + 		%%shipperName%% %%shippingTypeName%% + + %%shippingMethodWithPrice%% + +
%%paymentMethod%% + + %%paymentMethodPrice%% + +
折扣 + + - %%orderDiscounts%% + +
小計 + + %%orderTotalWithoutTaxes%% + +
稅收 + + %%orderTaxes%% + +
優惠券 + + - %%orderBalanceCodes%% +
總 + + %%total%% + +
-
 
- + + + + + + + - -
 
+ -
- %%textToEmail%% + + 订单评论
+ %%orderComments%% +
-
-
 
+ + + + +
+ %%textToEmail%% +
+
+
确认订单
From ebb1d5819cecd09bbcb1f2c9ebb2114a329fb9f4 Mon Sep 17 00:00:00 2001 From: Joelthorner Date: Thu, 21 Mar 2019 12:33:14 +0100 Subject: [PATCH 4/6] Fix HTML id: [10] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Confirmación de pedido --- src/app/data/app-language-ko.ts | 368 ++++++++++++++++---------------- 1 file changed, 187 insertions(+), 181 deletions(-) diff --git a/src/app/data/app-language-ko.ts b/src/app/data/app-language-ko.ts index ac2a4b8..cad582f 100644 --- a/src/app/data/app-language-ko.ts +++ b/src/app/data/app-language-ko.ts @@ -525,201 +525,208 @@ export const LANGUAGE_KO = { name: 'Confirmación de pedido', subject: '주문을 확인하기', html: ` +
주문을 확인하기
안녕허세요 %%firstName%% %%lastname%%,
- 주문이 올바르게 식별하고 성공적으로 처리되었습니다.
- 주문 정보는 pdf 형식으로 발송되었습니다
- 주의하세요. 당신의 주문서를 보고 확인하세요 -
- - - - +
- + 주문이 올바르게 식별하고 성공적으로 처리되었습니다.
+ 주문 정보는 pdf 형식으로 발송되었습니다
+ 주의하세요. 당신의 주문서를 보고 확인하세요 + + + + + - -
+ + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - -
+ + + + + +
+ 주문 번호:
+ 주문 날짜:
+ 주문 상태 :
+ 		+ %%orderNumber%%
+ %%orderDate%%
+ 확인되었습니다
+
+
+ + + + + +
+ 지불 계정 :
+ %%firstName%% %%lastName%%
+ %%address%%
+ %%zip%% %%city%%
+ %%state%%
+ 		+ 비송주소:
+ %%shippingFirstName%% %%shippingLastName%%
+ %%shippingAddress%%
+ %%shippingZip%% %%shippingCity%%
+ %%shippingState%%
+
+
 
주문 정보
 
+
+ + - - + + + -
- 주문 번호:
- 주문 날짜:
- 주문 상태 :
- 		- %%orderNumber%%
- %%orderDate%%
- 확인되었습니다
- 		제품 이름 (모텔)수량<가격
-
- + - - + + -
- 지불 계정 :
- %%firstName%% %%lastName%%
- %%address%%
- %%zip%% %%city%%
- %%state%%
- 		- 비송주소:
- %%shippingFirstName%% %%shippingLastName%%
- %%shippingAddress%%
- %%shippingZip%% %%shippingCity%%
- %%shippingState%%
+ 		+ + + + + +
+ %name% + + %sku% - %name% +
%quantity%%price%
-
 
주문 정보
 
-
- - - - - - - - - - - - - - - - - - - - - - - - + - -
제품 이름 (모텔)수량<가격
- - - - - -
- %name% - - %sku% - %name% -
- 		%quantity%%price%
- - - - - -
- %name% - - %name% -
- 		%quantity% 
- - - - - + + - - - - - - - + + - + + - - - - + +
%%shipperName%% %%shippingTypeName%% - - %%shippingMethodWithPrice%% - -
%%paymentMethod%% - - %%paymentMethodPrice%% - -
할인 - - - %%orderDiscounts%% - + + + + + + +
+ %name% + + %name% +
%quantity% 
소계 - - %%orderTotalWithoutTaxes%% - -
+ + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + -
%%shipperName%% %%shippingTypeName%% + + %%shippingMethodWithPrice%% + +
%%paymentMethod%% + + %%paymentMethodPrice%% + +
할인 + + - %%orderDiscounts%% + +
속이기 - - %%orderTaxes%% - -
바우처 - - - %%orderBalanceCodes%% - -
합계 - - %%total%% - -
소계 + + %%orderTotalWithoutTaxes%% + +
-
-
 
- - - + + + + + + + + + + + + + - -
- 주문 평가:
- %%orderComments%% +
속이기 + + %%orderTaxes%% + +
바우처 + + - %%orderBalanceCodes%% + +
합계 + + %%total%% + +
-
 
 
+ + + + +
+ 주문 평가:
+ %%orderComments%% +
+
 
@@ -730,11 +737,10 @@ export const LANGUAGE_KO = {
-
+
+
+ Orderbekräftelse från %%ecommerceName%%
+ + Hej %%firstName%% %%lastname%%,
+ + Tack för att du handlar hos oss. Vi bekräftar härmed att er order har behandlats.
+ Vi kommer att maila er när er order levereras. Vi bifogar även din order i den inkluderade pdf filen.

+ Din order + +
+ + + + + + + + + + + + + - - - - - + + + + + - -
+ + + + + + +
+ Ordernummer:
+ Order datum:
+ Status:
+ 		+ %%orderNumber%%
+ %%orderDate%%
+ Bekräftad
+
+
+ + + + + +
+ Faktura adress:
+ %%firstName%% %%lastName%%
+ %%address%%
+ %%zip%% %%city%%
+ %%state%%
+ 		+ Leveransadress:
+ %%shippingFirstName%% %%shippingLastName%%
+ %%shippingAddress%%
+ %%shippingZip%% %%shippingCity%%
+ %%shippingState%%
+
+
 
Orderdetaljer
 
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
ProduktAntalPris
+ + + + + +
+ %name% + + %name% +
%productOptions%
+
+ 		%quantity%%price%
+ + + + + +
+ %name% + + %name% +
+ 		%quantity% 
-
 
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
%%shipperName%% %%shippingTypeName%% + + %%shippingMethodWithPrice%% + +
%%paymentMethod%% + + %%paymentMethodPrice%% + +
Discount + + - %%orderDiscounts%% + +
Subtotal + + %%orderTotalWithoutTaxes%% + +
Taxes + + %%orderTaxes%% + +
Vouchers + + - %%orderBalanceCodes%% + +
Totalt + + %%total%% + +
+ +
 
+ -
- %%textToEmail%% + + Kommentarer:
+ %%orderComments%% +
-
-
 
+ + + + +
+ %%textToEmail%% +
+
+ ` }, // end 10 From e0ac3f988feb617108d9820e99b95d2dd9aa9d83 Mon Sep 17 00:00:00 2001 From: joelthorner Date: Thu, 21 Mar 2019 21:52:24 +0100 Subject: [PATCH 6/6] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8431ae0..0213f59 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "emilio-generator", - "version": "2.0.0", + "version": "2.0.1", "scripts": { "ng": "ng", "start": "ng serve",