Merge branch 'cheng' of http://10.10.1.6:3080/masada-admin/httpdocs into cheng

wms/bonus/other/maintenance_contract_bonus_v2_1.php

@@ -47,7 +47,7 @@ function maintenance_contract_bonus_v2_1($ver, $contract_type, $payment_period,
 	$bonus_array = [];
 	if ($ver == "2.1") {
 		// $discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 2);
-		$discount = round(($fee_per_st - $commission_fee) / $elevator_list_price, 10);
+		$discount = ($fee_per_st - $commission_fee) / $elevator_list_price;
 
 		#契約總類($contract_type)：新簽約(new)、免保轉有費(free_to_charge)、續簽約(原價或僅契約金額異動)(renew_priceissue)
 		switch ($contract_type) {

wms/contract/api/getContractData.php

@@ -191,7 +191,7 @@ if (isset($_GET['contractno']) && $_GET['contractno'] != '' && isset($_GET['cont
         header('Content-Type: application/json');
 
         // 將 JSON 回應返回給客戶端
-        echo $contractResponse;
+        // echo $contractResponse;
     } catch (PDOException $e) {
         die("ERROR!!!: " . $e->getMessage());
     }

wms/contract/api/postNewContractData.php

@@ -324,6 +324,8 @@ function BounsCount($data, $conn, $facilityno)
 
 
 
+
+
   $result_bonus = [];
   $result_bonus_arr = [];
   if ($signing_date <= $bonus_v1_0_date) {

wms/contract/contract-input.php

@@ -59,6 +59,8 @@ $contractpersons = $stmt->fetchAll(PDO::FETCH_ASSOC);
                             <td class="text-right" style='border-left:0px;'>
                                 <!-- <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
                                 <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button> -->
+                                <!-- <button type="button" id="btn_close" class="btn btn-default" onclick="window.history.back();">返回</button>
+                                <button type="button" id="btn_close" class="btn btn-default" onclick="window.close();">關閉分頁</button> -->
                             </td>
                         </tr>
                         <tr>