Merge branch 'release-2.0.2' of https://github.com/think-ahead/mobile…

…stationbeautyphp into ticket-#5001-kirei-add-facility-master # Conflicts: # app/controllers/components/misc_function.php
think-mcunanan · Sep 11, 2020 · 2921f32 · 2921f32
2 parents 64e1752 + 78fe05c
commit 2921f32
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/app/controllers/components/misc_function.php b/app/controllers/components/misc_function.php
@@ -1847,12 +1847,12 @@ function GetAvailableFacilities(&$controller, $dbname, $storecode)
             array(
                 "FACILITYID" => 1,
                 "FACILITYNAME" => "Facility 1",
-                "ACCEPTABLECOUNT" => DEFAULT_FACILITY_ACCEPTABLECOUNT
+                "ROWS" => DEFAULT_FACILITY_ROWS
             ),
             array(
                 "FACILITYID" => 2,
                 "FACILITYNAME" => "Facility 2",
-                "ACCEPTABLECOUNT" => DEFAULT_FACILITY_ACCEPTABLECOUNT
+                "ROWS" => DEFAULT_FACILITY_ROWS
             ),
         );
     }

diff --git a/app/controllers/servers_controller.php b/app/controllers/servers_controller.php
@@ -1311,7 +1311,8 @@ class ServersController extends WebServicesController
             'SEX'              => 'xsd:int',
             'YOYAKU_DISPLAY'   => 'xsd:int',
             'WEB_DISPLAY'      => 'xsd:int',
-            'KANZASHI_ENABLED' => 'xsd:int',
+            'KANZASHI_ENABLED' => 'xsd:boolean',
+            'KANZASHI_SALON_POS_ID' => 'xsd:int',
             'ROWS'             => 'xsd:int',
             'PHONEROWS'        => 'xsd:int',
             'DISPLAY_ORDER'    => 'xsd:int',
@@ -4244,7 +4245,7 @@ function wsSearchStaff($sessionid, $param)
             "StaffAssignToStore.KEYNO",
             "StaffAssignToStore.ASSIGN_YOYAKU",
             "StaffAssignToStore.WEBYAN_DISPLAY",
-            "StaffAssignToStore.KANZASHI_ENABLED",
+            "StaffAssignToStore.KANZASHI_SALON_POS_ID",
             "StaffAssignToStore.ASSIGN",
             "StaffAssignToStore.DISPLAY_ORDER"
         );
@@ -4270,7 +4271,8 @@ function wsSearchStaff($sessionid, $param)
             $v[$i]['Staff']['SUBLEVELNAME'] = $v[$i]['Sublevel']['SUBLEVELNAME'];
             $v[$i]['Staff']['POSITIONNAME'] = $v[$i]['Position']['POSITIONNAME'];
             $v[$i]['Staff']['WEB_DISPLAY'] = $v[$i]['StaffAssignToStore']['WEBYAN_DISPLAY'];
