Changeset 18735 for branches/version-2_4/data/class/pages/shopping
- Timestamp:
- 2010/06/22 17:53:31 (16 years ago)
- bzr:base-revision:
- [email protected]
- bzr:committer:
- Kentaro Ohkouchi <[email protected]>
- bzr:file-ids:
data/class/SC_Fpdf.php 17232@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2%2Fdata%2Fclass%2FSC_Fpdf.php
data/class/SC_Query.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Query.php
data/class/batch/SC_Batch_Daily.php 15600@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fbatch%2FSC_Batch_Daily.php
data/class/db/SC_DB_MasterData.php 15123@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fdb%2FSC_DB_MasterData.php
data/class/helper/SC_Helper_CSV.php 15535@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_CSV.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Mobile.php 15277@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_Mobile.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Control.php 15336@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Control.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Delivery.php 15294@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Delivery.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Holiday.php 17143@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Holiday.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Kiyaku.php 15329@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Kiyaku.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 15298@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment.php
data/class/pages/admin/contents/LC_Page_Admin_Contents.php 15659@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_Campaign.php 16294@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_Campaign.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_CampaignCreateTag.php 16488@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_CampaignCreateTag.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_CsvSql.php 16449@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_CsvSql.php
data/class/pages/admin/contents/LC_Page_Admin_Contents_RecommendSearch.php 15661@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcontents%2FLC_Page_Admin_Contents_RecommendSearch.php
data/class/pages/admin/customer/LC_Page_Admin_Customer_Edit.php 15568@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_Edit.php
data/class/pages/admin/customer/LC_Page_Admin_Customer_SearchCustomer.php 17876@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4%2Fdata%2Fclass%2Fpages%2Fadmin%2Fcustomer%2FLC_Page_Admin_Customer_SearchCustomer.php
data/class/pages/admin/design/LC_Page_Admin_Design_Template.php 16430@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fdesign%2FLC_Page_Admin_Design_Template.php
data/class/pages/admin/mail/LC_Page_Admin_Mail.php 15640@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail.php
data/class/pages/admin/mail/LC_Page_Admin_Mail_History.php 15653@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fmail%2FLC_Page_Admin_Mail_History.php
data/class/pages/admin/order/LC_Page_Admin_Order.php 15584@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order.php
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php
data/class/pages/admin/order/LC_Page_Admin_Order_Mail.php 16357@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Mail.php
data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php 17951@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_ProductSelect.php
data/class/pages/admin/order/LC_Page_Admin_Order_Status.php 15596@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Status.php
data/class/pages/admin/products/LC_Page_Admin_Products.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products.php
data/class/pages/admin/products/LC_Page_Admin_Products_Category.php 15518@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Category.php
data/class/pages/admin/products/LC_Page_Admin_Products_Class.php 15481@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Class.php
data/class/pages/admin/products/LC_Page_Admin_Products_ClassCategory.php 15486@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ClassCategory.php
data/class/pages/admin/products/LC_Page_Admin_Products_Product.php 15342@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Product.php
data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 15559@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductClass.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/products/LC_Page_Admin_Products_ProductSelect.php 15557@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_ProductSelect.php
data/class/pages/admin/products/LC_Page_Admin_Products_Review.php 15537@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Review.php
data/class/pages/admin/products/LC_Page_Admin_Products_Trackback.php 15546@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fproducts%2FLC_Page_Admin_Products_Trackback.php
data/class/pages/admin/system/LC_Page_Admin_System_Bkup.php 16251@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fsystem%2FLC_Page_Admin_System_Bkup.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/campaign/LC_Page_Campaign.php 16496@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fcampaign%2FLC_Page_Campaign.php
data/class/pages/entry/LC_Page_Entry_Kiyaku.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fentry%2FLC_Page_Entry_Kiyaku.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Best5.php 15367@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Best5.php
data/class/pages/frontparts/bloc/LC_Page_FrontParts_Bloc_Calendar.php 17143@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2%2Fdata%2Fclass%2Fpages%2Ffrontparts%2Fbloc%2FLC_Page_FrontParts_Bloc_Calendar.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/guide/LC_Page_Guide_Kiyaku.php 16162@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fguide%2FLC_Page_Guide_Kiyaku.php
data/class/pages/mypage/LC_Page_Mypage.php 16066@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage.php
data/class/pages/mypage/LC_Page_Mypage_Delivery.php 16092@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Delivery.php
data/class/pages/mypage/LC_Page_Mypage_Favorite.php 17931@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_4%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Favorite.php
data/class/pages/mypage/LC_Page_Mypage_History.php 16102@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_History.php
data/class/pages/mypage/LC_Page_Mypage_HistoryDetail.php 16238@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_HistoryDetail.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_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.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
data/class/pages/rss/LC_Page_Rss.php 16192@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Frss%2FLC_Page_Rss.php
data/class/pages/rss/LC_Page_Rss_Products.php 16193@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Frss%2FLC_Page_Rss_Products.php
data/class/pages/shopping/LC_Page_Shopping_Complete.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Complete.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php- bzr:mapping-version:
- v4
- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- [email protected]
- bzr:revno:
- 1942
- bzr:revprop:branch-nick:
- branches/version-2_4
- bzr:root:
- branches/version-2_4
- bzr:timestamp:
- 2010-06-22 17:53:23.812000036 +0900
- bzr:user-agent:
- bzr2.1.1+bzr-svn1.0.2
- svn:original-date:
- 2010-06-22T08:53:23.812000Z
- Location:
- branches/version-2_4/data/class/pages/shopping
- Files:
-
- 4 edited
-
LC_Page_Shopping_Complete.php (modified) (2 diffs)
-
LC_Page_Shopping_Confirm.php (modified) (2 diffs)
-
LC_Page_Shopping_Deliv.php (modified) (2 diffs)
-
LC_Page_Shopping_Payment.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Complete.php
r18734 r18735 94 94 95 95 // その他情報の取得 96 $arrResults = $objQuery->get all("SELECT memo02, memo05 FROM dtb_order WHERE order_id = ? ", array($order_id));96 $arrResults = $objQuery->getAll("SELECT memo02, memo05 FROM dtb_order WHERE order_id = ? ", array($order_id)); 97 97 98 98 if (count($arrResults) > 0) { … … 260 260 $arrEbis['o4id'] = $arrRet[0]['order_job']; 261 261 262 $objQuery->set groupby("product_id");262 $objQuery->setGroupBy("product_id"); 263 263 $arrRet = $objQuery->select("product_id", "dtb_order_detail", "order_id = ?", array($order_id)); 264 264 $arrProducts = sfSwapArray($arrRet); -
branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
r18734 r18735 116 116 // MEMO03に値が入っている場合には、モジュール追加されたものとみなす 117 117 $sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?"; 118 $arrPayment = $objQuery->get all($sql, array($arrData['payment_id']));118 $arrPayment = $objQuery->getAll($sql, array($arrData['payment_id'])); 119 119 $payment_type = $arrPayment[0]["memo03"]; 120 120 } … … 222 222 // MEMO03に値が入っている場合には、モジュール追加されたものとみなす 223 223 $sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?"; 224 $arrPayment = $objQuery->get all($sql, array($arrData['payment_id']));224 $arrPayment = $objQuery->getAll($sql, array($arrData['payment_id'])); 225 225 $payment_type = $arrPayment[0]["memo03"]; 226 226 } -
branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
r18734 r18735 201 201 // 別のお届け先住所の取得 202 202 $col = "other_deliv_id, name01, name02, pref, addr01, addr02"; 203 $objQuery->set order("other_deliv_id DESC");203 $objQuery->setOrder("other_deliv_id DESC"); 204 204 $objOtherAddr = $objQuery->select($col, "dtb_other_deliv", $where, array($_SESSION['customer']['customer_id'])); 205 205 $this->arrAddr = $arrCustomerAddr; … … 389 389 // 別のお届け先住所の取得 390 390 $col = "other_deliv_id, name01, name02, pref, addr01, addr02, zip01, zip02"; 391 $objQuery->set order("other_deliv_id DESC");391 $objQuery->setOrder("other_deliv_id DESC"); 392 392 $objOtherAddr = $objQuery->select($col, "dtb_other_deliv", $where, array($_SESSION['customer']['customer_id'])); 393 393 $this->arrAddr = $arrCustomerAddr; -
branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Payment.php
r18734 r18735 351 351 function lfGetPayment($total_pretax) { 352 352 $objQuery = new SC_Query(); 353 $objQuery->set order("rank DESC");353 $objQuery->setOrder("rank DESC"); 354 354 //削除されていない支払方法を取得 355 355 $arrRet = $objQuery->select("payment_id, payment_method, rule, upper_rule, note, payment_image", "dtb_payment", "del_flg = 0 AND deliv_id IN (SELECT deliv_id FROM dtb_deliv WHERE del_flg = 0) ");
Note: See TracChangeset
for help on using the changeset viewer.
