Ignore:
Timestamp:
2010/02/01 15:34:04 (14 years ago)
Author:
nanasess
Message:

merged r18472

  • お届けに関わる語句に揺らぎ(#530)
Location:
branches/version-2_4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_4

  • branches/version-2_4/html/install/index.php

    r18165 r18521  
    10471047        lfInsertCSVData(4,'order_birth','生年月日',22,'now()','now()', $dsn); 
    10481048        lfInsertCSVData(4,'order_job','職種',23,'now()','now()', $dsn); 
    1049         lfInsertCSVData(4,'deliv_name01','配送先名前',24,'now()','now()', $dsn); 
    1050         lfInsertCSVData(4,'deliv_name02','配送先名前',25,'now()','now()', $dsn); 
    1051         lfInsertCSVData(4,'deliv_kana01','配送先カナ',26,'now()','now()', $dsn); 
    1052         lfInsertCSVData(4,'deliv_kana02','配送先カナ',27,'now()','now()', $dsn); 
     1049        lfInsertCSVData(4,'deliv_name01','お届け先名前',24,'now()','now()', $dsn); 
     1050        lfInsertCSVData(4,'deliv_name02','お届け先名前',25,'now()','now()', $dsn); 
     1051        lfInsertCSVData(4,'deliv_kana01','お届け先カナ',26,'now()','now()', $dsn); 
     1052        lfInsertCSVData(4,'deliv_kana02','お届け先カナ',27,'now()','now()', $dsn); 
    10531053        lfInsertCSVData(4,'deliv_tel01','電話番号1',28,'now()','now()', $dsn); 
    10541054        lfInsertCSVData(4,'deliv_tel02','電話番号2',29,'now()','now()', $dsn); 
  • branches/version-2_4/html/install/sql/column_comment.sql

    r18115 r18521  
    6666INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_deliv','update_date','更新日時'); 
    6767INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivtime','deliv_id','配送ID'); 
    68 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivtime','time_id','配送時間ID'); 
    69 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivtime','time','配送時間'); 
     68INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivtime','time_id','お届け時間ID'); 
     69INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivtime','time','お届け時間'); 
    7070INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivfee','deliv_id','配送ID'); 
    7171INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_delivfee','fee_id','配送料金ID'); 
     
    399399INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','order_birth','生年月日'); 
    400400INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','order_job','職種'); 
    401 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_name01','配送先名前'); 
    402 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_name02','配送先名前'); 
    403 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_kana01','配送先カナ'); 
    404 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_kana02','配送先カナ'); 
     401INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_name01','お届け先名前'); 
     402INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_name02','お届け先名前'); 
     403INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_kana01','お届け先カナ'); 
     404INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_kana02','お届け先カナ'); 
    405405INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_tel01','電話番号1'); 
    406406INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_tel02','電話番号2'); 
     
    427427INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','payment_method','支払い方法'); 
    428428INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_id','配送業者ID'); 
    429 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_time_id','配送時間ID'); 
    430 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_time','配送時間'); 
     429INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_time_id','お届け時間ID'); 
     430INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_time','お届け時間'); 
    431431INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_no','配送伝票番号'); 
    432432INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','note','SHOPメモ'); 
     
    439439INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','commit_date','発送済みステータスに変更した日'); 
    440440INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','del_flg ','0:既定、1:削除'); 
    441 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_date','配達日'); 
     441INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','deliv_date','お届け日'); 
    442442INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','conveni_data','コンビニ決済情報'); 
    443443INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order','cell01','携帯電話番号1'); 
     
    466466INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','order_birth','生年月日'); 
    467467INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','order_job','職種'); 
    468 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_name01','配送先名前'); 
    469 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_name02','配送先名前'); 
    470 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_kana01','配送先カナ'); 
    471 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_kana02','配送先カナ'); 
     468INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_name01','お届け先名前'); 
     469INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_name02','お届け先名前'); 
     470INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_kana01','お届け先カナ'); 
     471INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_kana02','お届け先カナ'); 
    472472INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_tel01','電話番号1'); 
    473473INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_tel02','電話番号2'); 
     
    494494INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','payment_method','支払い方法(文字列)'); 
    495495INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_id','配送業者ID'); 
    496 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_time_id','配送時間ID'); 
    497 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_time','配送時間(文字列)'); 
     496INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_time_id','お届け時間ID'); 
     497INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_time','お届け時間(文字列)'); 
    498498INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_no','配送伝票番号'); 
    499499INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','note','SHOPメモ'); 
     
    508508INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','update_date','更新日時'); 
    509509INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','del_flg ','0:既定、1:削除'); 
    510 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_date','配達日'); 
     510INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','deliv_date','お届け日'); 
    511511INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','conveni_data','コンビニ決済情報'); 
    512512INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_order_temp','cell01','携帯電話番号1'); 
     
    515515INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','other_deliv_id','別のお届け先ID'); 
    516516INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','customer_id','顧客ID'); 
    517 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','name01','配送先名前'); 
    518 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','name02','配送先名前'); 
    519 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','kana01','配送先カナ'); 
    520 INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','kana02','配送先カナ'); 
     517INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','name01','お届け先名前'); 
     518INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','name02','お届け先名前'); 
     519INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','kana01','お届け先カナ'); 
     520INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','kana02','お届け先カナ'); 
    521521INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','zip01','郵便番号1'); 
    522522INSERT INTO dtb_table_comment(table_name,column_name,description) values ('dtb_other_deliv','zip02','郵便番号2'); 
  • branches/version-2_4/html/install/sql/insert_data.sql

    r18369 r18521  
    154154insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_birth','生年月日',21,now(),now()); 
    155155insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'order_job','職種',22,now(),now()); 
    156 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_name01','配送先名前',23,now(),now()); 
    157 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_name02','配送先名前',24,now(),now()); 
    158 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_kana01','配送先カナ',25,now(),now()); 
    159 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_kana02','配送先カナ',26,now(),now()); 
     156insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_name01','お届け先名前',23,now(),now()); 
     157insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_name02','お届け先名前',24,now(),now()); 
     158insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_kana01','お届け先カナ',25,now(),now()); 
     159insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_kana02','お届け先カナ',26,now(),now()); 
    160160insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_tel01','電話番号1',27,now(),now()); 
    161161insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_tel02','電話番号2',28,now(),now()); 
     
    179179insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'payment_total','お支払い合計',46,now(),now()); 
    180180insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'payment_method','支払い方法',47,now(),now()); 
    181 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_time','配送時間',48,now(),now()); 
     181insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_time','お届け時間',48,now(),now()); 
    182182insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'deliv_no','配送伝票番号',49,now(),now()); 
    183183insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(3,'note','SHOPメモ',50,now(),now()); 
     
    208208insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_birth','生年月日',22,now(),now()); 
    209209insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'order_job','職種',23,now(),now()); 
    210 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_name01','配送先名前',24,now(),now()); 
    211 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_name02','配送先名前',25,now(),now()); 
    212 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_kana01','配送先カナ',26,now(),now()); 
    213 insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_kana02','配送先カナ',27,now(),now()); 
     210insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_name01','お届け先名前',24,now(),now()); 
     211insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_name02','お届け先名前',25,now(),now()); 
     212insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_kana01','お届け先カナ',26,now(),now()); 
     213insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_kana02','お届け先カナ',27,now(),now()); 
    214214insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_tel01','電話番号1',28,now(),now()); 
    215215insert into dtb_csv(csv_id,col,disp_name,rank,create_date,update_date)values(4,'deliv_tel02','電話番号2',29,now(),now()); 
     
    943943INSERT INTO mtb_constants VALUES ('NAVI_PMAX','4',184,'ページ番号の最大表示個数'); 
    944944INSERT INTO mtb_constants VALUES ('PRODUCTSUB_MAX','5',185,'商品サブ情報最大数'); 
    945 INSERT INTO mtb_constants VALUES ('DELIVTIME_MAX','16',186,'配送時間の最大表示数'); 
     945INSERT INTO mtb_constants VALUES ('DELIVTIME_MAX','16',186,'お届け時間の最大表示数'); 
    946946INSERT INTO mtb_constants VALUES ('DELIVFEE_MAX','47',187,'配送料金の最大表示数'); 
    947947INSERT INTO mtb_constants VALUES ('STEXT_LEN','50',188,'短い項目の文字数(名前など)'); 
     
    998998INSERT INTO mtb_constants VALUES ('URL_SITE_TOP','URL_DIR . "index.php"',239,'サイトトップ'); 
    999999INSERT INTO mtb_constants VALUES ('URL_CART_TOP','URL_DIR . "cart/index.php"',240,'カートトップ'); 
    1000 INSERT INTO mtb_constants VALUES ('URL_DELIV_TOP','URL_DIR . "shopping/deliv.php"',241,'配送時間設定'); 
     1000INSERT INTO mtb_constants VALUES ('URL_DELIV_TOP','URL_DIR . "shopping/deliv.php"',241,'お届け時間設定'); 
    10011001INSERT INTO mtb_constants VALUES ('URL_MYPAGE_TOP','SSL_URL . "mypage/login.php"',242,'Myページトップ'); 
    10021002INSERT INTO mtb_constants VALUES ('URL_SHOP_CONFIRM','URL_DIR . "shopping/confirm.php"',243,'購入確認ページ'); 
     
    10291029INSERT INTO mtb_constants VALUES ('BEST_MAX','5',270,'ベスト商品の最大登録数'); 
    10301030INSERT INTO mtb_constants VALUES ('BEST_MIN','3',271,'ベスト商品の最小登録数(登録数が満たない場合は表示しない。)'); 
    1031 INSERT INTO mtb_constants VALUES ('DELIV_DATE_END_MAX','21',272,'配達可能な日付以降のプルダウン表示最大日数'); 
     1031INSERT INTO mtb_constants VALUES ('DELIV_DATE_END_MAX','21',272,'お届け可能な日付以降のプルダウン表示最大日数'); 
    10321032INSERT INTO mtb_constants VALUES ('PURCHASE_CUSTOMER_REGIST','0',273,'購入時強制会員登録(1:有効 0:無効)'); 
    10331033INSERT INTO mtb_constants VALUES ('RELATED_PRODUCTS_MAX','3',274,'この商品を買った人はこんな商品も買っています 表示件数'); 
  • branches/version-2_4/html/install/sql/table_comment.sql

    r16437 r18521  
    11INSERT INTO dtb_table_comment(table_name,description) values ('dtb_baseinfo','基本情報'); 
    22INSERT INTO dtb_table_comment(table_name,description) values ('dtb_deliv','配送業者'); 
    3 INSERT INTO dtb_table_comment(table_name,description) values ('dtb_delivtime','配送時間'); 
     3INSERT INTO dtb_table_comment(table_name,description) values ('dtb_delivtime','お届け時間'); 
    44INSERT INTO dtb_table_comment(table_name,description) values ('dtb_delivfee','配送料金'); 
    55INSERT INTO dtb_table_comment(table_name,description) values ('dtb_payment','支払方法'); 
Note: See TracChangeset for help on using the changeset viewer.