佐川の配送時間帯の変更と、管理画面での都道府県のプルダウンの順番が「三重県」から始まっているのを修正

Signed-off-by: kimono <maeda@obitastar.co.jp>
zencart-ja · May 14, 2014 · a1e90a1 · a1e90a1
1 parent e6ce62f
commit a1e90a1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/admin/includes/functions/general.php b/admin/includes/functions/general.php
@@ -808,10 +808,12 @@ function zen_get_countries($default = '') {
   function zen_get_country_zones($country_id) {
     global $db;
     $zones_array = array();
+// -> for jp : CHANGE "order by zone_name" to "order by zone_id"
     $zones = $db->Execute("select zone_id, zone_name
                            from " . TABLE_ZONES . "
                            where zone_country_id = '" . (int)$country_id . "'
-                           order by zone_name");
+                           order by zone_id");
+// <- for jp : CHANGE "order by zone_name" to "order by zone_id"
 
     while (!$zones->EOF) {
       $zones_array[] = array('id' => $zones->fields['zone_id'],

diff --git a/admin/includes/functions/html_output.php b/admin/includes/functions/html_output.php
@@ -155,10 +155,12 @@ function zen_js_zone_list($country, $form, $field) {
         $output_string .= '  } else if (' . $country . ' == "' . $countries->fields['zone_country_id'] . '") {' . "\n";
       }
 
+// -> for jp : CHANGE "order by zone_name" to "order by zone_id"
       $states = $db->Execute("select zone_name, zone_id
                               from " . TABLE_ZONES . "
                               where zone_country_id = '" . $countries->fields['zone_country_id'] . "'
-                              order by zone_name");
+                              order by zone_id");
+// <- for jp : CHANGE "order by zone_name" to "order by zone_id"
 
 
       $num_state = 1;

diff --git a/includes/languages/japanese/modules/shipping/sagawaex.php b/includes/languages/japanese/modules/shipping/sagawaex.php
@@ -33,9 +33,12 @@
 // 時間帯サービス
 $GLOBALS['a_sagawaex_time']=array(
   array('id'=>'希望なし',  'text'=>'希望なし'),
-  array('id'=>'午前中',    'text'=>'午前中'),
-  array('id'=>'12時～15時','text'=>'12時～15時'),
-  array('id'=>'15時～18時','text'=>'15時～18時'),
+  array('id'=>'午前中（8時～12時）',    'text'=>'午前中（8時～12時）'),
+  array('id'=>'12時～14時','text'=>'12時～14時'),
+  array('id'=>'14時～16時','text'=>'14時～16時'),
+  array('id'=>'16時～18時','text'=>'16時～18時'),
+  array('id'=>'18時～20時','text'=>'18時～20時'),
   array('id'=>'18時～21時','text'=>'18時～21時'),
+  array('id'=>'19時～21時','text'=>'19時～21時'),
 );
 ?>