Merge branch 'feature/pay'

webht/third_party/paypal/controllers/index.php

@@ -1321,6 +1321,13 @@ class Index extends CI_Controller {
         echo json_encode('没找到数据！');
     }
 
+    public function get_export_record_currency($currency)
+    {
+        // $currency = $this->input->get_post('currency');
+        $records = $this->Note_model->list_export_record(0, $currency);
+        return $this->output->set_content_type('application/json')->set_output(json_encode($records));
+    }
+
     public function export_list()
     {
         $from_date = $this->input->post("from_date");

webht/third_party/paypal/models/note_model.php

@@ -185,10 +185,11 @@ class Note_model extends CI_Model {
         $this->info->insert('Transaction_Export_Log', $db);
     }
 
-    public function list_export_record($sn=0)
+    public function list_export_record($sn=0, $currency=null)
     {
         $this->info = $this->load->database('INFO', TRUE);
-        $search_sql = $sn===0 ? "" : " and TEL_SN=$sn ";
+        $search_sql = $sn===0 ? "" : " AND TEL_SN=$sn ";
+        $search_sql .= $currency===null ? "" : " AND TEL_transactionCurrency='" . $currency . "'";
         $sql = "SELECT TOP 10 *
                   FROM [InfoManager].[dbo].[Transaction_Export_Log]
                   WHERE 1=1

webht/third_party/paypal/views/note_list.php

@@ -65,6 +65,23 @@
             </div>
             <div class="modal-body">
                 <form class="form-horizontal" role="form" method="post" id="search_list" action="/webht.php/apps/paypal/index/export_list/">
+                    <div class="form-group row">
+                        <label for="currency" class="col-md-4">Currency</label>
+                        <div class="col-md-16">
+                            <select class="form-control" id="currency" name="currency" required onchange="set_target_currency(this)">
+                                <option value="">所有币种</option>
+                                <option value="CNY">CNY</option>
+                                <option value="USD">USD</option>
+                                <option value="EUR">EUR</option>
+                                <option value="CAD">CAD</option>
+                                <option value="AUD">AUD</option>
+                                <option value="GBP">GBP</option>
+                                <option value="NZD">NZD</option>
+                                <option value="SGD">SGD</option>
+                                <option value="CHF">CHF</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="form-group row">
                         <label for="from_date" class="col-md-4">使用上次</label>
                         <div class="col-md-16">
@@ -97,23 +114,6 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
                             <input type="text" class="form-control" id="to_date" name="to_date" placeholder="结束日期" required>
                         </div>
                     </div>
-                    <div class="form-group row">
-                        <label for="currency" class="col-md-4">Currency</label>
-                        <div class="col-md-16">
-                            <select class="form-control" id="currency" name="currency" required>
-                                <option value="">所有币种</option>
-                                <option value="CNY">CNY</option>
-                                <option value="USD">USD</option>
-                                <option value="EUR">EUR</option>
-                                <option value="CAD">CAD</option>
-                                <option value="AUD">AUD</option>
-                                <option value="GBP">GBP</option>
-                                <option value="NZD">NZD</option>
-                                <option value="SGD">SGD</option>
-                                <option value="CHF">CHF</option>
-                            </select>
-                        </div>
-                    </div>
                     <div class="form-group row">
                         <label for="set_amount" class="col-md-4">总金额(元)</label>
                         <div class="col-md-16">
@@ -285,6 +285,7 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
             $('#from_date').prop("readonly",false);
             $('#to_date').prop("readonly",false).parents('.form-group').show();
             $("#to_date").datepicker( "option", "disabled", false );
+            $("#currency").prop("disabled", false);
         } else {
             var this_date = select.value.split('@')[1];
             $('#from_date').val(this_date).prop("readonly",true);
@@ -293,7 +294,7 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
             $("#to_date" ).datepicker( "option", "disabled", true );
             $("#set_amount").prop("required", true);
             $("#currency option[value='" + select.value.split('@')[2] + "']").prop("selected", true);
-            $("#currency").prop("disabled", true);
+            // $("#currency").prop("disabled", true);
         }
     }
 
@@ -307,6 +308,32 @@ echo "<option value=\"$vf->TEL_SN@" . strstr($vf->TEL_transactionDate, " ", true
         }
     }
 
+    function set_target_currency(currency) {
+        if (currency.value=='') {
+            return false;
+        }
+        $.ajax({
+            type: "get",
+            dataType: "json",
+            url: '<?php echo site_url('apps/paypal/index/get_export_record_currency/'); ?>' + '/' + currency.value,
+            success: function(data, textStatus) {
+                let new_option = '<option value="">选择一个开始记录</option>';
+                for (let i = 0; i < data.length; i++) {
+                    new_option += `<option value="${data[i].TEL_SN}@${data[i].TEL_transactionDate.substr(0,10)}@${data[i].TEL_transactionCurrency}"> [${data[i].TEL_exportDate.substr(0,10)}] ${data[i].TEL_transactionCurrency} ${data[i].TEL_transactionAmount}-${data[i].TEL_exportAmount} / ${data[i].TEL_orderId} / ${data[i].TEL_transactionDate.substr(0,16)}</option>`;
+                }
+                $('#date_history').find('option').remove();
+                $('#date_history').append(new_option);
+                $('#from_date').val('').prop("readonly",false);
+                $("#from_date").datepicker( "option", "disabled", false );
+                $('#to_date').prop("readonly",false).parents('.form-group').show();
+                $("#to_date").datepicker( "option", "disabled", false );
+            },
+            error: function(msg) {
+                alert('\u53d1\u751f\u9519\u8bef\uff0c\u8bf7\u8054\u7cfbYoyo...');
+            }
+        });
+    }
+
     function show_order_modal(pn_txn_id, pn_invoice) {
         $.ajax({
             type: "get",