From afcabc4d4af41e163bc2271b7139935fba330e3a Mon Sep 17 00:00:00 2001
From: "allen.chang" <allennchang@gmail.com>
Date: Wed, 25 May 2022 10:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0apple=20pay=20=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=E6=96=B9=E5=BC=8F=20=E5=8F=8A=E5=9C=93=E5=A4=A2?=
 =?UTF-8?q?=E5=88=86=E6=9C=9F,30N=20=E5=88=86=E6=9C=9F=E6=9C=9F=E6=95=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ECPAY_Payment_node_js/.idea/workspace.xml     | 68 ++++++++++---------
 ECPAY_Payment_node_js/README.md               | 34 ++++++++++
 .../example/aio_check_out_applepay.js         | 57 ++++++++++++++++
 .../example/aio_check_out_credit_divide.js    |  3 +-
 .../example/aio_check_out_credit_onetime.js   |  1 -
 .../lib/ecpay_payment/ECpayPayment.xml        |  8 +--
 .../lib/ecpay_payment/payment_client.js       | 12 ++--
 7 files changed, 136 insertions(+), 47 deletions(-)
 create mode 100644 ECPAY_Payment_node_js/README.md
 create mode 100644 ECPAY_Payment_node_js/example/aio_check_out_applepay.js

diff --git a/ECPAY_Payment_node_js/.idea/workspace.xml b/ECPAY_Payment_node_js/.idea/workspace.xml
index f07ef3e..e517c53 100644
--- a/ECPAY_Payment_node_js/.idea/workspace.xml
+++ b/ECPAY_Payment_node_js/.idea/workspace.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="409ed412-104a-48cf-bca2-7cb9a860bea1" name="Default" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -34,47 +33,44 @@
   </component>
   <component name="ProjectId" id="1Y11qkgWiS3fCqEwUV30d1NaNnc" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="JavaScriptWeakerCompletionTypeGuess" value="true" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="javascript.nodejs.core.library.configured.version" value="10.16.2" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
+    <property name="javascript.nodejs.core.library.configured.version" value="14.15.1" />
+    <property name="javascript.nodejs.core.library.typings.version" value="14.18.18" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/example" />
+    <property name="nodejs_interpreter_path" value="node" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="settings.editor.selected.configurable" value="settings.nodejs" />
+    <property name="vue.rearranger.settings.migration" value="true" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\AIOAPPLEPAY\ECPAY_Payment_node_js\example" />
       <recent name="C:\Users\snami.chen.ECPAY\Downloads\TLS1.0_TEST\ECPAY\Payment\ECPayAIO_Node.js-master\ECPayAIO_Node.js-master\ECPAY_Payment_node_js\example" />
     </key>
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager" selected="Node.js.query_credit_single.js">
-    <configuration name="aio_check_out_credit_period.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="aio_check_out_credit_period.js" working-dir="$PROJECT_DIR$/example">
+  <component name="RunManager" selected="Node.js.aio_check_out_credit_divide.js">
+    <configuration name="aio_check_out_applepay.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/example/aio_check_out_applepay.js" working-dir="$PROJECT_DIR$/example">
       <method v="2" />
     </configuration>
-    <configuration name="create_server_order.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="create_server_order.js" working-dir="$PROJECT_DIR$/example">
+    <configuration name="aio_check_out_credit_divide.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/example/aio_check_out_credit_divide.js" working-dir="$PROJECT_DIR$/example">
       <method v="2" />
     </configuration>
-    <configuration name="query_credit_period.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="query_credit_period.js" working-dir="$PROJECT_DIR$/example">
+    <configuration name="aio_check_out_credit_onetime.js" type="NodeJSConfigurationType" temporary="true" nameIsGenerated="true" path-to-js-file="$PROJECT_DIR$/example/aio_check_out_credit_onetime.js" working-dir="$PROJECT_DIR$/example">
       <method v="2" />
     </configuration>
-    <configuration name="query_credit_single.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="query_credit_single.js" working-dir="$PROJECT_DIR$/example">
+    <configuration name="aio_check_out_credit_period.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="aio_check_out_credit_period.js" working-dir="$PROJECT_DIR$/example">
       <method v="2" />
     </configuration>
