Changeset 21809 for branches/version-2_12-dev/data
- Timestamp:
- 2012/05/07 00:21:54 (12 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_12-dev:21808
- bzr:committer:
- Kentaro Ohkouchi <nanasess@fsm.ne.jp>
- bzr:file-ids:
data/class/api/operations/ItemSearch.php 21713@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_12-dev%2Fdata%2Fclass%2Fapi%2Foperations%2FItemSearch.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php 15660@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Recommend.php
data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php 21782@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_12-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fownersstore%2FLC_Page_Admin_OwnersStore.php
data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php 16411@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fownersstore%2FLC_Page_Admin_OwnersStore_Log.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php 15526@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductRank.php
data/class/pages/admin/total/LC_Page_Admin_Total.php 15600@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Ftotal%2FLC_Page_Admin_Total.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Category.php
data/class/pages/mypage/LC_Page_Mypage_MailView.php 17922@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fcomu-ver2%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_MailView.php
data/class/pages/mypage/LC_Page_Mypage_Order.php 16238@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Order.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php- bzr:mapping-version:
- v4
- bzr:merge:
nanasess@fsm.ne.jp-20120506152054-2zllwij5qyhh3uxx- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- nanasess@fsm.ne.jp-20120506152147-ax0qre64rxi2o56m
- bzr:revno:
- 4477
- bzr:revprop:branch-nick:
- branches/version-2_12-dev
- bzr:root:
- branches/version-2_12-dev
- bzr:testament:
bazaar-ng testament short form 2.1
revision-id: nanasess@fsm.ne.jp-20120506152147-ax0qre64rxi2o56m
sha1: bef21b70135260bbb8f95ba265b120aa53acb518- bzr:timestamp:
- 2012-05-07 00:21:47.828999996 +0900
- bzr:user-agent:
- bzr2.4.2+bzr-svn1.1.2
- Location:
- branches/version-2_12-dev/data/class
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/api/operations/ItemSearch.php
r21771 r21809 153 153 $dtb_product_categories T2 154 154 JOIN dtb_category T3 155 USING (category_id)155 ON T2.category_id = T3.category_id 156 156 WHERE T2.product_id = alldtl.product_id 157 157 ORDER BY T3.rank DESC, T2.rank DESC -
branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_Recommend.php
r21802 r21809 176 176 $objQuery = $objQuery =& SC_Query_Ex::getSingletonInstance(); 177 177 $col = 'dtb_products.name,dtb_products.main_list_image,dtb_best_products.*'; 178 $table = 'dtb_best_products INNER JOIN dtb_products USING (product_id)';178 $table = 'dtb_best_products INNER JOIN dtb_products ON dtb_best_products.product_id = dtb_products.product_id'; 179 179 $where = 'dtb_best_products.del_flg = 0'; 180 180 $order = 'rank'; -
branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore.php
r21794 r21809 902 902 foreach ($hookPoints as $hookPoint) { 903 903 // 競合するプラグインを取得する, 904 $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 USING(plugin_id)';904 $table = 'dtb_plugin_hookpoint AS T1 LEFT JOIN dtb_plugin AS T2 ON T1.plugin_id = T2.plugin_id'; 905 905 $where = 'T1.hook_point = ? AND NOT T1.plugin_id = ? AND T2.enable = ' . PLUGIN_ENABLE_TRUE; 906 906 $objQuery->setGroupBy('T1.plugin_id, T2.plugin_name'); -
branches/version-2_12-dev/data/class/pages/admin/ownersstore/LC_Page_Admin_OwnersStore_Log.php
r21783 r21809 106 106 FROM 107 107 dtb_module 108 ) AS modules USING(module_id)108 ) AS modules ON dtb_module_update_logs.module_id = modules.module_id 109 109 ORDER BY update_date DESC 110 110 END; … … 132 132 FROM 133 133 dtb_module 134 ) AS modules USING(module_id)134 ) AS modules ON dtb_module_update_logs.module_id = modules.module_id 135 135 WHERE 136 136 log_id = ? -
branches/version-2_12-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductRank.php
r21743 r21809 121 121 // FIXME SC_Product クラスを使用した実装 122 122 $objQuery =& SC_Query_Ex::getSingletonInstance(); 123 $col = ' product_id, name, main_list_image, product_code_min, product_code_max, status';123 $col = 'alldtl.product_id, name, main_list_image, product_code_min, product_code_max, status'; 124 124 $objProduct = new SC_Product(); 125 125 $table = $objProduct->alldtlSQL(); 126 $table.= ' LEFT JOIN dtb_product_categories AS T5 USING(product_id)';126 $table.= ' LEFT JOIN dtb_product_categories AS T5 ON alldtl.product_id = T5.product_id'; 127 127 $where = 'del_flg = 0 AND category_id = ?'; 128 128 -
branches/version-2_12-dev/data/class/pages/admin/total/LC_Page_Admin_Total.php
r21755 r21809 556 556 product_name, 557 557 SUM(quantity) AS products_count, 558 COUNT( order_id) AS order_count,558 COUNT(dtb_order_detail.order_id) AS order_count, 559 559 price, 560 560 (price * SUM(quantity)) AS total 561 561 __EOS__; 562 562 563 $from = 'dtb_order_detail JOIN dtb_order USING(order_id)';563 $from = 'dtb_order_detail JOIN dtb_order ON dtb_order_detail.order_id = dtb_order.order_id'; 564 564 565 565 /* … … 591 591 __EOS__; 592 592 593 $from = 'dtb_order JOIN dtb_customer USING ( customer_id)';593 $from = 'dtb_order JOIN dtb_customer ON dtb_order.customer_id = dtb_customer.customer_id'; 594 594 595 595 $where .= ' AND dtb_order.del_flg = 0 AND dtb_order.status <> ?'; -
branches/version-2_12-dev/data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Category.php
r21771 r21809 126 126 $objDb = new SC_Helper_DB_Ex(); 127 127 $col = '*'; 128 $from = 'dtb_category left join dtb_category_total_count using (category_id)';128 $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id'; 129 129 // 登録商品数のチェック 130 130 if ($count_check) { … … 177 177 $objQuery =& SC_Query_Ex::getSingletonInstance(); 178 178 $col = '*'; 179 $from = 'dtb_category left join dtb_category_total_count using (category_id)';179 $from = 'dtb_category left join dtb_category_total_count ON dtb_category.category_id = dtb_category_total_count.category_id'; 180 180 // メインカテゴリとその直下のカテゴリを取得する。 181 181 $where = 'level <= 2 AND del_flg = 0'; -
branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_MailView.php
r21743 r21809 118 118 $where = 'send_id = ? AND customer_id = ?'; 119 119 $arrWhereVal = array($send_id, $customer_id); 120 return $objQuery->select($col, 'dtb_mail_history LEFT JOIN dtb_order USING(order_id)', $where, $arrWhereVal);120 return $objQuery->select($col, 'dtb_mail_history LEFT JOIN dtb_order ON dtb_mail_history.order_id = dtb_order.order_id', $where, $arrWhereVal); 121 121 } 122 122 } -
branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
r21743 r21809 95 95 if ($order_count != 1) return array(); 96 96 97 $col = ' product_class_id, quantity';98 $table = 'dtb_order_detail LEFT JOIN dtb_products_class USING(product_class_id)';97 $col = 'dtb_order_detail.product_class_id, quantity'; 98 $table = 'dtb_order_detail LEFT JOIN dtb_products_class ON dtb_order_detail.product_class_id = dtb_products_class.product_class_id'; 99 99 $where = 'order_id = ?'; 100 100 $objQuery->setOrder('order_detail_id'); -
branches/version-2_12-dev/data/class/pages/products/LC_Page_Products_List.php
r21743 r21809 283 283 $dtb_product_categories T2 284 284 JOIN dtb_category T3 285 USING (category_id)285 ON T2.category_id = T3.category_id 286 286 WHERE T2.product_id = alldtl.product_id 287 287 ORDER BY T3.rank DESC, T2.rank DESC
Note: See TracChangeset
for help on using the changeset viewer.