Merge branch 'master' into shopskin

Conflicts: lib/shop.lib.php
2013-07-25 11:16:30 +09:00
parent f135203631 d4821f0724
commit a7f3702567
29 changed files with 293 additions and 812 deletions
--- a/adm/shop_admin/configformupdate.php
+++ b/adm/shop_admin/configformupdate.php
@ -100,7 +100,6 @@ $sql = " update {$g4['shop_default_table']}
                de_card_point               = '$de_card_point',
                de_card_pg                  = '$de_card_pg',
                de_card_max_amount          = '$de_card_max_amount',
-                de_mileage_use              = '$de_mileage_use',
                de_point_settle             = '$de_point_settle',
                de_level_sell               = '$de_level_sell',
                de_send_cost_case           = '$de_send_cost_case',