Changeset 22796 for branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

Timestamp:

2013/05/02 18:11:36 (11 years ago)

Author:

h_yoshimoto

Message:

#2236 2.12.3リリース以降の2.12-devへのコミット差し戻し

File:

• branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php (modified) (17 diffs)

branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

@@ -32 +32 @@
  * @version $Id$
  */
-class LC_Page_Admin_Order_ProductSelect extends LC_Page_Admin_Ex 
-{
+class LC_Page_Admin_Order_ProductSelect extends LC_Page_Admin_Ex {
 
     // }}}
@@ -43 +42 @@
      * @return void
      */
-    function init()
-    {
+    function init() {
         parent::init();
         $this->tpl_mainpage = 'order/product_select.tpl';
@@ -61 +59 @@
      * @return void
      */
-    function process()
-    {
+    function process() {
         $this->action();
         $this->sendResponse();
@@ -72 +69 @@
      * @return void
      */
-    function action()
-    {
+    function action() {
 
         $objDb = new SC_Helper_DB_Ex();
@@ -82 +78 @@
 
         $this->tpl_no = $this->getNo(array($_GET,$_POST));
-        $this->shipping_id = $this->getShippingId(array($_GET,$_POST));
 
         switch ($this->getMode()) {
@@ -106 +101 @@
                 $this->tpl_javascript .= $this->getTplJavascript($objProduct);
                 $js_fnOnLoad = $this->getFnOnload($this->arrProducts);
-                $this->tpl_javascript .= 'function fnOnLoad()
-                {' . $js_fnOnLoad . '}';
+                $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}';
                 $this->tpl_onload .= 'fnOnLoad();';
                 // 規格1クラス名
@@ -138 +132 @@
      * @param SC_Product $objProduct
      */
-    function getProductList($arrProductId, &$objProduct)
-    {
+    function getProductList($arrProductId, &$objProduct) {
         $objQuery =& SC_Query_Ex::getSingletonInstance();
 
@@ -153 +146 @@
      * @param array $arrProducts
      */
-    function getFnOnload($arrProducts)
-    {
+    function getFnOnload($arrProducts) {
         foreach ($arrProducts as $arrProduct) {
             $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});";
@@ -165 +157 @@
      * @param SC_Product $objProduct
      */
-    function getTplJavascript(&$objProduct)
-    {
+    function getTplJavascript(&$objProduct) {
         return 'productsClassCategories = ' . SC_Utils_Ex::jsonEncode($objProduct->classCategories) . '; ';
     }
@@ -175 +166 @@
      * @param SC_Product $objProduct
      */
-    function getProducts($whereAndBind,&$objProduct, $page_max, $startno)
-    {
+    function getProducts($whereAndBind,&$objProduct, $page_max, $startno) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
@@ -196 +186 @@
      * @param SC_Product $objProduct
      */
-    function getLineCount($whereAndBind,&$objProduct)
-    {
+    function getLineCount($whereAndBind,&$objProduct) {
         $where = $whereAndBind['where'];
         $bind = $whereAndBind['bind'];
@@ -213 +202 @@
      * @param SC_FormParam $objFormParam
      */
-    function createWhere(&$objFormParam,&$objDb)
-    {
+    function createWhere(&$objFormParam,&$objDb) {
         $arrForm = $objFormParam->getHashArray();
         $where = 'alldtl.del_flg = 0';
@@ -254 +242 @@
      * @param unknown_type $globalParams
      */
-    function getNo($globalParams)
-    {
+    function getNo($globalParams) {
         foreach ($globalParams as $params) {
             if (isset($params['no']) && $params['no']!= '') {
@@ -265 +252 @@
 
     /**
-     * リクエストパラメーター shipping_id を取ってくる。
-     * @param unknown_type $globalParams
-     */
-    function getShippingId($globalParams)
-    {
-        foreach ($globalParams as $params) {
-            if (isset($params['shipping_id']) && $params['shipping_id']!= '') {
-                return intval($params['shipping_id']);
-            }
-        }
-        return null;
-    }
-
-
-    /**
      * 取得している並び順で並び替え
      * @param $arrProduct_id
      * @param $productList
      */
-    function sortProducts($arrProduct_id,$productList)
-    {
+    function sortProducts($arrProduct_id,$productList) {
         $products  = array();
         foreach ($productList as $item) {
@@ -301 +272 @@
      * @return void
      */
-    function destroy()
-    {
+    function destroy() {
         parent::destroy();
     }
@@ -310 +280 @@
      * @param SC_FormParam $objFormParam
      */
-    function lfInitParam(&$objFormParam)
-    {
+    function lfInitParam(&$objFormParam) {
         $objFormParam->addParam('オーダーID', 'order_id', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
         $objFormParam->addParam('商品名', 'search_name', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -317 +286 @@
         $objFormParam->addParam('商品コード', 'search_product_code', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
         $objFormParam->addParam('フッター', 'footer', LTEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
-        $objFormParam->addParam('届け先ID', 'shipping_id', LTEXT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
     }
 }