-    <configuration name="query_trade_info.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="query_trade_info.js" working-dir="$PROJECT_DIR$/example">
+    <configuration name="query_credit_single.js" type="NodeJSConfigurationType" temporary="true" path-to-js-file="query_credit_single.js" working-dir="$PROJECT_DIR$/example">
       <method v="2" />
     </configuration>
     <configuration default="true" type="js.build_tools.gulp">
@@ -87,22 +83,23 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Node.js.create_server_order.js" />
-      <item itemvalue="Node.js.query_credit_period.js" />
       <item itemvalue="Node.js.query_credit_single.js" />
-      <item itemvalue="Node.js.query_trade_info.js" />
       <item itemvalue="Node.js.aio_check_out_credit_period.js" />
+      <item itemvalue="Node.js.aio_check_out_credit_onetime.js" />
+      <item itemvalue="Node.js.aio_check_out_applepay.js" />
+      <item itemvalue="Node.js.aio_check_out_credit_divide.js" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Node.js.query_credit_single.js" />
-        <item itemvalue="Node.js.query_credit_period.js" />
+        <item itemvalue="Node.js.aio_check_out_credit_divide.js" />
         <item itemvalue="Node.js.aio_check_out_credit_period.js" />
-        <item itemvalue="Node.js.query_trade_info.js" />
-        <item itemvalue="Node.js.create_server_order.js" />
+        <item itemvalue="Node.js.aio_check_out_applepay.js" />
+        <item itemvalue="Node.js.aio_check_out_credit_onetime.js" />
+        <item itemvalue="Node.js.query_credit_single.js" />
       </list>
     </recent_temporary>
   </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SvnConfiguration">
     <configuration />
   </component>
@@ -123,6 +120,8 @@
       <workItem from="1535074863516" duration="565000" />
       <workItem from="1535075466586" duration="6532000" />
       <workItem from="1582095480066" duration="179000" />
+      <workItem from="1653269186041" duration="1424000" />
+      <workItem from="1653271426241" duration="26000" />
     </task>
     <task id="LOCAL-00001" summary="fix AioCheckOut ATM Parameter Issue">
       <created>1499138360726</created>
@@ -172,20 +171,19 @@
     </todo-panel>
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="3" />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
     <option name="TAB_STATES">
       <map>
         <entry key="MAIN">
           <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