-            $v[$i]['Staff']['KANZASHI_ENABLED'] = $v[$i]['StaffAssignToStore']['KANZASHI_ENABLED'];
+            $v[$i]['Staff']['KANZASHI_ENABLED'] = !is_null($v[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID']);
+            $v[$i]['Staff']['KANZASHI_SALON_POS_ID'] = $v[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'];
             $v[$i]['Staff']['YOYAKU_DISPLAY'] = $v[$i]['StaffAssignToStore']['ASSIGN_YOYAKU'];
         }
 
@@ -4367,7 +4369,7 @@ function wsSearchAvailableStaff($sessionid, $param)
 		            Staff.STAFFNAME,
 		            Store.STORENAME,
                     IF (Staff.STORECODE = StaffAssignToStore.STORECODE OR Staff.STAFFCODE = 0, StaffAssignToStore.WEBYAN_DISPLAY, 0) AS WEBYAN_DISPLAY,
-                    IF (Staff.STORECODE = StaffAssignToStore.STORECODE OR Staff.STAFFCODE = 0, StaffAssignToStore.KANZASHI_ENABLED, 0) AS KANZASHI_ENABLED,
+                    IF (Staff.STORECODE = StaffAssignToStore.STORECODE OR Staff.STAFFCODE = 0, StaffAssignToStore.KANZASHI_SALON_POS_ID, 0) AS KANZASHI_SALON_POS_ID,
                     IFNULL(StaffRowsHistory.ROWS, " . DEFAULT_ROWS . ") as origrows,
 		            IFNULL(StaffRowsHistory.PHONEROWS, " . DEFAULT_PHONEROWS . ") as origphonerows,
 		            IFNULL(StaffRowsHistory.ROWS, " . DEFAULT_ROWS . ") as ROWS,
@@ -4475,7 +4477,8 @@ function wsSearchAvailableStaff($sessionid, $param)
             }
 
             $v[$i]['StaffAssignToStore']['WEB_DISPLAY'] = $v[$i][0]['WEBYAN_DISPLAY'];
-            $v[$i]['StaffAssignToStore']['KANZASHI_ENABLED'] = $v[$i][0]['KANZASHI_ENABLED'];
+            $v[$i]['StaffAssignToStore']['KANZASHI_ENABLED'] = !is_null($v[$i][0]['KANZASHI_SALON_POS_ID']);
+            $v[$i]['StaffAssignToStore']['KANZASHI_SALON_POS_ID'] = $v[$i][0]['KANZASHI_SALON_POS_ID'];
             $v[$i]['StaffAssignToStore']['STORENAME']  = $v[$i]['Store']['STORENAME'];
             if (
                 $v[$i][0]['ROWS'] == "" ||
@@ -4718,7 +4721,6 @@ function wsSearchStaffRowsHistory($sessionid, $storecode, $staffcode)
         );
     }
 
-
     /**
      * スタッフの追加と更新機能
      * Adds or Updates a staff
@@ -4995,22 +4997,22 @@ function wsUpdateFlagsStaff($sessionid, $param)
         $this->StaffAssignToStore->set_company_database($storeinfo['dbname'], $this->StaffAssignToStore);
 
         $sql = "
-            INSERT INTO staff_assign_to_store (STORECODE, STAFFCODE, WEBYAN_DISPLAY, KANZASHI_ENABLED, ASSIGN_YOYAKU, DISPLAY_ORDER)
-                VALUES(:storecode, :staffcode, :web_display, :kanzashi_enabled, :yoyaku_display, :display_order)
+            INSERT INTO staff_assign_to_store (STORECODE, STAFFCODE, WEBYAN_DISPLAY, KANZASHI_SALON_POS_ID, ASSIGN_YOYAKU, DISPLAY_ORDER)
+                VALUES(:storecode, :staffcode, :web_display, :kanzashi_salon_pos_id, :yoyaku_display, :display_order)
             ON DUPLICATE KEY
             UPDATE
                 WEBYAN_DISPLAY = :web_display,
-                KANZASHI_ENABLED = :kanzashi_enabled,
+                KANZASHI_SALON_POS_ID = :kanzashi_salon_pos_id,
                 ASSIGN_YOYAKU = :yoyaku_display,
                 DISPLAY_ORDER = :display_order";
 
         $params = array(
             "storecode" => $storeinfo['storecode'],
             "staffcode" => $param['STAFFCODE'],
             "web_display" => $param['WEB_DISPLAY'],
-            "kanzashi_enabled" => $param['KANZASHI_ENABLED'],
+            "kanzashi_salon_pos_id" => $param['KANZASHI_ENABLED'] ? $param['KANZASHI_SALON_POS_ID'] : null,
             "yoyaku_display" => $param['YOYAKU_DISPLAY'],
-            "display_order" => $param['DISPLAY_ORDER'] === '' ? 'NULL' : $param['DISPLAY_ORDER'],
+            "display_order" => $param['DISPLAY_ORDER'] === '' ? 'NULL' : $param['DISPLAY_ORDER']
         );
 
         $this->StaffAssignToStore->query($sql, $params, false);