rebase main

wms/bons/api/get.php

@@ -54,7 +54,7 @@ if (!empty($_GET['contract_no'])) {
     $stmt->execute();
     $result = $stmt->fetch(PDO::FETCH_ASSOC);
     $count = COUNT($result);
-    $data['maintain_month'] = intval($conunt * $result['Squantity'])
+    $data['maintain_month'] = intval($conunt * $result['Squantity']);
 
 
 

wms/mkt/pricereview-create.php

@@ -2061,7 +2061,7 @@ if($_SERVER["REQUEST_METHOD"] == "POST"){
                                 <td name="Exclusions"></td>
                                 <td name="mn_relate_facil" nowrap>
                                     <input type="hidden" name="item_group" value="E">
-                                    <a href="javascript:void(0);" name="btnfaci" class="btn btn-danger btn-sm">電梯</a>
+                                    <a href="javascript:void(0);" name="F" class="btn btn-danger btn-sm">電梯</a>
                                     <a href="javascript:void(0);" name="btndel3" class="btn btn-danger btn-sm">X</a>
                                 </td>
                             </tr>
@@ -2563,6 +2563,7 @@ include "../footer.php";
         $("#optionModal").modal('hide');
 
     }
+
     function checkSubmit() {
         const price_total = document.getElementById('price_total')
 

wms/mkt/pricereview-index.php

@@ -332,14 +332,10 @@ function get_pending($token)
 
 $result = get_pending($token);
 // print_r($result);
-<<<<<<< HEAD
 if (count($result) > 0) {
     $result[1]['sid'] = !empty($result) ? $result[1]['sid'] : 'prm';
     $result[1]['fid'] = !empty($result) ? $result[1]['fid'] : 'prm01';
 }
-=======
-
->>>>>>> 5b4e2536 (0125)
 
 if ($data) :
     /*