+            <State />
           </value>
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="fix AioCheckOut ATM Parameter Issue" />
@@ -195,4 +193,8 @@
     <MESSAGE value="fix example aio_capture leak arguments" />
     <option name="LAST_COMMIT_MESSAGE" value="fix example aio_capture leak arguments" />
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>
\ No newline at end of file
diff --git a/ECPAY_Payment_node_js/README.md b/ECPAY_Payment_node_js/README.md
new file mode 100644
index 0000000..4830bca
--- /dev/null
+++ b/ECPAY_Payment_node_js/README.md
@@ -0,0 +1,34 @@
+# 綠界 全方位(All In One)金流介接Node.js 第一版
+---
+
+## 1. 介紹
+
+  - 綠界對於有收款需求的會員，提供完整的交易介接API，並有多種收款方式(All In One)可選擇使用。 本套件為Node.js版，可使用作建立訂單，接受付款通知，查詢訂單等金流交易的應用。
+  - 收款方式清單：
+    - 信用卡(一次付清、分期付款、定期定額)
+    - 網路ATM
+    - ATM櫃員機
+    - 超商代碼
+    - 超商條碼
+    - Apple Pay
+    - Google Pay (須特別申請才能使用)(原Android Pay)
+
+
+## 2. 安裝環境
+  - node-v6.11.0-x64  以上
+  - ECMA Script6
+ 
+
+## 3. 使用教學
+  - 使用者文件放置於Doc資料夾內，可供參閱
+  
+
+
+## 4. 聯絡我們
+  - 綠界技術服務工程師信箱: techsupport@ecpay.com.tw
+
+
+
+
+[//]: # (These are reference links used in the body of this note and get stripped out when the markdown processor does its job. There is no need to format nicely because it shouldn't be seen. Thanks SO - http://stackoverflow.com/questions/4823468/store-comments-in-markdown-syntax)
+
diff --git a/ECPAY_Payment_node_js/example/aio_check_out_applepay.js b/ECPAY_Payment_node_js/example/aio_check_out_applepay.js
new file mode 100644
index 0000000..e5efc09
--- /dev/null
+++ b/ECPAY_Payment_node_js/example/aio_check_out_applepay.js
@@ -0,0 +1,57 @@
+/**
+ * Created by ying.wu on 2017/6/27.
+ */
+const ecpay_payment = require('../lib/ecpay_payment.js')
+//參數值為[PLEASE MODIFY]者，請在每次測試時給予獨特值
+//若要測試非必帶參數請將base_param內註解的參數依需求取消註解 //
+let base_param = {
+  MerchantTradeNo: 'PLEASE MODIFY', //請帶20碼uid, ex: f0a0d7e9fae1bb72bc93
+  MerchantTradeDate: 'PLEASE MODIFY', //ex: 2017/02/13 15:45:30
+  TotalAmount: '100',
+  TradeDesc: '測試交易描述',
+  ItemName: '測試商品等',
+  ReturnURL: 'http://192.168.0.1',
+  // ChooseSubPayment: '',
+  // OrderResultURL: 'http://192.168.0.1/payment_result',
+  // NeedExtraPaidInfo: '1',
+  // ClientBackURL: 'https://www.google.com',
+  // ItemURL: 'http://item.test.tw',
+  // Remark: '交易備註',
+  // HoldTradeAMT: '1',
+  // StoreID: '',
+  // CustomField1: '',
+  // CustomField2: '',
+  // CustomField3: '',
+  // CustomField4: ''
+}
+
+
+// 若要測試開立電子發票，請將inv_params內的"所有"參數取消註解 //
+let inv_params = {
+  // RelateNumber: 'PLEASE MODIFY',  //請帶30碼uid ex: SJDFJGH24FJIL97G73653XM0VOMS4K
+  // CustomerID: 'MEM_0000001',  //會員編號
+  // CustomerIdentifier: '',   //統一編號
+  // CustomerName: '測試買家',
+  // CustomerAddr: '測試用地址',
+  // CustomerPhone: '0123456789',
+  // CustomerEmail: 'johndoe@test.com',
+  // ClearanceMark: '2',
+  // TaxType: '1',
+  // CarruerType: '',
+  // CarruerNum: '',
+  // Donation: '2',
+  // LoveCode: '',
+  // Print: '1',
+  // InvoiceItemName: '測試商品1|測試商品2',
+  // InvoiceItemCount: '2|3',
+  // InvoiceItemWord: '個|包',
+  // InvoiceItemPrice: '35|10',
+  // InvoiceItemTaxType: '1|1',
+  // InvoiceRemark: '測試商品1的說明|測試商品2的說明',
+  // DelayDay: '0',
+  // InvType: '07'
+}
+const options = require('../conf/config-example'),
+  create = new ecpay_payment(options),
+  htm = create.payment_client.aio_check_out_applepay(parameters = base_param, invoice = inv_params)
+console.log(htm)
\ No newline at end of file
diff --git a/ECPAY_Payment_node_js/example/aio_check_out_credit_divide.js b/ECPAY_Payment_node_js/example/aio_check_out_credit_divide.js
index 8a708de..c2822c7 100644
--- a/ECPAY_Payment_node_js/example/aio_check_out_credit_divide.js
+++ b/ECPAY_Payment_node_js/example/aio_check_out_credit_divide.js
@@ -54,8 +54,7 @@ let inv_params = {
 }
 
 const inst = '12', //分期期數
-  amt = 100, //分期總金額
   options = require('../conf/config-example')
 create = new ecpay_payment(options),
-  htm = create.payment_client.aio_check_out_credit_divide(parameters = base_param, invoice = inv_params, installment = inst, amount = amt)
+  htm = create.payment_client.aio_check_out_credit_divide(parameters = base_param, invoice = inv_params, installment = inst)
 console.log(htm)
\ No newline at end of file
diff --git a/ECPAY_Payment_node_js/example/aio_check_out_credit_onetime.js b/ECPAY_Payment_node_js/example/aio_check_out_credit_onetime.js
index f0e43a2..364084a 100644
--- a/ECPAY_Payment_node_js/example/aio_check_out_credit_onetime.js
+++ b/ECPAY_Payment_node_js/example/aio_check_out_credit_onetime.js
@@ -5,7 +5,6 @@ const ecpay_payment = require('../lib/ecpay_payment.js')
 //參數值為[PLEASE MODIFY]者，請在每次測試時給予獨特值
 //若要測試非必帶參數請將base_param內註解的參數依需求取消註解 //
 let base_param = {
-
   MerchantTradeNo: 'PLEASE MODIFY', //請帶20碼uid, ex: f0a0d7e9fae1bb72bc93
   MerchantTradeDate: 'PLEASE MODIFY', //ex: 2017/02/13 15:45:30
   TotalAmount: '100',
diff --git a/ECPAY_Payment_node_js/lib/ecpay_payment/ECpayPayment.xml b/ECPAY_Payment_node_js/lib/ecpay_payment/ECpayPayment.xml
index f35cdbd..85dec30 100644
--- a/ECPAY_Payment_node_js/lib/ecpay_payment/ECpayPayment.xml
+++ b/ECPAY_Payment_node_js/lib/ecpay_payment/ECpayPayment.xml
@@ -46,6 +46,7 @@
       <param  type="Opt"  require="1" name="ChoosePayment">
         <option>ALL</option>
           <!-- <option>GooglePay</option>--><!--2019/09/30暫時關閉GooglePay付款方式-->
+          <option>ApplePay</option>
           <option>Credit</option>
           <condparam owner="Credit">
           <!--Reqirement checking of following credit card related sub parameter would be handled in
@@ -73,12 +74,7 @@
 				<option>2</option>
             </param>
             <param type="String"  require="0" name="CreditInstallment" category="Divide">
-                <pattern>^(3|6|12|18|24){1}(,3|,6|,12|,18|,24){0,4}$</pattern>
-            </param>
-            <param type="Int"  require="0" name="InstallmentAmount" category="Divide">
-                <mode>GE</mode> <!--BETWEEN, GE, LE, EXCLUDE  -->
-                <maximum></maximum>
-                <minimal>1</minimal>
+                <pattern>^(3|6|12|18|24|30N){1}(,3|,6|,12|,18|,24|,30N){0,5}$</pattern>
             </param>
             <param type="Int"  require="0" name="PeriodAmount" category="Period">
                 <mode>GE</mode> <!--BETWEEN, GE, LE, EXCLUDE  -->
diff --git a/ECPAY_Payment_node_js/lib/ecpay_payment/payment_client.js b/ECPAY_Payment_node_js/lib/ecpay_payment/payment_client.js
index 6105ece..778bb4e 100644
--- a/ECPAY_Payment_node_js/lib/ecpay_payment/payment_client.js
+++ b/ECPAY_Payment_node_js/lib/ecpay_payment/payment_client.js
@@ -24,7 +24,12 @@ class ECpayPaymentClient{
         let html = this._aiochkout_pos_proc(parameters);
         return html;
     }
-
+    aio_check_out_applepay(parameters, invoice={}){
+        let unsupport = [];
+        this._aiochkout_base_proc(parameters, invoice, unsupport, 'ApplePay');
+        let html = this._aiochkout_pos_proc(parameters);
+        return html;
+    }
     aio_check_out_credit_onetime(parameters, invoice={}){
         let unsupport = [];
         this._aiochkout_base_proc(parameters, invoice, unsupport, 'Credit');
@@ -39,13 +44,10 @@ class ECpayPaymentClient{
         return html;
     }*/
 
-    aio_check_out_credit_divide(parameters, invoice={}, installment, amount){
+    aio_check_out_credit_divide(parameters, invoice={}, installment){
         let unsupport = ['IgnorePayment', 'Redeem', 'PeriodAmount', 'PeriodType', 'Frequency', 'ExecTimes', 'PeriodReturnURL'];
         this._aiochkout_base_proc(parameters, invoice, unsupport, 'Credit');
         parameters['CreditInstallment'] = installment;
-        if (parseInt(parameters['TotalAmount']) !== parseInt(amount)){
-            parameters['InstallmentAmount'] = amount;
-        }
         let html = this._aiochkout_pos_proc(parameters);
         return html;
     }