Merge pull request smarty-php#39 from think-ahead/release-2.0.4

Merge release-2.0.4 release branch into master
think-mcunanan · Jan 12, 2021 · f0906c6 · f0906c6
2 parents e8a1c68 + 701d35d
commit f0906c6
Show file tree

Hide file tree

Showing 6 changed files with 747 additions and 215 deletions.
diff --git a/app/config/require.dev.php b/app/config/require.dev.php
@@ -47,8 +47,4 @@
 define('EMAIL_DOMAIN', 'rctest.bmy.jp');
 
 //-- かんざし設定 --//
-define('KANZASHI_SIGNIN_URL', 'https://kanzashi-stg.pp-dev.org/signin');
-define('KANZASHI_SIGNIN_HASH_KEY', '9rjaDn3TtIeuQxeWwOtlcIweoUrGGVuG0ZI8rjDsYdvs7lLFmBLKYeucEvEoU4BXibpxCLed7h9lKdu6yZM0HueiZz');
-define('KANZASHI_SIGNIN_MEDIA', 'THK');
-define('KANZASHI_SIGNIN_VERSION', 'v1');
 define('KANZASHI_PATH', 'https://rckanzashiapi.sipss.jp');
diff --git a/app/config/require.online.php b/app/config/require.online.php
@@ -46,10 +46,6 @@
 define('EMAIL_DOMAIN', 'bmy.jp');
 
 //-- かんざし設定 --//
-define('KANZASHI_SIGNIN_URL', 'https://kanzashi.com/signin');
-define('KANZASHI_SIGNIN_HASH_KEY', 'vasahGa8Aephix9Goon9cheiMoh9Ahshish7lae1quei9eapi9paighiivieph2porahnei4ao6pha6phaephieFae');
-define('KANZASHI_SIGNIN_MEDIA', 'THK');
-define('KANZASHI_SIGNIN_VERSION', 'v1');
 define('KANZASHI_PATH', 'https://kanzashiapi.sipss.jp');
 
 //-- Webプロキシ --//

diff --git a/app/config/require.rc.php b/app/config/require.rc.php
@@ -44,10 +44,6 @@
 define('EMAIL_DOMAIN', 'rcmail.bmy.jp');
 
 //-- かんざし設定 --//
-define('KANZASHI_SIGNIN_URL', 'https://kanzashi-stg.pp-dev.org/signin');
-define('KANZASHI_SIGNIN_HASH_KEY', '9rjaDn3TtIeuQxeWwOtlcIweoUrGGVuG0ZI8rjDsYdvs7lLFmBLKYeucEvEoU4BXibpxCLed7h9lKdu6yZM0HueiZz');
-define('KANZASHI_SIGNIN_MEDIA', 'THK');
-define('KANZASHI_SIGNIN_VERSION', 'v1');
 define('KANZASHI_PATH', 'https://rckanzashiapi.sipss.jp');
 
 //-- Webプロキシ --//

diff --git a/app/controllers/components/keitai_session.php b/app/controllers/components/keitai_session.php
@@ -1815,7 +1815,9 @@ function GetAvailableTimes(&$controller, $session_info, $servicetime, $LowLimit,
         }
         //-----------------------------------------------------------------------------------
         if ($kanzashiFlag){
-            $kanzashiDetails = $controller->MiscFunction->GetDailyKanzashiCustomersLimit($controller, $session_info['dbname'], $storecode, $sel_date);
+            //Note that since Web yoyaku does not have support for Multiple Kanzashi Account, it will still get the data from the old table.
+            //this should be change when Web Yoyaku can support multiple Kanzashi Account.
+            $kanzashiDetails = $controller->MiscFunction->GetDailyKanzashiCustomersLimitFromOldTable($controller, $session_info['dbname'], $storecode, $sel_date);
             if ($kanzashiDetails) {
 
                 $StoreOpenTime = new DateTime($kanzashiDetails[0]['begin_time']);