Index: branches/5.1.x/units/gateways/gw_classes/ideal_nl.php =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/units/gateways/gw_classes/ideal_nl.php (.../ideal_nl.php) (revision 13100) +++ branches/5.1.x/units/gateways/gw_classes/ideal_nl.php (.../ideal_nl.php) (revision 13549) @@ -1,6 +1,6 @@ Application->GetVar('ideal_nl_bank_id'); $fields['description'] = 'Invoice #'.$item_data['OrderNumber']; Index: branches/5.1.x/units/shipping_quote_engines/usps.php =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 13465) +++ branches/5.1.x/units/shipping_quote_engines/usps.php (.../usps.php) (revision 13549) @@ -1,6 +1,6 @@ 10 ) $res = substr($res, 0, 10); + $res = preg_replace('/[(]|[)]|[\-]|[ ]|[#]|[\.]|[a-z](.*)|[A-Z](.*)/g', '', $phone); + if ( strlen($res) > 10 ) { + $res = substr($res, 0, 10); + } return $res != '' ? $res : $phone; } Index: branches/5.1.x/install/upgrades.sql =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/install/upgrades.sql (.../upgrades.sql) (revision 13465) +++ branches/5.1.x/install/upgrades.sql (.../upgrades.sql) (revision 13549) @@ -121,6 +121,20 @@ # ===== v 5.0.2 ===== +# ===== v 5.0.3-B1 ===== +UPDATE Phrase +SET PhraseType = 1 +WHERE Phrase IN ( + 'la_ship_All_Together', 'la_ship_Backorders_Upon_Avail', 'la_ship_Backorder_Separately', + 'lu_ship_Shipment', 'lu_ship_ShippingType' +); + +# ===== v 5.0.3-B2 ===== + +# ===== v 5.0.3-RC1 ===== + +# ===== v 5.0.3 ===== + # ===== v 5.1.0-B1 ===== UPDATE Modules SET Path = 'modules/in-commerce/' WHERE `Name` = 'In-Commerce'; Index: branches/5.1.x/units/zones/zones_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/zones/zones_config.php (.../zones_config.php) (revision 13156) +++ branches/5.1.x/units/zones/zones_config.php (.../zones_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ('dst', 'sc'), - 'ListSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql - 'ItemSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( '' => Array ( @@ -57,9 +57,27 @@ 'Fields' => Array ( 'ZoneID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), 'ShippingTypeID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'Name' => Array ('type' => 'string', 'required'=>true, 'max_len'=>100, 'error_msgs' => Array ('required' => 'Please fill in'), 'not_null' => 1, 'default' => '', ), - 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), - 'CODallowed' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Allowed', 0 => 'la_NotAllowed'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), + 'Name' => Array ( + 'type' => 'string', 'max_len' => 100, + 'required' => 1, 'default' => '', 'not_null' => 1, + 'error_msgs' => Array ('required' => 'Please fill in'), + ), + 'Type' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, + 'options' => Array ( + 1 => 'la_ByCountry', + 2 => 'la_ByState', + 3 => 'la_ByZIP' + ), + 'not_null' => 1, 'default' => 1, + ), + 'CODallowed' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_NotAllowed', 1 => 'la_Allowed',), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), ), 'Grids' => Array ( Index: branches/5.1.x/units/orders/orders_item.php =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/units/orders/orders_item.php (.../orders_item.php) (revision 13465) +++ branches/5.1.x/units/orders/orders_item.php (.../orders_item.php) (revision 13549) @@ -1,6 +1,6 @@ ErrorMsgs['credit_card_expired'] = $this->Application->Phrase('lu_cc_expired'); } - function Load($id, $id_field_name=null) - { - if( $this->Special == 'sitem' && $id == null || (!$this->IsTempTable() && $id == 0)) - { - $this->setID(0); - - $this->SetDBField('Number',-1); - $this->SetDBField('SubNumber',-1); - // load previously used search params from session - $search_params = $this->Application->RecallVar('ord.search_search_filter'); - if($search_params) - { - $search_params = unserialize($search_params); - foreach($search_params as $search_field => $search_params) - { - $this->SetField($search_field, $search_params['search_value']); - } - $this->UpdateFormattersSubFields(); // used for updating separate virtual date/time fields from DB timestamp (for example) - } - return true; - } - else - { - return parent::Load($id,$id_field_name); - } - } - /** * Return error message for field * @@ -334,34 +307,34 @@ // Innocent until proven guilty $cc_valid = true; - // Get rid of any non-digits - $value = ereg_replace("[^[:digit:]]", '', $value); + // Get rid of any non-digits + $value = preg_replace('/[^\d]/', '', $value); // Perform card-specific checks, if applicable switch( $this->GetDBField($cardtype_field) ) { case 2: // MasterCard - $cc_valid = ereg("^5[1-5].{14}$", $value); + $cc_valid = preg_match('/^5[1-5].{14}$/', $value); break; case 1: // Visa - $cc_valid = ereg("^4.{15}$|^4.{12}$", $value); + $cc_valid = preg_match('/^4.{15}$|^4.{12}$/', $value); break; case 3: // American Express - $cc_valid = ereg("^3[47].{13}$", $value); + $cc_valid = preg_match('/^3[47].{13}$/', $value); break; case 4: // Discover - $cc_valid = ereg("^6011.{12}$", $value); + $cc_valid = preg_match('/^6011.{12}$/', $value); break; case 5: // Diners Club - $cc_valid = ereg("^30[0-5].{11}$|^3[68].{12}$", $value); + $cc_valid = preg_match('/^30[0-5].{11}$|^3[68].{12}$/', $value); break; case 6: // JBC - $cc_valid = ereg("^3.{15}$|^2131|1800.{11}$", $value); + $cc_valid = preg_match('/^3.{15}$|^2131|1800.{11}$/', $value); break; default: Index: branches/5.1.x/units/products/products_event_handler.php =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 13100) +++ branches/5.1.x/units/products/products_event_handler.php (.../products_event_handler.php) (revision 13549) @@ -1,6 +1,6 @@ Application->RecallVar('user_id'); $email_event = &$this->Application->EmailEventUser('PRODUCT.SUGGEST', $user_id, $send_params); $email_event = &$this->Application->EmailEventAdmin('PRODUCT.SUGGEST'); @@ -1290,4 +1289,28 @@ $edit_tab_presets['Default']['shopping_cart'] = Array ('title' => 'la_tab_ShopCartEntry', 't' => 'in-commerce/paid_listings/paid_listing_type_shopcart', 'priority' => 2); $this->Application->setUnitOption($event->MasterEvent->Prefix, 'EditTabPresets', $edit_tab_presets); } + + /** + * [HOOK] Allows to add cloned subitem to given prefix + * + * @param kEvent $event + */ + function OnCloneSubItem(&$event) + { + parent::OnCloneSubItem($event); + + if ($event->MasterEvent->Prefix == 'rev') { + $clones = $this->Application->getUnitOption($event->MasterEvent->Prefix, 'Clones'); + $subitem_prefix = $event->Prefix . '-' . $event->MasterEvent->Prefix; + + $clones[$subitem_prefix]['ConfigMapping'] = Array ( + 'PerPage' => 'Comm_Perpage_Reviews', + + 'ReviewDelayInterval' => 'product_ReviewDelay_Value', + 'ReviewDelayValue' => 'product_ReviewDelay_Interval', + ); + + $this->Application->setUnitOption($event->MasterEvent->Prefix, 'Clones', $clones); + } + } } \ No newline at end of file Index: branches/5.1.x/units/pricing/pricing_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 13156) +++ branches/5.1.x/units/pricing/pricing_config.php (.../pricing_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'pr', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'PricingEventHandler','file'=>'pricing_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'PricingTagProcessor','file'=>'pricing_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class'=> 'kDBItem', 'file'=> '', 'build_event'=> 'OnItemBuild'), + 'ListClass' => Array ('class'=> 'kDBList', 'file'=> '', 'build_event'=> 'OnListBuild'), + 'EventHandlerClass' => Array ('class'=> 'PricingEventHandler', 'file'=> 'pricing_event_handler.php', 'build_event'=> 'OnBuild'), + 'TagProcessorClass' => Array ('class'=> 'PricingTagProcessor', 'file'=> 'pricing_tag_processor.php', 'build_event'=> 'OnBuild'), 'AutoLoad' => true, - 'Hooks' => Array( + 'Hooks' => Array ( // for tangible products: pricings are always aranged before saveing product - Array( + Array ( 'Mode' => hBEFORE, 'Conditional' => true, 'HookToPrefix' => '#PARENT#', 'HookToSpecial' => '', - 'HookToEvent' => Array('OnPreSave'), + 'HookToEvent' => Array ('OnPreSave'), 'DoPrefix' => '', 'DoSpecial' => 'tang', 'DoEvent' => 'OnArrange', ), ), - 'AggregateTags' => Array( - Array( + 'AggregateTags' => Array ( + Array ( 'AggregateTo' => '#PARENT#', 'AggregatedTagName' => 'Price', 'LocalTagName' => 'ProductPrice', ), - Array( + Array ( 'AggregateTo' => '#PARENT#', 'AggregatedTagName' => 'ListPriceBrackets', 'LocalTagName' => 'Product_ListPriceBrackets', ), - Array( + Array ( 'AggregateTo' => '#PARENT#', 'AggregatedTagName' => 'HasQuantityPricing', 'LocalTagName' => 'Product_HasQuantityPricing', ), ), - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', 4 => 'event', ), - 'StatusField' => Array('IsPrimary'), + 'StatusField' => Array ('IsPrimary'), 'IDField' => 'PriceId', 'TableName' => TABLE_PREFIX.'ProductsPricing', @@ -69,64 +69,74 @@ 'AutoDelete' => true, 'AutoClone' => true, - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'ListSQLs' => Array ( ''=> 'SELECT * FROM %s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', + 'ItemSQLs' => Array ( ''=> 'SELECT * FROM %s', ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('MinQty' => 'asc'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('MinQty' => 'asc'), ) ), - 'Fields' => Array( - 'PriceId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'MinQty' => Array('type' => 'int', 'default' => 0), - 'MaxQty' => Array('type' => 'int', 'default' => 0), - 'Cost' => Array('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0), - 'Price' => Array('type' => 'float', 'not_null' => 1, 'formatter' => 'kFormatter', 'min_value_inc' => 0, 'format' => '%.2f', 'default' => 0), - 'Negotiated' => Array('type' => 'int', 'default' => 0), - 'Points' => Array('type' => 'int', 'default' => 0), - 'AccessDuration'=> Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'AccessUnit' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year'), 'not_null' => 1, 'default' => 0,), - 'Description' => Array('type' => 'string', 'max_len' => 255, 'default' => NULL), - 'IsPrimary' => Array('type' => 'int', 'default' => 0, 'not_null' => 1), - 'GroupId' => Array('type' => 'int', 'default' => 0, 'not_null' => 1), - // 'AccessRebillDate' => Array('type'=>'integer', 'min_value' => 0, 'max_value' => 31, 'not_null'=>'1', 'default'=>0), - // Customization healtheconomics.org -// 'DurationType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(1 => 'la_opt_interval', 2 => 'la_opt_date'), 'not_null' => 1, 'default' => 1), -// 'AccessExpiration' => Array('type' => 'int', 'formatter' => 'kDateFormatter'), - // Customization healtheconomics.org -- - - ), - 'VirtualFields' => Array( + 'Fields' => Array ( + 'PriceId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'MinQty' => Array ('type' => 'int', 'default' => 0), + 'MaxQty' => Array ('type' => 'int', 'default' => 0), + 'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => 0), + 'Price' => Array ('type' => 'float', 'not_null' => 1, 'formatter' => 'kFormatter', 'min_value_inc' => 0, 'format' => '%.2f', 'default' => 0), + 'Negotiated' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Points' => Array ('type' => 'int', 'default' => 0), + 'AccessDuration'=> Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'AccessUnit' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year'), 'not_null' => 1, 'default' => 0,), + 'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'GroupId' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1), + // 'AccessRebillDate' => Array ('type'=> 'integer', 'min_value' => 0, 'max_value' => 31, 'not_null'=> '1', 'default'=>0), + // Customization healtheconomics.org + // 'DurationType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_opt_interval', 2 => 'la_opt_date'), 'not_null' => 1, 'default' => 1), + // 'AccessExpiration' => Array ('type' => 'int', 'formatter' => 'kDateFormatter'), + // Customization healtheconomics.org -- + ), + + 'VirtualFields' => Array ( ), - 'Grids' => Array( + 'Grids' => Array ( /* - 'Default' => Array( - 'Icons' => Array( + 'Default' => Array ( + 'Icons' => Array ( 'default' => 'icon16_item.png', 'module' => 'core', ), - 'Fields' => Array( - 'MinQty' => Array( 'title'=>'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'MaxQty' => Array( 'title'=>'la_col_MaxQty', 'filter_block' => 'grid_range_filter'), - 'Price' => Array( 'title'=>'la_col_Price', 'filter_block' => 'grid_range_filter'), - 'Points' => Array( 'title'=>'la_col_Points', 'filter_block' => 'grid_range_filter'), - 'Cost' => Array( 'title'=>'la_col_Cost', 'filter_block' => 'grid_range_filter'), - 'Negotiated' => Array( 'title'=>'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'), + 'Fields' => Array ( + 'MinQty' => Array ( 'title'=> 'la_col_MinQty', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'MaxQty' => Array ( 'title'=> 'la_col_MaxQty', 'filter_block' => 'grid_range_filter'), + 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_range_filter'), + 'Points' => Array ( 'title'=> 'la_col_Points', 'filter_block' => 'grid_range_filter'), + 'Cost' => Array ( 'title'=> 'la_col_Cost', 'filter_block' => 'grid_range_filter'), + 'Negotiated' => Array ( 'title'=> 'la_col_Negotiated', 'data_block' => 'negotiated_td', 'filter_block' => 'grid_options_filter'), ), ), */ - 'Access' => Array( - 'Icons' => Array('default'=>'icon16_pricing.gif','0'=>'icon16_pricing.gif','1'=>'icon16_pricing_primary.gif'), - 'Fields' => Array( - 'AccessDuration' => Array( 'title'=>'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'AccessUnit' => Array( 'title'=>'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), - 'Description' => Array( 'title'=>'la_col_Description', 'filter_block' => 'grid_like_filter'), - 'Price' => Array( 'title'=>'la_col_Price', 'filter_block' => 'grid_float_range_filter'), + 'Access' => Array ( + 'Icons' => Array ('default'=> 'icon16_pricing.gif', '0'=> 'icon16_pricing.gif', '1'=> 'icon16_pricing_primary.gif'), + 'Fields' => Array ( + 'AccessDuration' => Array ( 'title'=> 'la_col_AccessDuration', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'AccessUnit' => Array ( 'title'=> 'la_col_AccessDurationUnit', 'filter_block' => 'grid_options_filter'), + 'Description' => Array ( 'title'=> 'la_col_Description', 'filter_block' => 'grid_like_filter'), + 'Price' => Array ( 'title'=> 'la_col_Price', 'filter_block' => 'grid_float_range_filter'), ), ), Index: branches/5.1.x/gw_notify.php =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/gw_notify.php (.../gw_notify.php) (revision 13100) +++ branches/5.1.x/gw_notify.php (.../gw_notify.php) (revision 13549) @@ -1,6 +1,6 @@ Init(); - /*$fh = fopen(FULL_PATH.'/gw.log', 'a'); + /*$fh = fopen(WRITEABLE . '/gw.log', 'a'); fwrite ($fh, "\n\n".date('d/m/y h:i:s').":\n"); - foreach ($_REQUEST as $key => $val) - { + foreach ($_REQUEST as $key => $val) { fwrite($fh, "\n"); } fclose($fh);*/ Index: branches/5.1.x/admin_templates/products/option_edit.tpl =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/admin_templates/products/option_edit.tpl (.../option_edit.tpl) (revision 13100) +++ branches/5.1.x/admin_templates/products/option_edit.tpl (.../option_edit.tpl) (revision 13549) @@ -310,7 +310,7 @@ - + Index: branches/5.1.x/units/manufacturers/manufacturers_config.php =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13465) +++ branches/5.1.x/units/manufacturers/manufacturers_config.php (.../manufacturers_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'manuf', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ManufacturersEventHandler','file'=>'manufacturers_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ManufacturersTagProcessor','file'=>'manufacturers_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ManufacturersEventHandler', 'file' => 'manufacturers_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ManufacturersTagProcessor', 'file' => 'manufacturers_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', 4 => 'event', 5 => 'mode', ), 'IDField' => 'ManufacturerId', - 'StatusField' => Array(), + 'StatusField' => Array (), 'TableName' => TABLE_PREFIX.'Manufacturers', - 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('manuf'=>'!la_title_AddingManufacturer!'), - 'edit_status_labels' => Array('manuf'=>'!la_title_EditingManufacturer!'), - 'new_titlefield' => Array('manuf'=>'!la_title_NewManufacturers!'), + 'TitlePresets' => Array ( + 'default' => Array ( 'new_status_labels' => Array ('manuf' => '!la_title_AddingManufacturer!'), + 'edit_status_labels' => Array ('manuf' => '!la_title_EditingManufacturer!'), + 'new_titlefield' => Array ('manuf' => '!la_title_NewManufacturers!'), ), - 'manuf_list'=>Array( 'prefixes' => Array('manuf_List'), + 'manuf_list' =>Array ( 'prefixes' => Array ('manuf_List'), 'format' => "!la_title_Manufacturers!", ), - 'manuf_edit'=>Array( 'prefixes' => Array('manuf'), - 'new_titlefield' => Array('manuf'=>'!la_title_NewManufacturer!'), + 'manuf_edit' =>Array ( 'prefixes' => Array ('manuf'), + 'new_titlefield' => Array ('manuf' => '!la_title_NewManufacturer!'), 'format' => "#manuf_status# '#manuf_titlefield#' - !la_title_General!", ), ), - 'PermSection' => Array('main' => 'in-commerce:manufacturers'), + 'PermSection' => Array ('main' => 'in-commerce:manufacturers'), - 'Sections' => Array( - 'in-commerce:manufacturers' => Array( + 'Sections' => Array ( + 'in-commerce:manufacturers' => Array ( 'parent' => 'in-commerce', 'icon' => 'manufacturers', 'label' => 'la_tab_Manufacturers', - 'url' => Array('t' => 'in-commerce/manufacturers/manufacturers_list', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete'), + 'url' => Array ('t' => 'in-commerce/manufacturers/manufacturers_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete'), 'priority' => 4, 'type' => stTREE, ), @@ -66,20 +66,20 @@ 'TitleField' => 'Name', // field, used in bluebar when editing existing item - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s', ), // key - special, value - list select sql - 'ItemSQLs' => Array(''=>'SELECT * FROM %s', + 'ItemSQLs' => Array ('' => 'SELECT * FROM %s', ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('Name' => 'asc'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), ) ), 'Fields' => Array ( - 'ManufacturerId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array('type' => 'string','not_null' => '1','default' => '', 'required'=>true,'max_len'=>255), - 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'URL' => Array('type' => 'string','not_null' => '1','default' => '','max_len'=>255), + 'ManufacturerId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'required' =>true, 'max_len' =>255), + 'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'URL' => Array ('type' => 'string', 'not_null' => '1', 'default' => '', 'max_len' =>255), 'Logo' => Array ( 'type' => 'string', 'formatter' => 'kPictureFormatter', @@ -88,21 +88,22 @@ 'multiple' => false, 'max_len' => 255, 'not_null' => 1, 'default' => '' ), - 'IsPopular' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'Email' => Array('type' => 'string', 'formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'default' => null, 'error_msgs' => Array('invalid_format'=>'!la_invalid_email!') ), - 'Phone' => Array('type' => 'string','default' => null), - 'Fax' => Array('type' => 'string', 'default' => null), - 'Address1' => Array('type' => 'string','default' => null), - 'Address2' => Array('type' => 'string', 'default' => null), - 'City' => Array('type' => 'string','default' => null), - 'State' => Array( + 'IsPopular' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Email' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'default' => null, 'error_msgs' => Array ('invalid_format' => '!la_invalid_email!') ), + 'Phone' => Array ('type' => 'string', 'default' => null), + 'Fax' => Array ('type' => 'string', 'default' => null), + 'Address1' => Array ('type' => 'string', 'default' => null), + 'Address2' => Array ('type' => 'string', 'default' => null), + 'City' => Array ('type' => 'string', 'default' => null), + 'State' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'option_key_field' => 'DestAbbr', 'option_title_field' => 'Translation', 'default' => null), + 'Zip' => Array ('type' => 'string', 'default' => null), + 'Country' => Array ( 'type' => 'string', - 'formatter' => 'kOptionsFormatter', 'options' => Array(), - 'default' => null - ), - 'Zip' => Array('type' => 'string', 'default' => null), - 'Country' => Array( - 'type' => 'string', 'formatter' => 'kOptionsFormatter', 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode FROM '.TABLE_PREFIX.'CountryStates Index: branches/5.1.x/units/reports/reports_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/reports/reports_config.php (.../reports_config.php) (revision 13156) +++ branches/5.1.x/units/reports/reports_config.php (.../reports_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'rep', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ReportsEventHandler','file'=>'reports_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ReportsTagProcessor','file'=>'reports_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array('class' => 'ReportsEventHandler', 'file' => 'reports_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array('class' => 'ReportsTagProcessor', 'file' => 'reports_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'QueryString' => Array( @@ -45,14 +45,14 @@ 'IDField' => 'CategoryId', 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('d'=>'!la_title_Adding_Discount!'), - 'edit_status_labels' => Array('d'=>'!la_title_Editing_Discount!'), - 'new_titlefield' => Array('d'=>'!la_title_New_Discount!'), + 'default' => Array( 'new_status_labels' => Array('d' => '!la_title_Adding_Discount!'), + 'edit_status_labels' => Array('d' => '!la_title_Editing_Discount!'), + 'new_titlefield' => Array('d' => '!la_title_New_Discount!'), ), - 'report_options'=>Array('format' => "!la_title_ReportOptions!"), - 'report_results'=>Array('format' => "!la_title_ReportResults!"), - 'report_chart'=>Array('format' => "!la_title_SalesReportChart!"), + 'report_options' =>Array('format' => "!la_title_ReportOptions!"), + 'report_results' =>Array('format' => "!la_title_ReportResults!"), + 'report_chart' =>Array('format' => "!la_title_SalesReportChart!"), ), 'PermSection' => Array('main' => 'in-commerce:reports'), @@ -62,7 +62,7 @@ 'parent' => 'in-commerce', 'icon' => 'in-commerce:sales_report', 'label' => 'la_tab_SaleReports', - 'url' => Array('t' => 'in-commerce/reports/reports', 'pass' => 'm,rep', 'rep_event'=>'OnNew'), + 'url' => Array('t' => 'in-commerce/reports/reports', 'pass' => 'm,rep', 'rep_event' => 'OnNew'), 'permissions' => Array('view', 'add'), 'priority' => 2, 'type' => stTREE, @@ -85,9 +85,9 @@ ) ), - 'ListSQLs' => Array( ''=>'SELECT %1$s.* %2$s FROM %1$s', + 'ListSQLs' => Array( '' => 'SELECT %1$s.* %2$s FROM %1$s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %1$s', + 'ItemSQLs' => Array( '' => 'SELECT * FROM %1$s', ), 'ListSortings' => Array( @@ -106,17 +106,28 @@ ), 'VirtualFields' => Array( - 'ReportType' => array('formatter'=>'kOptionsFormatter','options'=>array( + 'ReportType' => array('formatter' => 'kOptionsFormatter', 'options' =>array( 12 => 'la_Overall', 1 => 'la_ByCategory', 2 => 'la_ByUser', 5 => 'la_byProduct' - ),'use_phrases'=>1,'default'=>12 + ), + 'use_phrases' => 1, 'default' => 12, ), - 'FromDateTime' => Array('formatter'=>'kDateFormatter','default'=>'','filter_type'=>'range_from','filter_field'=>'OrderDate' ), - 'ToDateTime' => Array('formatter'=>'kDateFormatter','default'=>'','filter_type'=>'range_to','filter_field'=>'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), - 'Recursive' => array('default'=>1), - 'SkipEmpty' => array('default'=>1), + 'FromDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ), + 'ToDateTime' => Array('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), + 'Recursive' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), + 'SkipEmpty' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), 'CategoryId' => Array ('type' => 'int', 'default' => 0), ), 'Grids' => Array( @@ -126,12 +137,12 @@ 'module' => 'core', ), 'Fields' => Array( - 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Start' => Array( 'title'=>'la_col_Start', 'filter_block' => 'grid_date_range_filter'), - 'End' => Array( 'title'=>'la_col_End', 'filter_block' => 'grid_date_range_filter'), - 'GroupId' => Array( 'title'=>'la_col_Group', 'filter_block' => 'grid_options_filter'), - 'Type' => Array( 'title'=>'la_col_Type', 'filter_block' => 'grid_options_filter'), - 'Amount' => Array( 'title'=>'la_col_Amount', 'filter_block' => 'grid_float_range_filter'), + 'Name' => Array( 'title' => 'la_col_Name', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Start' => Array( 'title' => 'la_col_Start', 'filter_block' => 'grid_date_range_filter'), + 'End' => Array( 'title' => 'la_col_End', 'filter_block' => 'grid_date_range_filter'), + 'GroupId' => Array( 'title' => 'la_col_Group', 'filter_block' => 'grid_options_filter'), + 'Type' => Array( 'title' => 'la_col_Type', 'filter_block' => 'grid_options_filter'), + 'Amount' => Array( 'title' => 'la_col_Amount', 'filter_block' => 'grid_float_range_filter'), ), ), Index: branches/5.1.x/units/shipping/shipping_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/shipping/shipping_config.php (.../shipping_config.php) (revision 13156) +++ branches/5.1.x/units/shipping/shipping_config.php (.../shipping_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ('s' => '!la_title_EditingShippingType!'), 'new_titlefield' => Array ('s' => '!la_title_NewShippingType!'), ), - 'shipping_list'=>Array ( 'prefixes' => Array ('s_List'), + 'shipping_list' =>Array ( 'prefixes' => Array ('s_List'), 'format' => "!la_title_ShippingTypes!", ), - 'shipping_type_edit'=>Array ( 'prefixes' => Array ('s'), + 'shipping_type_edit' =>Array ( 'prefixes' => Array ('s'), 'format' => "#s_status# '#s_titlefield#' - !la_title_General!", ), @@ -112,45 +112,70 @@ Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER), ), 'Filters' => Array ( - 'show_active' => Array ('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), - 'ListSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql - 'ItemSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( '' => Array ( 'Sorting' => Array ('Name' => 'asc'), ) ), 'Fields' => Array ( - 'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required'=>true, 'max_len'=>25, 'error_msgs' => Array ('required' => 'Please fill in')), - 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required'=>true, 'max_len'=>100, 'error_msgs' => Array ('required' => 'Please fill in')), - 'SpeedCode' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => true, 'max_len' => 25), - 'LocationFrom' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Riga', 2 => 'Salaspils', 3 => 'Chicago', 4 => 'Dublin'), 'not_null' => true, 'default' => 1), - 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByWeight', 2 => 'la_ByItem', 3 => 'la_ByAmount', 4 => 'la_Handling'), 'not_null' => true, 'default' => 1), - 'BaseFee' => Array ('type' => 'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => true), - 'CODFlatSurcharge' => Array ('type' => 'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => true), - 'CODPercentSurcharge' => Array ('type' => 'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => true), - 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled', 2 => 'la_SelectedOnly' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => true ), - 'CostType' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Flat', 2 => 'la_PerUnit', 3 => 'la_Combined' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => true ), - 'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => true ), - 'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => true ), - 'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => true ), - 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), - 'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0), - 'IsFreePromoShipping' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'use_phrases' => 1, 'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'formatter' => 'kOptionsFormatter'), - 'InsuranceFee' => Array ('type' => 'float', 'default' => null), - 'InsuranceType' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), - 'not_null' => 1, 'default' => 2 - ), - ), + 'ShippingID' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Code' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>25, 'error_msgs' => Array ('required' => 'Please fill in')), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')), + 'SpeedCode' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' => 25), + 'LocationFrom' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( + 1 => 'Riga', + 2 => 'Salaspils', + 3 => 'Chicago', + 4 => 'Dublin' + ), + 'not_null' => 1, 'default' => 1 + ), + 'Type' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, + 'options' => Array (1 => 'la_ByWeight', 2 => 'la_ByItem', 3 => 'la_ByAmount', 4 => 'la_Handling'), + 'not_null' => 1, 'default' => 1), + 'BaseFee' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), + 'CODFlatSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), + 'CODPercentSurcharge' => Array ('type' => 'float', 'min_value_inc' =>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => 0, 'not_null' => 1), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled', 2 => 'la_SelectedOnly' ), 'use_phrases' => 1, + 'default' => 1, 'not_null' => 1, + ), + 'CostType' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Flat', 2 => 'la_PerUnit', 3 => 'la_Combined' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ), + 'ZeroIfEmpty' => Array ('type' => 'int', 'options' => Array ( 1 => 'la_Zeros', 0 => 'la_NoShipments' ), 'use_phrases' => 1, 'default' => 1, 'not_null' => 1 ), + 'PrecisionBeforeSep' => Array ('type' => 'int', 'options' => Array ( 1 => '1 digit', 2 => '2 digits', 3 => '3 digits', 4 => '4 digits' ), 'default' => 2, 'not_null' => 1 ), + 'PrecisionAfterSep' => Array ('type' => 'int', 'options' => Array ( 0 => 'none', 1 => '1 digit', 2 => '2 digits' ), 'default' => 2, 'not_null' => 1 ), + 'PortalGroups' => Array ('type' => 'string', 'default' => null), + 'FreeShippingMinAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' => 1, 'format' => '%.2f', 'default' => 0), + 'IsFreePromoShipping' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'InsuranceFee' => Array ('type' => 'float', 'default' => null), + 'InsuranceType' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (2 => 'la_Percent', 1 => 'la_Flat',), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 2 + ), + ), 'Grids' => Array ( 'Default' => Array ( Index: branches/5.1.x/units/products/products_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/products/products_config.php (.../products_config.php) (revision 13156) +++ branches/5.1.x/units/products/products_config.php (.../products_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'p', - 'ItemClass' => Array('class'=>'ProductsItem','file'=>'products_item.php', 'require_classes' => Array('kCatDBItem'), 'build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kCatDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ProductsEventHandler','file'=>'products_event_handler.php', 'require_classes' => Array('kCatDBEventHandler'), 'build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ProductsTagProcessor','file'=>'products_tag_processor.php', 'require_classes' => Array('kCatDBTagProcessor'), 'build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'ProductsItem', 'file' => 'products_item.php', 'require_classes' => Array ('kCatDBItem'), 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kCatDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ProductsEventHandler', 'file' => 'products_event_handler.php', 'require_classes' => Array ('kCatDBEventHandler'), 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ProductsTagProcessor', 'file' => 'products_tag_processor.php', 'require_classes' => Array ('kCatDBTagProcessor'), 'build_event' => 'OnBuild'), 'AutoLoad' => true, - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', @@ -46,7 +46,7 @@ 'Conditional' => true, 'HookToPrefix' => 'pr', 'HookToSpecial' => '*', - 'HookToEvent' => Array('OnNew', 'OnAfterItemLoad'), + 'HookToEvent' => Array ('OnNew', 'OnAfterItemLoad'), 'DoPrefix' => '', 'DoSpecial' => '*', 'DoEvent' => 'OnPreSave', @@ -57,7 +57,7 @@ 'Conditional' => false, 'HookToPrefix' => 'lst', 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnBeforeCopyToLive' ), + 'HookToEvent' => Array ( 'OnBeforeCopyToLive' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnSaveVirtualProduct', @@ -68,7 +68,7 @@ 'Conditional' => false, 'HookToPrefix' => 'lst', 'HookToSpecial' => '*', - 'HookToEvent' => Array('OnAfterItemDelete'), + 'HookToEvent' => Array ('OnAfterItemDelete'), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnDeleteListingType', @@ -79,7 +79,7 @@ 'Conditional' => false, 'HookToPrefix' => 'lst', 'HookToSpecial' => '*', - 'HookToEvent' => Array('OnAfterConfigRead'), + 'HookToEvent' => Array ('OnAfterConfigRead'), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnModifyPaidListingConfig', @@ -90,7 +90,7 @@ 'Conditional' => false, 'HookToPrefix' => 'file', 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnNew', 'OnEdit' ), + 'HookToEvent' => Array ( 'OnNew', 'OnEdit' ), 'DoPrefix' => '', 'DoSpecial' => '', 'DoEvent' => 'OnPreSave', @@ -101,23 +101,56 @@ 'Conditional' => false, 'HookToPrefix' => '', 'HookToSpecial' => '*', - 'HookToEvent' => Array('OnAfterConfigRead'), + 'HookToEvent' => Array ('OnAfterConfigRead'), 'DoPrefix' => 'cdata', 'DoSpecial' => '*', 'DoEvent' => 'OnDefineCustomFields', ), + + Array ( + 'Mode' => hBEFORE, + 'Conditional' => false, + 'HookToPrefix' => 'rev', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnAfterConfigRead'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnCloneSubItem', + ), + + Array ( + 'Mode' => hBEFORE, + 'Conditional' => false, + 'HookToPrefix' => 'fav', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnAfterConfigRead'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnCloneSubItem', + ), + + Array ( + 'Mode' => hBEFORE, + 'Conditional' => false, + 'HookToPrefix' => 'ci', + 'HookToSpecial' => '*', + 'HookToEvent' => Array ('OnAfterConfigRead'), + 'DoPrefix' => '', + 'DoSpecial' => '*', + 'DoEvent' => 'OnCloneSubItem', + ), ), 'IDField' => 'ProductId', - 'StatusField' => Array('Status'), // field, that is affected by Approve/Decline events + 'StatusField' => Array ('Status'), // field, that is affected by Approve/Decline events 'TitleField' => 'Name', // field, used in bluebar when editing existing item 'ItemType' => 11, // this is used when relation to product is added from in-portal and via-versa 'ViewMenuPhrase' => 'la_text_Products', 'CatalogTabIcon' => 'in-commerce:icon16_products.png', - 'ItemPropertyMappings' => Array( + 'ItemPropertyMappings' => Array ( 'NewDays' => 'Product_NewDays', // number of days item to be NEW 'MinPopVotes' => 'Product_MinPopVotes', // minimum number of votes for an item to be POP 'MinPopRating' => 'Product_MinPopRating', // minimum rating for an item to be POP @@ -129,74 +162,74 @@ 'TitlePhrase' => 'la_text_Product', - 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('p'=>'!la_title_Adding_Product!'), - 'edit_status_labels' => Array('p'=>'!la_title_Editing_Product!'), - 'new_titlefield' => Array('p'=>'!la_title_NewProduct!'), + 'TitlePresets' => Array ( + 'default' => Array ( 'new_status_labels' => Array ('p' => '!la_title_Adding_Product!'), + 'edit_status_labels' => Array ('p' => '!la_title_Editing_Product!'), + 'new_titlefield' => Array ('p' => '!la_title_NewProduct!'), ), - 'product_list'=>Array( 'prefixes' => Array('c_List','p_List'), - 'tag_params' => Array('c'=> Array('per_page'=>-1)), + 'product_list' =>Array ( 'prefixes' => Array ('c_List', 'p_List'), + 'tag_params' => Array ('c' => Array ('per_page' =>-1)), 'format' => "!la_title_Categories! (#c_recordcount#) - !la_title_Products! (#p_recordcount#)", ), - 'products_edit'=>Array( 'prefixes' => Array('p'), - 'new_titlefield' => Array('p'=>'!la_title_NewProduct!'), + 'products_edit' =>Array ( 'prefixes' => Array ('p'), + 'new_titlefield' => Array ('p' => '!la_title_NewProduct!'), 'format' => "#p_status# '#p_titlefield#' - !la_title_General!", ), - 'inventory' => Array('prefixes' => Array('p'), 'format' => "#p_status# - '#p_titlefield#' - !la_title_Product_Inventory!"), - 'pricing' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Pricing!"), - 'access_pricing' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_AccessPricing!"), - 'access' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Access!"), - 'files' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Files!"), - 'options'=> Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Options!"), - 'categories'=> Array('prefixes' => Array('p','p-ci_List'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Categories!"), - 'relations' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Relations!"), - 'content' => Array('prefixes' => Array('p','p.content_List'), 'tag_params' => Array('p.content' => Array('types'=>'content', 'live_table'=>true)), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_PackageContent!"), - 'images' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Images!"), - 'reviews' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Reviews!"), - 'products_custom' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Custom!"), - 'images_edit' => Array( 'prefixes' => Array('p', 'img'), - 'new_status_labels' => Array('img'=>'!la_title_Adding_Image!'), - 'edit_status_labels' => Array('img'=>'!la_title_Editing_Image!'), - 'new_titlefield' => Array('img'=>'!la_title_New_Image!'), + 'inventory' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# - '#p_titlefield#' - !la_title_Product_Inventory!"), + 'pricing' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Pricing!"), + 'access_pricing' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_AccessPricing!"), + 'access' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Access!"), + 'files' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Files!"), + 'options' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_Options!"), + 'categories' => Array ('prefixes' => Array ('p', 'p-ci_List'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Categories!"), + 'relations' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Relations!"), + 'content' => Array ('prefixes' => Array ('p', 'p.content_List'), 'tag_params' => Array ('p.content' => Array ('types' => 'content', 'live_table' =>true)), 'format' => "#p_status# '#p_titlefield#' - !la_title_Product_PackageContent!"), + 'images' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Images!"), + 'reviews' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Reviews!"), + 'products_custom' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_Custom!"), + 'images_edit' => Array ( 'prefixes' => Array ('p', 'img'), + 'new_status_labels' => Array ('img' => '!la_title_Adding_Image!'), + 'edit_status_labels' => Array ('img' => '!la_title_Editing_Image!'), + 'new_titlefield' => Array ('img' => '!la_title_New_Image!'), 'format' => "#p_status# '#p_titlefield#' - #img_status# '#img_titlefield#'", ), - 'pricing_edit' => Array( 'prefixes' => Array('p', 'pr'), - 'new_status_labels' => Array('pr'=>"!la_title_Adding_PriceBracket! '!la_title_New_PriceBracket!'"), - 'edit_status_labels' => Array('pr'=>'!la_title_Editing_PriceBracket!'), + 'pricing_edit' => Array ( 'prefixes' => Array ('p', 'pr'), + 'new_status_labels' => Array ('pr' =>"!la_title_Adding_PriceBracket! '!la_title_New_PriceBracket!'"), + 'edit_status_labels' => Array ('pr' => '!la_title_Editing_PriceBracket!'), 'format' => "#p_status# '#p_titlefield#' - #pr_status#", ), - 'options_edit' => Array( 'prefixes' => Array('p', 'po'), - 'new_status_labels' => Array('po'=>"!la_title_Adding_Option!"), - 'edit_status_labels' => Array('po'=>'!la_title_Editing_Option!'), - 'new_titlefield' => Array('po'=>'!la_title_New_Option!'), + 'options_edit' => Array ( 'prefixes' => Array ('p', 'po'), + 'new_status_labels' => Array ('po' =>"!la_title_Adding_Option!"), + 'edit_status_labels' => Array ('po' => '!la_title_Editing_Option!'), + 'new_titlefield' => Array ('po' => '!la_title_New_Option!'), 'format' => "#p_status# '#p_titlefield#' - #po_status# '#po_titlefield#'", ), - 'options_combinations' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_ManagingOptionCombinations!"), - 'shipping_options' => Array('prefixes' => Array('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_ManagingShippingOptions!"), + 'options_combinations' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_ManagingOptionCombinations!"), + 'shipping_options' => Array ('prefixes' => Array ('p'), 'format' => "#p_status# '#p_titlefield#' - !la_title_ManagingShippingOptions!"), - 'file_edit' => Array( 'prefixes' => Array('p', 'file'), - 'new_status_labels' => Array('file'=>"!la_title_Adding_File!"), - 'edit_status_labels' => Array('file'=>'!la_title_Editing_File!'), - 'new_titlefield' => Array('file'=>'!la_title_New_File!'), + 'file_edit' => Array ( 'prefixes' => Array ('p', 'file'), + 'new_status_labels' => Array ('file' =>"!la_title_Adding_File!"), + 'edit_status_labels' => Array ('file' => '!la_title_Editing_File!'), + 'new_titlefield' => Array ('file' => '!la_title_New_File!'), 'format' => "#p_status# '#p_titlefield#' - #file_status# '#file_titlefield#'", ), - 'relations_edit' => Array( 'prefixes' => Array('p', 'rel'), - 'new_status_labels' => Array('rel'=>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"), - 'edit_status_labels' => Array('rel'=>'!la_title_Editing_Relationship!'), + 'relations_edit' => Array ( 'prefixes' => Array ('p', 'rel'), + 'new_status_labels' => Array ('rel' =>"!la_title_Adding_Relationship! '!la_title_New_Relationship!'"), + 'edit_status_labels' => Array ('rel' => '!la_title_Editing_Relationship!'), 'format' => "#p_status# '#p_titlefield#' - #rel_status#", ), - 'reviews_edit' => Array( 'prefixes' => Array('p', 'rev'), - 'new_status_labels' => Array('rev'=>"!la_title_Adding_Review! '!la_title_New_Review!'"), - 'edit_status_labels' => Array('rev'=>'!la_title_Editing_Review!'), + 'reviews_edit' => Array ( 'prefixes' => Array ('p', 'rev'), + 'new_status_labels' => Array ('rev' =>"!la_title_Adding_Review! '!la_title_New_Review!'"), + 'edit_status_labels' => Array ('rev' => '!la_title_Editing_Review!'), 'format' => "#p_status# '#p_titlefield#' - #rev_status#", ), - 'products_export' => Array('format' => '!la_title_ProductsExport!'), + 'products_export' => Array ('format' => '!la_title_ProductsExport!'), - 'products_import' => Array('format' => '!la_title_ImportProducts!'), + 'products_import' => Array ('format' => '!la_title_ImportProducts!'), - 'tree_in-commerce' => Array('format' => '!la_Text_Version! '.$this->Application->findModule('Name', 'In-Commerce', 'Version')), + 'tree_in-commerce' => Array ('format' => '!la_Text_Version! '.$this->Application->findModule('Name', 'In-Commerce', 'Version')), ), 'EditTabPresets' => Array ( @@ -222,27 +255,27 @@ 'PermItemPrefix' => 'PRODUCT', 'PermTabText' => 'In-Commerce', - 'PermSection' => Array('main' => 'CATEGORY:in-commerce:products_list', 'search' => 'in-commerce:search', 'email' => 'in-commerce:incommerce_configemail', 'custom' => 'in-commerce:configuration_custom'), + 'PermSection' => Array ('main' => 'CATEGORY:in-commerce:products_list', 'search' => 'in-commerce:search', 'email' => 'in-commerce:incommerce_configemail', 'custom' => 'in-commerce:configuration_custom'), - 'Sections' => Array( - 'in-commerce' => Array( + 'Sections' => Array ( + 'in-commerce' => Array ( 'parent' => 'in-portal:root', 'icon' => 'ecommerce', 'label' => 'la_title_In-Commerce', - 'url' => Array('t' => 'index', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view'), + 'url' => Array ('t' => 'index', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view'), 'priority' => 2.1, 'container' => true, 'type' => stTREE, ), - 'in-commerce:products' => Array( + 'in-commerce:products' => Array ( 'parent' => 'in-portal:site', 'icon' => 'products', 'label' => 'la_tab_Products', - 'url' => Array('t' => 'catalog/advanced_view', 'anchor' => 'tab-p.showall', 'pass' => 'm'), + 'url' => Array ('t' => 'catalog/advanced_view', 'anchor' => 'tab-p.showall', 'pass' => 'm'), 'onclick' => 'setCatalogTab(\'p.showall\')', - 'permissions' => Array('view'), + 'permissions' => Array ('view'), 'priority' => 3.2, 'type' => stTREE, ), @@ -260,97 +293,98 @@ 'type' => stTREE, ), - 'in-commerce:general' => Array( + 'in-commerce:general' => Array ( 'parent' => 'in-commerce:setting_folder', 'icon' => 'conf_ecommerce_general', 'label' => 'la_tab_GeneralSettings', - 'url' => Array('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'edit'), + 'url' => Array ('t' => 'config/config_general', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view', 'edit'), 'priority' => 1, 'type' => stTREE, ), - 'in-commerce:output' => Array( + 'in-commerce:output' => Array ( 'parent' => 'in-commerce:setting_folder', 'icon' => 'core:conf_output', 'label' => 'la_tab_ConfigOutput', - 'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'edit'), + 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view', 'edit'), 'priority' => 2, 'type' => stTREE, ), - 'in-commerce:search' => Array( + 'in-commerce:search' => Array ( 'parent' => 'in-commerce:setting_folder', 'icon' => 'core:conf_search', 'label' => 'la_tab_ConfigSearch', - 'url' => Array('t' => 'config/config_search', 'module_key' => 'products', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'edit'), + 'url' => Array ('t' => 'config/config_search', 'module_key' => 'products', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view', 'edit'), 'priority' => 7, 'type' => stTREE, ), - 'in-commerce:incommerce_configemail' => Array( + 'in-commerce:incommerce_configemail' => Array ( 'parent' => 'in-commerce:setting_folder', 'icon' => 'core:conf_email', 'label' => 'la_tab_ConfigE-mail', - 'url' => Array('t' => 'config/config_email', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'edit'), + 'url' => Array ('t' => 'config/config_email', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view', 'edit'), 'priority' => 8, 'type' => stTREE, ), - 'in-commerce:configuration_custom' => Array( + 'in-commerce:configuration_custom' => Array ( 'parent' => 'in-commerce:setting_folder', 'icon' => 'core:conf_customfields', 'label' => 'la_tab_ConfigCustom', - 'url' => Array('t' => 'custom_fields/custom_fields_list', 'cf_type' => 11, 'pass_section' => true, 'pass' => 'm,cf'), - 'permissions' => Array('view', 'add', 'edit', 'delete'), + 'url' => Array ('t' => 'custom_fields/custom_fields_list', 'cf_type' => 11, 'pass_section' => true, 'pass' => 'm,cf'), + 'permissions' => Array ('view', 'add', 'edit', 'delete'), 'priority' => 9, 'type' => stTREE, ), - 'in-commerce:contacts' => Array( + 'in-commerce:contacts' => Array ( 'parent' => 'in-commerce:setting_folder', 'icon' => 'conf_contact_info', 'label' => 'la_tab_ConfigContacts', - 'url' => Array('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), - 'permissions' => Array('view', 'edit'), + 'url' => Array ('t' => 'config/config_universal', 'pass_section' => true, 'pass' => 'm'), + 'permissions' => Array ('view', 'edit'), 'priority' => 10, 'type' => stTREE, ), ), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_pending','show_disabled'), 'type' => WHERE_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_tang','show_sub','show_serv','show_download','show_package'), 'type' => WHERE_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_new'), 'type' => HAVING_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_hot'), 'type' => HAVING_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_pop'), 'type' => HAVING_FILTER), - Array('mode' => 'AND', 'filters' => Array('show_pick'), 'type' => WHERE_FILTER), + 'FilterMenu' => Array ( + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_pending', 'show_disabled'), 'type' => WHERE_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_tang', 'show_sub', 'show_serv', 'show_download', 'show_package'), 'type' => WHERE_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_new'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_hot'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pop'), 'type' => HAVING_FILTER), + Array ('mode' => 'AND', 'filters' => Array ('show_pick'), 'type' => WHERE_FILTER), ), - 'Filters' => Array( - 'show_active' => Array('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_pending' => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 's1' => Array(), - 'show_tang' => Array('label' => 'la_product_tangible', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ), - 'show_sub' => Array('label' => 'la_product_subscription', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ), - 'show_serv' => Array('label' => 'la_product_service', 'on_sql' => '', 'off_sql' => '%1$s.Type != 3' ), - 'show_download' => Array('label' => 'la_product_downloadable', 'on_sql' => '', 'off_sql' => '%1$s.Type != 4' ), - 'show_package' => Array('label' => 'la_product_package', 'on_sql' => '', 'off_sql' => '%1$s.Type != 5' ), - 's2' => Array(), - 'show_new' => Array('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), - 'show_hot' => Array('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), - 'show_pop' => Array('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), - 'show_pick' => Array('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), + 'Filters' => Array ( + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_pending' => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), + 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), + 's1' => Array (), + 'show_tang' => Array ('label' => 'la_product_tangible', 'on_sql' => '', 'off_sql' => '%1$s.Type != 1' ), + 'show_sub' => Array ('label' => 'la_product_subscription', 'on_sql' => '', 'off_sql' => '%1$s.Type != 2' ), + 'show_serv' => Array ('label' => 'la_product_service', 'on_sql' => '', 'off_sql' => '%1$s.Type != 3' ), + 'show_download' => Array ('label' => 'la_product_downloadable', 'on_sql' => '', 'off_sql' => '%1$s.Type != 4' ), + 'show_package' => Array ('label' => 'la_product_package', 'on_sql' => '', 'off_sql' => '%1$s.Type != 5' ), + 's2' => Array (), + 'show_new' => Array ('label' => 'la_Text_New', 'on_sql' => '', 'off_sql' => '`IsNew` != 1' ), + 'show_hot' => Array ('label' => 'la_Text_TopSellers', 'on_sql' => '', 'off_sql' => '`IsHot` != 1' ), + 'show_pop' => Array ('label' => 'la_Text_Pop', 'on_sql' => '', 'off_sql' => '`IsPop` != 1' ), + 'show_pick' => Array ('label' => 'la_prompt_EditorsPick', 'on_sql' => '', 'off_sql' => '%1$s.`EditorsPick` != 1' ), ) ), 'TableName' => TABLE_PREFIX.'Products', 'CalculatedFields' => Array ( '' => Array ( + 'AltName' => 'img.AltName', 'SameImages' => 'img.SameImages', 'LocalThumb' => 'img.LocalThumb', 'ThumbPath' => 'img.ThumbPath', @@ -383,7 +417,7 @@ ), ), - 'ListSQLs' => Array( + 'ListSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalGroup ON '.TABLE_PREFIX.'PortalGroup.GroupId = %1$s.AccessGroupId @@ -396,7 +430,7 @@ LEFT JOIN '.TABLE_PREFIX.'PermCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId', - 'showall'=> 'SELECT %1$s.* %2$s FROM %1$s + 'showall' => 'SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'ProductsPricing pricing ON pricing.ProductId = %1$s.ProductId AND pricing.IsPrimary = 1 LEFT JOIN '.TABLE_PREFIX.'ProductFiles files ON files.ProductId = %1$s.ProductId AND files.IsPrimary = 1 LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId @@ -405,13 +439,13 @@ LEFT JOIN '.TABLE_PREFIX.'PermCache perm ON perm.CategoryId = '.TABLE_PREFIX.'%3$sCategoryItems.CategoryId LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId', ), // key - special, value - list select sql - 'ListSortings' => Array( - '' => Array( - 'ForcedSorting' => Array('Priority' => 'desc'), - 'Sorting' => Array('Name' => 'asc'), + 'ListSortings' => Array ( + '' => Array ( + 'ForcedSorting' => Array ('Priority' => 'desc'), + 'Sorting' => Array ('Name' => 'asc'), ) ), - 'ItemSQLs' => Array( ''=>' SELECT %1$s.* %2$s + 'ItemSQLs' => Array ( '' => ' SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'PortalGroup pg ON pg.GroupId = %1$s.AccessGroupId LEFT JOIN '.TABLE_PREFIX.'%3$sCategoryItems ON '.TABLE_PREFIX.'%3$sCategoryItems.ItemResourceId = %1$s.ResourceId @@ -422,132 +456,175 @@ LEFT JOIN '.TABLE_PREFIX.'Manufacturers ON '.TABLE_PREFIX.'Manufacturers.ManufacturerId = %1$s.ManufacturerId LEFT JOIN '.TABLE_PREFIX.'%3$sProductsCustomData cust ON %1$s.ResourceId = cust.ResourceId', ), - 'SubItems' => Array('pr', 'rev', 'img', 'po', 'poc', 'p-ci', 'rel', 'file', 'p-cdata', 'p-fav'), - 'Fields' => Array( - 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'required'=>true, 'max_len'=>255, 'default' => ''), - 'AutomaticFilename' => Array('type' => 'int', 'not_null' => 1, 'default' => 1), - 'SKU' => Array('type' => 'string', 'required'=>true, 'max_len'=>255, 'error_msgs' => Array('required' => 'Please fill in'), 'default' => NULL), - 'Description' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL), - 'DescriptionExcerpt' => Array('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL), - 'Weight' => Array('type'=>'float', 'min_value_exc'=>0, 'formatter' => 'kUnitFormatter', 'format' => '%0.2f', 'default' => NULL), - 'MSRP' => Array('type'=>'float', 'min_value_inc'=>0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL), - 'ManufacturerId' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options'=>Array(0 => ''), 'options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Manufacturers ORDER BY Name', 'option_key_field'=>'ManufacturerId', 'option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), - 'Status' => Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2), - 'BackOrder' => Array('type' => 'int', 'not_null' => 1, 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'default' => 2 ), - 'BackOrderDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'error_msgs' => Array('bad_date_format' => 'Please use the following date format: %s'), 'default' => NULL), - 'NewItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ), - 'HotItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ), - 'PopItem' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ), - 'EditorsPick' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'Featured' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'OnSale' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'Priority' => Array('type'=>'int', 'not_null' => 1, 'default' => 0), - 'CachedRating' => Array('not_null' => 1, 'default' => 0, 'type' => 'float', 'formatter' => 'kFormatter', 'format' => '%0.2f'), - 'CachedVotesQty' => Array('type'=>'int', 'not_null' => 1, 'default' => 0), - 'Hits' => Array('type' => 'double', 'formatter'=>'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), - 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#'), - 'Expire' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>null), - 'Type' => Array('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1=>'la_product_tangible', 2=>'la_product_subscription', 4=>'la_product_downloadable', 3=>'la_product_service'/*, 6=>'la_gift_certificate', 5=>'la_product_package'*/), 'not_null' => 1, 'default' => 1 ), - 'Modified' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default'=>'#NOW#'), - 'ModifiedById' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'CreatedById' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ResourceId' => Array('type' => 'int', 'default' => 0), - 'CachedReviewsQty' => Array('type' => 'int', 'formatter'=>'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), - 'InventoryStatus' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_by_product', 2 => 'la_by_options'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'QtyInStock' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'QtyInStockMin' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'QtyReserved' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'QtyBackOrdered' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'QtyOnOrder' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'InventoryComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), - 'Qty' => Array('type'=>'int', 'formatter'=>'kFormatter', 'regexp'=>'/^[\d]+$/', 'error_msgs' => Array('invalid_format'=>'!la_invalid_integer!')), - 'AccessGroupId' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalGroup WHERE System!=1 AND Personal !=1 ORDER BY Name', 'option_key_field'=>'GroupId', 'option_title_field'=>'Name', 'default' => NULL), - 'AccessDuration' => Array('type' => 'int', 'default' => NULL), - 'AccessDurationType' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year' ), 'default' => NULL,), - 'AccessStart' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), - 'AccessEnd' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL,), - 'OptionsSelectionMode' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(0 => 'la_opt_Selection', 1 => 'la_opt_List'), 'default' => 0), - 'HasRequiredOptions' => Array('type' => 'int', 'default' => 0, 'not_null' => 1), - 'Virtual' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ProcessingData' => Array('type' => 'string', 'default' => ''), - 'PackageContent' => Array('type' => 'string', 'default' => NULL), - 'IsRecurringBilling' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), -// 'PayPalRecurring' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'), - 'ShippingMode' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(0 => 'la_shipping_AnyAndSelected', 1 => 'la_shipping_Limited'), 'not_null' => 1, 'default'=>0), + 'SubItems' => Array ('pr', 'rev', 'img', 'po', 'poc', 'p-ci', 'rel', 'file', 'p-cdata', 'p-fav'), + 'Fields' => Array ( + 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'required' => 1, 'max_len' =>255, 'default' => ''), + 'AutomaticFilename' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), + 'SKU' => Array ('type' => 'string', 'required' => 1, 'max_len' =>255, 'error_msgs' => Array ('required' => 'Please fill in'), 'default' => NULL), + 'Description' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL), + 'DescriptionExcerpt' => Array ('type' => 'string', 'formatter' => 'kMultiLanguage', 'using_fck' => 1, 'default' => NULL), + 'Weight' => Array ('type' => 'float', 'min_value_exc' => 0, 'formatter' => 'kUnitFormatter', 'format' => '%0.2f', 'default' => NULL), + 'MSRP' => Array ('type' => 'float', 'min_value_inc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.2f', 'default' => NULL), + 'ManufacturerId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' =>Array (0 => ''), 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Manufacturers ORDER BY Name', 'option_key_field' => 'ManufacturerId', 'option_title_field' => 'Name', 'not_null' => 1, 'default' => 0), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, + 'default' => 2, 'not_null' => 1, + ), + 'BackOrder' => Array ('type' => 'int', 'not_null' => 1, 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'default' => 2 ), + 'BackOrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'error_msgs' => Array ('bad_date_format' => 'Please use the following date format: %s'), 'default' => NULL), + 'NewItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ), + 'HotItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ), + 'PopItem' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array ( 2 => 'la_Auto', 1 => 'la_Always', 0 => 'la_Never' ), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2 ), + 'EditorsPick' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Featured' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'OnSale' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'CachedRating' => Array ('not_null' => 1, 'default' => 0, 'type' => 'float', 'formatter' => 'kFormatter', 'format' => '%0.2f'), + 'CachedVotesQty' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Hits' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'Expire' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' =>null), + 'Type' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1=> 'la_product_tangible', 2=> 'la_product_subscription', 4=> 'la_product_downloadable', 3=> 'la_product_service'/*, 6=> 'la_gift_certificate', 5=> 'la_product_package'*/), 'not_null' => 1, 'default' => 1 ), + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'ModifiedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'CreatedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ResourceId' => Array ('type' => 'int', 'default' => 0), + 'CachedReviewsQty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'format' => '%d', 'not_null' => 1, 'default' => 0), + 'InventoryStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Disabled', 1 => 'la_by_product', 2 => 'la_by_options'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), + 'QtyInStock' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'QtyInStockMin' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'QtyReserved' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'QtyBackOrdered' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'QtyOnOrder' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'InventoryComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), + 'Qty' => Array ('type' => 'int', 'formatter' => 'kFormatter', 'regexp' => '/^[\d]+$/', 'error_msgs' => Array ('invalid_format' => '!la_invalid_integer!')), + 'AccessGroupId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalGroup WHERE System!=1 AND Personal !=1 ORDER BY Name', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', 'default' => NULL), + 'AccessDuration' => Array ('type' => 'int', 'default' => NULL), + 'AccessDurationType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1 => 'la_opt_sec', 2 => 'la_opt_min', 3 => 'la_opt_hour', 4 => 'la_opt_day', 5 => 'la_opt_week', 6 => 'la_opt_month', 7 => 'la_opt_year' ), 'default' => NULL,), + 'AccessStart' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL), + 'AccessEnd' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => NULL,), + 'OptionsSelectionMode' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (0 => 'la_opt_Selection', 1 => 'la_opt_List'), 'default' => 0), + 'HasRequiredOptions' => Array ('type' => 'int', 'default' => 0, 'not_null' => 1), + 'Virtual' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ProcessingData' => Array ('type' => 'string', 'default' => ''), + 'PackageContent' => Array ('type' => 'string', 'default' => NULL), + 'IsRecurringBilling' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + ), + //'PayPalRecurring' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => '1', 'default' => '0'), + 'ShippingMode' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (0 => 'la_shipping_AnyAndSelected', 1 => 'la_shipping_Limited'), 'not_null' => 1, 'default' =>0), - 'ProcessingData' => Array('type' => 'string', 'default' => null), + 'ProcessingData' => Array ('type' => 'string', 'default' => null), - 'ShippingLimitation' => Array('type' => 'string', 'default' => NULL), - 'AssignedCoupon' => - Array('type' => 'int', 'not_null' => 1, 'default' => 0, - 'formatter'=>'kLEFTFormatter', - 'options' => array(0 => 'None'), - 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'ProductsCoupons WHERE `%s` = \'%s\'', - 'left_key_field'=>'CouponId', - 'left_title_field'=>'Name'), - 'MinQtyFreePromoShipping' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'MetaKeywords' => Array('type' => 'string', 'default' => null), - 'MetaDescription' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), - ), - 'VirtualFields' => Array( - 'Qty' => 1, - 'Price' => Array('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), - 'Cost' => Array('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), - 'IsHot' => Array('type'=>'int'), - 'IsNew' => Array('type'=>'int'), - 'IsPop' => Array('type'=>'int'), - 'Manufacturer' => Array(), + 'ShippingLimitation' => Array ('type' => 'string', 'default' => NULL), + 'AssignedCoupon' => + Array ('type' => 'int', 'not_null' => 1, 'default' => 0, + 'formatter' => 'kLEFTFormatter', + 'options' => Array (0 => 'None'), + 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'ProductsCoupons WHERE `%s` = \'%s\'', + 'left_key_field' => 'CouponId', + 'left_title_field' => 'Name'), + 'MinQtyFreePromoShipping' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'MetaKeywords' => Array ('type' => 'string', 'default' => null), + 'MetaDescription' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), + ), - // export related fields: begin - 'CategoryId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0), - 'ExportFormat' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CSV', /*2 => 'XML'*/), 'default' => 1), - 'ExportFilename' => Array('type' => 'string', 'default' => ''), - 'FieldsSeparatedBy' => Array('type' => 'string', 'default' => ','), - 'FieldsEnclosedBy' => Array('type' => 'string', 'default' => '"'), - 'LineEndings' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'Windows', 2 => 'UNIX'), 'default' => 1), - 'LineEndingsInside' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CRLF', 2 => 'LF'), 'default' => 2), - 'IncludeFieldTitles' => Array('type' => 'int', 'default' => 1), - 'ExportColumns' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()), - 'AvailableColumns' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()), - 'CategoryFormat' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1), - 'CategorySeparator' => Array('type' => 'string', 'default' => ':'), - 'IsBaseCategory' => Array('type' => 'int', 'default' => 0), - // export related fields: end + 'VirtualFields' => Array ( + 'Qty' => 1, + 'Price' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), + 'Cost' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%.2f', 'default' => NULL), + 'IsHot' => Array ('type' => 'int'), + 'IsNew' => Array ('type' => 'int'), + 'IsPop' => Array ('type' => 'int'), + 'Manufacturer' => Array (), - // import related fields: begin - 'FieldTitles' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1), - 'ImportSource' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2), - 'ImportFilename' => Array('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => (defined('EXPORT_BASE_PATH') ? EXPORT_BASE_PATH : '/admin/export') . '/'), - 'ImportLocalFilename' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''), - 'CheckDuplicatesMethod' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1), - 'ReplaceDuplicates' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0), - 'DuplicateCheckFields' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array('Name' => 'NAME'), 'default' => '|Name|'), - 'SkipFirstRow' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 1), - // import related fields: end + // export related fields: begin + 'CategoryId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (), 'default' => 0), + 'ExportFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1), + 'ExportFilename' => Array ('type' => 'string', 'default' => ''), + 'FieldsSeparatedBy' => Array ('type' => 'string', 'default' => ', '), + 'FieldsEnclosedBy' => Array ('type' => 'string', 'default' => '"'), + 'LineEndings' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1), + 'LineEndingsInside' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2), + 'IncludeFieldTitles' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'CategoryFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_MixedCategoryPath', 2 => 'la_SeparatedCategoryPath'), 'use_phrases' => 1, 'default' => 1), + 'CategorySeparator' => Array ('type' => 'string', 'default' => ':'), + 'IsBaseCategory' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + ), + // export related fields: end - 'ThumbnailImage' => Array('type' => 'string', 'default' => ''), - 'FullImage' => Array('type' => 'string', 'default' => ''), - 'ImageAlt' => Array('type' => 'string', 'default' => ''), + // import related fields: begin + 'FieldTitles' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Automatic', 2 => 'la_Manual'), 'use_phrases' => 1, 'default' => 1), + 'ImportSource' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Upload', 2 => 'la_Local'), 'use_phrases' => 1, 'default' => 2), + 'ImportFilename' => Array ('type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, 'upload_dir' => (defined('EXPORT_BASE_PATH') ? EXPORT_BASE_PATH : '/admin/export') . '/'), + 'ImportLocalFilename' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'default' => ''), + 'CheckDuplicatesMethod' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_IDField', 2 => 'la_OtherFields'), 'use_phrases' => 1, 'default' => 1), + 'ReplaceDuplicates' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, 'default' => 0), + 'DuplicateCheckFields' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('Name' => 'NAME'), 'default' => '|Name|'), + 'SkipFirstRow' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'default' => 1), + // import related fields: end - 'Filename' => Array('type' => 'string','not_null' => '1','default' => ''), - 'CachedNavbar' => Array('type' => 'string', 'default' => ''), - 'ParentPath' => Array('type' => 'string', 'default' => ''), + 'ThumbnailImage' => Array ('type' => 'string', 'default' => ''), + 'FullImage' => Array ('type' => 'string', 'default' => ''), + 'ImageAlt' => Array ('type' => 'string', 'default' => ''), - 'FileSize' => Array('type' => 'int','formatter' => 'kFilesizeFormatter','not_null' => 1, 'default' => 0), - 'FilePath' => Array(), - 'FileVersion' => Array(), + 'Filename' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'CachedNavbar' => Array ('type' => 'string', 'default' => ''), + 'ParentPath' => Array ('type' => 'string', 'default' => ''), - // for primary image - 'SameImages' => Array('type' => 'string', 'default' => ''), - 'LocalThumb' => Array('type' => 'string', 'default' => ''), - 'ThumbPath' => Array('type' => 'string', 'default' => ''), - 'ThumbUrl' => Array('type' => 'string', 'default' => ''), - 'LocalImage' => Array('type' => 'string', 'default' => ''), - 'LocalPath' => Array('type' => 'string', 'default' => ''), - 'FullUrl' => Array('type' => 'string', 'default' => ''), - ), - 'Grids' => Array( + 'FileSize' => Array ('type' => 'int', 'formatter' => 'kFilesizeFormatter', 'not_null' => 1, 'default' => 0), + 'FilePath' => Array (), + 'FileVersion' => Array (), + + // for primary image + 'AltName' => Array ('type' => 'string', 'default' => ''), + 'SameImages' => Array ('type' => 'string', 'default' => ''), + 'LocalThumb' => Array ('type' => 'string', 'default' => ''), + 'ThumbPath' => Array ('type' => 'string', 'default' => ''), + 'ThumbUrl' => Array ('type' => 'string', 'default' => ''), + 'LocalImage' => Array ('type' => 'string', 'default' => ''), + 'LocalPath' => Array ('type' => 'string', 'default' => ''), + 'FullUrl' => Array ('type' => 'string', 'default' => ''), + ), + + 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ( 'default' => 'icon16_product.png', @@ -556,20 +633,20 @@ 2 => 'icon16_product_pending.png', 'NEW' => 'icon16_product_new.png', ), - 'Fields' => Array( - 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'SKU' => Array( 'title'=>'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Name' => Array( 'title'=>'la_col_ProductName', 'data_block'=>'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Type' => Array('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ), - 'Manufacturer' => Array('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Price' => Array('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), - 'QtyInStock' => Array('title' => 'la_col_Qty', 'data_block'=>'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ), - 'QtyBackOrdered' => Array('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ), - 'OnSale' => Array('title' => 'la_col_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ), /* - 'Weight' => Array( 'title'=>'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ), - 'CreatedOn' => Array( 'title'=>'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), - 'BackOrderDate' => Array( 'title'=>'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), + 'Fields' => Array ( + 'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Type' => Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'Manufacturer' => Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), + 'QtyInStock' => Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ), + 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ), + 'OnSale' => Array ('title' => 'la_col_OnSale', 'filter_block' => 'grid_options_filter', 'width' => 70, ), /* + 'Weight' => Array ( 'title' => 'la_col_ProductWeight', 'filter_block' => 'grid_float_range_filter', 'width' => 150, ), + 'CreatedOn' => Array ( 'title' => 'la_col_ProductCreatedOn', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), + 'BackOrderDate' => Array ( 'title' => 'la_col_ProductBackOrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 150, ), */ ), ), @@ -584,21 +661,21 @@ ), 'Selector' => 'radio', 'Fields' => Array ( - 'ProductId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'SKU' => Array( 'title'=>'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Name' => Array( 'title'=>'la_col_ProductName', 'data_block'=>'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), - 'Type' => Array('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ), - 'Manufacturer' => Array('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Price' => Array('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), - 'QtyInStock' => Array('title' => 'la_col_Qty', 'data_block'=>'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ), - 'QtyBackOrdered' => Array('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ), + 'ProductId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'SKU' => Array ( 'title' => 'la_col_ProductSKU', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Name' => Array ( 'title' => 'la_col_ProductName', 'data_block' => 'grid_catitem_td', 'filter_block' => 'grid_like_filter', 'width' => 150, ), + 'Type' => Array ('title' => 'la_col_ProductType', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'Manufacturer' => Array ('title' => 'la_col_Manufacturer', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Price' => Array ('title' => 'la_col_Price', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 70, ), + 'QtyInStock' => Array ('title' => 'la_col_Qty', 'data_block' => 'qty_td', 'filter_block' => 'grid_range_filter', 'width' => 80, ), + 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter', 'width' => 80, ), ), ), ), - 'ConfigMapping' => Array( + 'ConfigMapping' => Array ( 'PerPage' => 'Comm_Perpage_Products', 'ShortListPerPage' => 'Comm_Perpage_Products_Short', 'ForceEditorPick' => 'products_EditorPicksAboveRegular', Index: branches/5.1.x/admin_templates/payment_type/payment_type_gateway.tpl =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/admin_templates/payment_type/payment_type_gateway.tpl (.../payment_type_gateway.tpl) (revision 13100) +++ branches/5.1.x/admin_templates/payment_type/payment_type_gateway.tpl (.../payment_type_gateway.tpl) (revision 13549) @@ -37,15 +37,12 @@ } ) ); - a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.Render(); a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - a_toolbar.HideButton('sep2'); a_toolbar.DisableButton('next'); Index: branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 13156) +++ branches/5.1.x/units/product_option_combinations/product_option_combinations_config.php (.../product_option_combinations_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'poc', - 'ItemClass' => Array('class'=>'kPOCItem','file'=>'products_option_combination_item.php','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ProductOptionCombinationsEventHandler','file'=>'product_option_combinations_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ProductOptionCombinationsTagProcessor','file'=>'product_option_combinations_tag_processor.php','build_event'=>'OnBuild'), - 'RegisterClasses' => Array( - Array('pseudo'=>'kCombinationFormatter','class'=>'kCombinationFormatter','file'=>'product_option_formatters.php','build_event'=>'','require_classes'=>'kFormatter'), - Array('pseudo'=>'kCombPriceFormatter','class'=>'kCombPriceFormatter','file'=>'product_option_formatters.php','build_event'=>'','require_classes'=>'kFormatter'), + 'ItemClass' => Array ('class' => 'kPOCItem', 'file' => 'products_option_combination_item.php', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ProductOptionCombinationsEventHandler', 'file' => 'product_option_combinations_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ProductOptionCombinationsTagProcessor', 'file' => 'product_option_combinations_tag_processor.php', 'build_event' => 'OnBuild'), + 'RegisterClasses' => Array ( + Array ('pseudo' => 'kCombinationFormatter', 'class' => 'kCombinationFormatter', 'file' => 'product_option_formatters.php', 'build_event' => '', 'require_classes' => 'kFormatter'), + Array ('pseudo' => 'kCombPriceFormatter', 'class' => 'kCombPriceFormatter', 'file' => 'product_option_formatters.php', 'build_event' => '', 'require_classes' => 'kFormatter'), ), 'AutoLoad' => true, - 'Hooks' => Array( + 'Hooks' => Array ( ), - 'AggregateTags' => Array( + 'AggregateTags' => Array ( ), - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', @@ -38,45 +38,50 @@ 'TitleField' => 'CombinationId', 'IDField' => 'CombinationId', 'TableName' => TABLE_PREFIX.'ProductOptionCombinations', - 'ForeignKey' => array('p' => 'ProductId'), - 'ParentTableKey' => array('p' => 'ProductId'), + 'ForeignKey' => Array ('p' => 'ProductId'), + 'ParentTableKey' => Array ('p' => 'ProductId'), 'ParentPrefix' => 'p', 'AutoDelete' => true, 'AutoClone' => true, - 'ListSQLs' => Array( ''=>'SELECT %1$s.* %2$s + 'ListSQLs' => Array ( '' => 'SELECT %1$s.* %2$s FROM %1$s LEFT JOIN '.TABLE_PREFIX.'Products ON '.TABLE_PREFIX.'Products.ProductId = %1$s.ProductId LEFT JOIN '.TABLE_PREFIX.'ProductsPricing ON '.TABLE_PREFIX.'ProductsPricing.ProductId = %1$s.ProductId AND '.TABLE_PREFIX.'ProductsPricing.IsPrimary = 1 ', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s', ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('Combination' => 'asc'), - 'ForcedSorting' => Array('Priority' => 'desc'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Combination' => 'asc'), + 'ForcedSorting' => Array ('Priority' => 'desc'), ) ), 'Fields' => Array ( - 'CombinationId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'Combination' => Array('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format'=>"%s: %s
", 'default' => NULL), - 'CombinationCRC' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'PriceType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), - 'Price' => Array('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ), - 'WeightType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), - 'Weight' => Array('type' => 'float', 'formatter' => 'kFormatter', 'default' => 0, ), - 'Availability' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options'=>array(0=>'la_No', 1=>'la_Yes'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, ), - 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, ), - 'QtyInStock' => Array('type' => 'int', 'not_null' => '1', 'default' => 0), - 'QtyReserved' => Array('type' => 'int', 'not_null' => '1', 'default' => 0), - 'QtyBackOrdered' => Array('type' => 'int', 'not_null' => '1', 'default' => 0), - 'QtyOnOrder' => Array('type' => 'int', 'not_null' => '1', 'default' => 0), - 'SKU' => Array('type' => 'string', 'not_null' => '1', 'default' => ''), + 'CombinationId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), + 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), + 'Combination' => Array ('type' => 'string', 'required' => 1, 'formatter' => 'kCombinationFormatter', 'format' =>"%s: %s
", 'default' => NULL), + 'CombinationCRC' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), + 'PriceType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), + 'Price' => Array ('type' => 'float', 'required' => 1, 'formatter' => 'kFormatter', 'default' => '', ), + 'WeightType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Txt_=', 2 => 'la_Flat', 3 => 'la_Percent'), 'use_phrases' => 1, 'default' => 3, ), + 'Weight' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'default' => 0, ), + 'Availability' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, ), + 'QtyInStock' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0), + 'QtyReserved' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0), + 'QtyBackOrdered' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0), + 'QtyOnOrder' => Array ('type' => 'int', 'not_null' => '1', 'default' => 0), + 'SKU' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), ), - 'CalculatedFields' => Array( - '' => Array( + 'CalculatedFields' => Array ( + '' => Array ( 'FinalPrice' => 'IF(%1$s.PriceType = 1, %1$s.Price, IF(%1$s.PriceType = 2, '.TABLE_PREFIX.'ProductsPricing.Price + %1$s.Price, '.TABLE_PREFIX.'ProductsPricing.Price * (1 + %1$s.Price/100) @@ -85,50 +90,50 @@ 'BasePrice' => TABLE_PREFIX.'ProductsPricing.Price', ), ), - 'VirtualFields' => Array( - 'FinalPrice' => Array('formatter'=>'kCombPriceFormatter', 'format' => '%.2f'), + 'VirtualFields' => Array ( + 'FinalPrice' => Array ('formatter' => 'kCombPriceFormatter', 'format' => '%.2f'), ), 'Grids' => Array ( 'Default' => Array ( - 'Icons' => Array( + 'Icons' => Array ( 'default' => 'icon16_item.png', 'module' => 'core', ), - 'Fields' => Array( - 'Combination' => Array( 'title'=>'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), - 'SKU' => Array( 'title'=>'la_col_SKU', 'filter_block' => 'grid_like_filter'), - 'Availability' => Array( 'title'=>'la_col_Availability', 'filter_block' => 'grid_options_filter'), - 'Price' => Array( 'title'=>'la_col_Price', 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'), - /*'Weight' => Array( 'title'=>'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/ + 'Fields' => Array ( + 'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), + 'SKU' => Array ( 'title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'), + 'Availability' => Array ( 'title' => 'la_col_Availability', 'filter_block' => 'grid_options_filter'), + 'Price' => Array ( 'title' => 'la_col_Price', 'data_block' => 'price_td', 'filter_block' => 'grid_float_range_filter'), + /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/ ), ), 'Inventory' => Array ( - 'Icons' => Array( + 'Icons' => Array ( 'default' => 'icon16_item.png', 'module' => 'core', ), 'Selector' => 'radio', 'Fields' => Array ( - 'Combination' => Array('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), - 'SKU' => Array('title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'), - 'QtyInStock' => Array('title'=>'la_col_QtyInStock', 'filter_block' => 'grid_range_filter'), - 'QtyReserved' => Array('title'=>'la_col_QtyReserved', 'filter_block' => 'grid_range_filter'), - 'QtyBackOrdered'=> Array('title'=>'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter'), - 'QtyOnOrder' => Array('title'=>'la_col_QtyOnOrder', 'filter_block' => 'grid_range_filter'), + 'Combination' => Array ('title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), + 'SKU' => Array ('title' => 'la_col_SKU', 'filter_block' => 'grid_like_filter'), + 'QtyInStock' => Array ('title' => 'la_col_QtyInStock', 'filter_block' => 'grid_range_filter'), + 'QtyReserved' => Array ('title' => 'la_col_QtyReserved', 'filter_block' => 'grid_range_filter'), + 'QtyBackOrdered' => Array ('title' => 'la_col_QtyBackOrdered', 'filter_block' => 'grid_range_filter'), + 'QtyOnOrder' => Array ('title' => 'la_col_QtyOnOrder', 'filter_block' => 'grid_range_filter'), ), ), 'Radio' => Array ( 'Selector' => 'radio', - 'Icons' => Array( + 'Icons' => Array ( 'default' => 'icon16_item.png', 'module' => 'core', ), - 'Fields' => Array( - 'Combination' => Array( 'title'=>'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), - 'FinalPrice' => Array( 'title'=>'la_col_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'), - /*'Weight' => Array( 'title'=>'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/ + 'Fields' => Array ( + 'Combination' => Array ( 'title' => 'la_col_Combination', 'data_block' => 'grid_combination_td', 'filter_block' => 'grid_empty_filter'), + 'FinalPrice' => Array ( 'title' => 'la_col_Price', 'data_block' => 'grid_data_td', 'currency' => 'primary', 'filter_block' => 'grid_float_range_filter'), + /*'Weight' => Array ( 'title' => 'la_col_Weight', 'data_block' => 'weight_td', 'filter_block' => 'grid_float_range_filter'),*/ ), ), ), Index: branches/5.1.x/units/gateways/gw_classes/atosorigin.php =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/units/gateways/gw_classes/atosorigin.php (.../atosorigin.php) (revision 13100) +++ branches/5.1.x/units/gateways/gw_classes/atosorigin.php (.../atosorigin.php) (revision 13549) @@ -1,6 +1,6 @@ Application->BaseURL('/in-commerce/units/gateways/gw_classes/notify_scripts').'atosorigin_notify.php'; $txt_amount = sprintf("%.2f", $item_data['TotalAmount']); - $params['amount'] = eregi_replace("[.,]", '', $txt_amount); - $params['caddie'] = $this->Application->GetSID().','.MD5($item_data['OrderId']); + + $params['amount'] = str_replace( Array('.', ','), '', $txt_amount); + $params['caddie'] = $this->Application->GetSID() . ',' . MD5($item_data['OrderId']); $params['order_id'] = $item_data['OrderId']; $params['customer_ip_address'] = $_SERVER['REMOTE_ADDR']; $params['customer_id'] = $item_data['PortalUserId']; @@ -92,8 +93,8 @@ $ret = $rets[0]; - $ret = eregi_replace("^.*\!\!", '', $ret); - $ret = chop($ret, '!'); + $ret = preg_replace('/^(.*)!!/is', '', $ret); + $ret = rtrim($ret, '!'); return ''.$ret.'
'; } Index: branches/5.1.x/admin_templates/payment_type/payment_type_edit.tpl =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/admin_templates/payment_type/payment_type_edit.tpl (.../payment_type_edit.tpl) (revision 13100) +++ branches/5.1.x/admin_templates/payment_type/payment_type_edit.tpl (.../payment_type_edit.tpl) (revision 13549) @@ -30,15 +30,12 @@ } ) ); - a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.Render(); a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - a_toolbar.HideButton('sep2'); a_toolbar.DisableButton('next'); Index: branches/5.1.x/units/taxes/taxes_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 13156) +++ branches/5.1.x/units/taxes/taxes_config.php (.../taxes_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'tax', - 'ItemClass' => Array ('class' => 'kDBItem','file' => '','build_event' => 'OnItemBuild'), - 'ListClass' => Array ('class' => 'kDBList','file' => '','build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array ('class' => 'TaxesEventHandler','file' => 'taxes_event_handler.php','build_event' => 'OnBuild'), - 'TagProcessorClass' => Array ('class' => 'TaxesTagProcessor','file' => 'taxes_tag_processor.php','build_event' => 'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'TaxesEventHandler', 'file' => 'taxes_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'TaxesTagProcessor', 'file' => 'taxes_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'hooks' => Array (), 'QueryString' => Array ( @@ -48,17 +48,17 @@ 'edit_status_labels' => Array ('tax' => '!la_title_EditingTaxZone!'), 'new_titlefield' => Array ('tax' => '!la_title_NewTaxZone!'), ), - 'taxes_list'=>Array ( 'prefixes' => Array ('tax_List'), + 'taxes_list' =>Array ( 'prefixes' => Array ('tax_List'), 'format' => "!la_title_Taxes!", ), - 'taxes_edit'=>Array ( 'prefixes' => Array ('tax'), + 'taxes_edit' =>Array ( 'prefixes' => Array ('tax'), 'new_titlefield' => Array ('tax' => '!la_title_NewTax!'), 'format' => "#tax_status# '#tax_titlefield#' - !la_title_General!", ), ), - 'PermSection' => Array ('main' =>'in-commerce:taxes'), + 'PermSection' => Array ('main' => 'in-commerce:taxes'), 'Sections' => Array ( 'in-commerce:taxes' => Array ( @@ -78,7 +78,7 @@ 'SubItems' => Array ('taxdst'), - 'ListSQLs' => Array ( ''=> 'SELECT %1$s.* %2$s FROM %s'), + 'ListSQLs' => Array ( '' => 'SELECT %1$s.* %2$s FROM %s'), // key - special, value - list select sql @@ -88,13 +88,23 @@ ) ), 'Fields' => Array ( - 'TaxZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required'=>true, 'max_len'=>100, 'error_msgs' => Array ('required' => 'Please fill in')), - 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => true, 'default' => 1), - 'TaxValue' => Array ('type' => 'double', 'not_null' => true, 'default' => 0), - 'ApplyToShipping' => Array ('type' => 'int', 'not_null' => true, 'default' => 0, 'formatter' => 'kOptionsFormatter', 'use_phrases'=>1, 'options'=>Array (0=>'la_No', 1=>'la_Yes')), - 'ApplyToProcessing' => Array ('type' => 'int', 'not_null' => true, 'default' => 0, 'formatter' => 'kOptionsFormatter', 'use_phrases'=>1, 'options'=>Array (0=>'la_No', 1=>'la_Yes')), - ), + 'TaxZoneId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' => 1, 'max_len' =>100, 'error_msgs' => Array ('required' => 'Please fill in')), + 'Type' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (1 => 'la_ByCountry', 2 => 'la_ByState', 3 => 'la_ByZIP'), 'not_null' => 1, 'default' => 1), + 'TaxValue' => Array ('type' => 'double', 'not_null' => 1, 'default' => 0), + 'ApplyToShipping' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'ApplyToProcessing' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' =>Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + ), 'Grids' => Array ( 'Default' => Array ( Index: branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php (.../affiliate_plans_config.php) (revision 13156) +++ branches/5.1.x/units/affiliate_plans/affiliate_plans_config.php (.../affiliate_plans_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'ap', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'AffiliatePlansEventHandler','file'=>'affiliate_plans_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'AffiliatePlansEventHandler', 'file' => 'affiliate_plans_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), 'AutoLoad' => true, - 'AggregateTags' => Array( + 'AggregateTags' => Array ( ), - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', @@ -31,19 +31,19 @@ ), 'IDField' => 'AffiliatePlanId', - 'StatusField' => Array('Enabled', 'IsPrimary'), // field, that is affected by Approve/Decline events + 'StatusField' => Array ('Enabled', 'IsPrimary'), // field, that is affected by Approve/Decline events 'TitleField' => 'Name', - 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('ap'=>'!la_title_Adding_Affiliate_Plan!'), - 'edit_status_labels' => Array('ap'=>'!la_title_Editing_Affiliate_Plan!'), - 'new_titlefield' => Array('ap'=>'!la_title_New_Affiliate_Plan!'), + 'TitlePresets' => Array ( + 'default' => Array ( 'new_status_labels' => Array ('ap' => '!la_title_Adding_Affiliate_Plan!'), + 'edit_status_labels' => Array ('ap' => '!la_title_Editing_Affiliate_Plan!'), + 'new_titlefield' => Array ('ap' => '!la_title_New_Affiliate_Plan!'), ), - 'affiliate_plans_list' => Array('prefixes' => Array('ap_List'), 'format' => "!la_title_AffiliatePlans!"), - 'affiliate_plans_edit' => Array('prefixes' => Array('ap'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_General!"), - 'affiliate_plans_brackets' => Array('prefixes' => Array('ap','apbrackets_List'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_AffiliatePlansBrackets!"), - 'affiliate_plans_items' => Array('prefixes' => Array('ap','api_List'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_AffiliatePlansBrackets!"), + 'affiliate_plans_list' => Array ('prefixes' => Array ('ap_List'), 'format' => "!la_title_AffiliatePlans!"), + 'affiliate_plans_edit' => Array ('prefixes' => Array ('ap'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_General!"), + 'affiliate_plans_brackets' => Array ('prefixes' => Array ('ap', 'apbrackets_List'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_AffiliatePlansBrackets!"), + 'affiliate_plans_items' => Array ('prefixes' => Array ('ap', 'api_List'), 'format' => "#ap_status# '#ap_titlefield#' - !la_title_AffiliatePlansBrackets!"), ), @@ -55,46 +55,56 @@ ), ), - 'PermSection' => Array('main' => 'in-commerce:affiliate_plans'), + 'PermSection' => Array ('main' => 'in-commerce:affiliate_plans'), - 'Sections' => Array( - 'in-commerce:affiliate_plans' => Array( + 'Sections' => Array ( + 'in-commerce:affiliate_plans' => Array ( 'parent' => 'in-commerce:affiliates_folder', 'icon' => 'affiliates', 'label' => 'la_tab_AffiliatePlans', - 'url' => Array('t' => 'in-commerce/affiliate_plans/affiliate_plans_list', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline', 'advanced:set_primary'), + 'url' => Array ('t' => 'in-commerce/affiliate_plans/affiliate_plans_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline', 'advanced:set_primary'), 'priority' => 5.2, // ., because this section replaces parent in tree 'type' => stTAB, ), ), 'TableName' => TABLE_PREFIX.'AffiliatePlans', - 'ListSQLs' => Array('' => 'SELECT * FROM %s'), - 'ItemSQLs' => Array('' => 'SELECT * FROM %s'), + 'ListSQLs' => Array ('' => 'SELECT * FROM %s'), + 'ItemSQLs' => Array ('' => 'SELECT * FROM %s'), - 'SubItems' => Array('apbrackets', /*'api'*/), - 'ListSortings' => Array( - '' => Array( - 'ForcedSorting' => Array('IsPrimary' => 'desc'), - 'Sorting' => Array('Name' => 'desc'), + 'SubItems' => Array ('apbrackets', /*'api'*/), + 'ListSortings' => Array ( + '' => Array ( + 'ForcedSorting' => Array ('IsPrimary' => 'desc'), + 'Sorting' => Array ('Name' => 'desc'), ) ), - 'Fields' => Array( - 'AffiliatePlanId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array('type' => 'string', 'unique' => Array(), 'not_null' => '1', 'required' => 1, 'default' => ''), - 'PlanType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(/*0 => 'la_by_amount',*/ 1 => 'la_by_amount', 2 => 'la_by_items_sold'), 'use_phrases' => 1, 'required' => 1, 'not_null' => 1, 'default' => 1), - 'ResetInterval' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(86400 => 'la_day', 604800 => 'la_week', 2628000 => 'la_month', 7884000 => 'la_quartely', 31536000 => 'la_year'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'PaymentType' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_regular', 1 => 'la_by_request'), 'use_phrases' => 1, 'not_null' => 1,'default' => 0), - 'MinPaymentAmount' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(0 => 'la_Disabled', 1 => 'la_Enabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'IsPrimary' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - ), + 'Fields' => Array ( + 'AffiliatePlanId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'unique' => Array (), 'not_null' => 1, 'required' => 1, 'default' => ''), + 'PlanType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (/*0 => 'la_by_amount',*/ 1 => 'la_by_amount', 2 => 'la_by_items_sold'), 'use_phrases' => 1, 'required' => 1, 'not_null' => 1, 'default' => 1), + 'ResetInterval' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (86400 => 'la_day', 604800 => 'la_week', 2628000 => 'la_month', 7884000 => 'la_quartely', 31536000 => 'la_year'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), + 'PaymentType' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_regular', 1 => 'la_by_request'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), + 'MinPaymentAmount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'Enabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + ), - 'Grids' => Array( - 'Default' => Array( + 'Grids' => Array ( + 'Default' => Array ( 'Icons' => Array ( 'default' => 'icon16_item.png', '0_0' => 'icon16_disabled.png', @@ -103,11 +113,11 @@ '1_1' => 'icon16_primary.png', 'module' => 'core', ), - 'Fields' => Array( - 'AffiliatePlanId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array( 'title'=>'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'PlanType' => Array( 'title' => 'la_col_PlanType', 'filter_block' => 'grid_options_filter', 'width' => 150, ), - 'Enabled' => Array( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), + 'Fields' => Array ( + 'AffiliatePlanId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array ( 'title' => 'la_col_Name', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'PlanType' => Array ( 'title' => 'la_col_PlanType', 'filter_block' => 'grid_options_filter', 'width' => 150, ), + 'Enabled' => Array ( 'title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'width' => 80, ), ), ), Index: branches/5.1.x/admin_templates/payment_type/payment_type_groups.tpl =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/admin_templates/payment_type/payment_type_groups.tpl (.../payment_type_groups.tpl) (revision 13100) +++ branches/5.1.x/admin_templates/payment_type/payment_type_groups.tpl (.../payment_type_groups.tpl) (revision 13549) @@ -31,15 +31,12 @@ } ) ); - a_toolbar.AddButton( new ToolBarSeparator('sep2') ); - a_toolbar.Render(); a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - a_toolbar.HideButton('sep2'); a_toolbar.DisableButton('next'); Index: branches/5.1.x/units/files/files_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/files/files_config.php (.../files_config.php) (revision 13156) +++ branches/5.1.x/units/files/files_config.php (.../files_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'file', - 'ItemClass' => Array('class'=>'FilesItem','file'=>'files.php','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'FilesEventHandler','file'=>'files_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'FilesItem', 'file' => 'files.php', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'FilesEventHandler', 'file' => 'files_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), 'AutoLoad' => true, - 'AggregateTags' => Array( - Array( + 'AggregateTags' => Array ( + Array ( 'AggregateTo' => '#PARENT#', 'AggregatedTagName' => 'ListFiles', 'LocalTagName' => 'PrintList', 'LocalSpecial' => 'downl', ), ), - 'Hooks' => Array( - /*Array( + 'Hooks' => Array ( + /*Array ( 'Mode' => hBEFORE, 'Conditional' => true, 'HookToPrefix' => 'p', 'HookToSpecial' => '', - 'HookToEvent' => Array( 'onPreSave' ), + 'HookToEvent' => Array ( 'onPreSave' ), 'DoPrefix' => 'pr', 'DoSpecial' => 'tang', 'DoEvent' => 'OnArrange', ),*/ ), - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', 4 => 'event', ), - 'StatusField' => Array('Status', 'IsPrimary'), + 'StatusField' => Array ('Status', 'IsPrimary'), 'IDField' => 'FileId', 'TitleField' => 'Name', 'TableName' => TABLE_PREFIX.'ProductFiles', @@ -56,51 +56,75 @@ 'AutoDelete' => true, 'AutoClone' => true, - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s', ), - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array('show_active','show_disabled'), 'type' => WHERE_FILTER), + 'FilterMenu' => Array ( + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER), ), - 'Filters' => Array( - 'show_active' => Array('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 'show_disabled' => Array('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), + 'Filters' => Array ( + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), - 'ListSortings' => Array( - '' => Array( - 'ForcedSorting' => Array('IsPrimary' => 'desc','Priority' => 'desc'), - 'Sorting' => Array('AddedOn' => 'desc','Version' => 'desc'), + 'ListSortings' => Array ( + '' => Array ( + 'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'), + 'Sorting' => Array ('AddedOn' => 'desc', 'Version' => 'desc'), ) ), - 'Fields' => Array( - 'FileId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array('type' => 'string','not_null' => '1','default' => ''), - 'Version' => Array('type' => 'string','not_null' => '1','default' => ''), - 'FilePath' => Array('type' => 'string','not_null' => '1','default' => ''), - 'RealPath' => Array('type' => 'string', 'not_null' => 1, 'formatter'=>'kUploadFormatter', 'skip_empty'=>1, 'default' => '', 'upload_dir' => ITEM_FILES_PATH, 'include_path' => 0, 'size_field' => 'Size', 'orig_name_field' => 'FilePath', 'content_type_field' => 'MIMEType', 'max_size' => 50000000, - 'error_msgs' => Array( 'bad_file_format' => '!la_error_InvalidFileFormat!', - 'bad_file_size' => '!la_error_FileTooLarge!', - 'cant_save_file' => '!la_error_cant_save_file!' - ) - ), - 'Size' => Array('type' => 'int', 'formatter' => 'kFilesizeFormatter', 'not_null' => 1, 'default' => 0), - 'Status' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'IsPrimary' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Priority' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'AddedOn' => Array('type' => 'int','formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'AddedById' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'MIMEType' => Array('type' => 'string','not_null' => '1','default' => ''), - ), - 'VirtualFields' => Array( - ), + 'Fields' => Array ( + 'FileId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'Version' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'FilePath' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'RealPath' => Array ( + 'type' => 'string', + 'formatter' => 'kUploadFormatter', + 'upload_dir' => ITEM_FILES_PATH, 'include_path' => 0, + 'size_field' => 'Size', 'max_size' => 50000000, + 'orig_name_field' => 'FilePath', + 'content_type_field' => 'MIMEType', + 'not_null' => 1, 'skip_empty' =>1, 'default' => '', + 'error_msgs' => Array ( + 'bad_file_format' => '!la_error_InvalidFileFormat!', + 'bad_file_size' => '!la_error_FileTooLarge!', + 'cant_save_file' => '!la_error_cant_save_file!', + ), + ), + 'Size' => Array ( + 'type' => 'int', + 'formatter' => 'kFilesizeFormatter', + 'not_null' => 1, 'default' => 0, + ), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'AddedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'AddedById' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'MIMEType' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + ), + + 'VirtualFields' => Array ( + + ), - 'Grids' => Array( + 'Grids' => Array ( - 'Default' => Array( + 'Default' => Array ( 'Icons' => Array ( 'default' => 'icon16_item.png', '0_0' => 'icon16_disabled.png', @@ -109,13 +133,13 @@ '1_1' => 'icon16_primary.png', 'module' => 'core', ), - 'Fields' => Array( - 'FileId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'), - 'Name' => Array( 'title'=>'la_col_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'), - 'FilePath' => Array( 'title'=>'la_col_FilePath', 'filter_block' => 'grid_like_filter'), - 'Version' => Array( 'title'=>'la_col_Version', 'filter_block' => 'grid_like_filter'), - 'Size' => Array( 'title'=>'la_col_Size', 'filter_block' => 'grid_float_range_filter'), - 'AddedOn' => Array( 'title'=>'la_col_AddedOn', 'format'=>'_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'), + 'Fields' => Array ( + 'FileId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'module' => 'In-Portal', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ( 'title' => 'la_col_FileName', 'data_block' => 'file_caption_td', 'filter_block' => 'grid_like_filter'), + 'FilePath' => Array ( 'title' => 'la_col_FilePath', 'filter_block' => 'grid_like_filter'), + 'Version' => Array ( 'title' => 'la_col_Version', 'filter_block' => 'grid_like_filter'), + 'Size' => Array ( 'title' => 'la_col_Size', 'filter_block' => 'grid_float_range_filter'), + 'AddedOn' => Array ( 'title' => 'la_col_AddedOn', 'format' => '_regional_DateFormat', 'filter_block' => 'grid_date_range_filter'), ), ), ), Index: branches/5.1.x/admin_templates/orders/export/export.tpl =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/admin_templates/orders/export/export.tpl (.../export.tpl) (revision 13100) +++ branches/5.1.x/admin_templates/orders/export/export.tpl (.../export.tpl) (revision 13549) @@ -113,9 +113,10 @@ $kf.elements['events[ord.export]'].value = tmp; Request.makeRequest('', delete_busy, '', function() { presets = document.getElementById(''); + for (i=0; i< presets.options.length; i++) { - if (presets.options(i).selected) { - presets.options.remove(i); + if (presets.options[i].selected) { + presets.options.remove[i]; } } presets.options[0].selected = true; @@ -128,8 +129,8 @@ presets = document.getElementById(''); if ( presets.value != '' ) { for (i=0; i< presets.options.length; i++) { - if (presets.options(i).selected) { - preset_name = presets.options(i).text + if (presets.options[i].selected) { + preset_name = presets.options[i].text } } document.getElementById('').value = preset_name; Index: branches/5.1.x/units/order_items/order_items_event_handler.php =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 13100) +++ branches/5.1.x/units/order_items/order_items_event_handler.php (.../order_items_event_handler.php) (revision 13549) @@ -1,6 +1,6 @@ Array('subitem' => 'add|edit'), - ); + + $permissions = Array ( + 'OnItemBuild' => Array ('subitem' => true), + 'OnSaveItems' => Array ('subitem' => 'add|edit'), + ); + $this->permMapping = array_merge($this->permMapping, $permissions); } @@ -200,4 +203,31 @@ $object->addFilter('product_type', 'p.Type ='.$type); } } + + /** + * Checks, that currently loaded item is allowed for viewing (non permission-based) + * + * @param kEvent $event + * @return bool + */ + function checkItemStatus(&$event) + { + if ($this->Application->IsAdmin()) { + return true; + } + + $object =& $event->getObject(); + if (!$object->isLoaded()) { + return true; + } + + $order =& $this->Application->recallObject('ord'); + /* @var $order kDBItem */ + + if ($order->isLoaded() && ($order->GetID() == $object->GetDBField('OrderId'))) { + return $order->GetDBField('PortalUserId') == $this->Application->RecallVar('user_id'); + } + + return false; + } } \ No newline at end of file Index: branches/5.1.x/units/orders/orders_event_handler.php =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 13465) +++ branches/5.1.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 13549) @@ -1,6 +1,6 @@ 0) { // if we are adding product - $product =& $this->Application->recallObject('p'); + $product =& $this->Application->recallObject('p', null, Array ('skip_autoload' => true)); $product->Load($prod_id); $object->SetDBField('ProductId', $prod_id); $object->SetDBField('ProductName', $product->GetField('Name')); @@ -3828,11 +3828,13 @@ $user_groups = explode(',', $this->Application->RecallVar('UserGroups')); $default_group = $this->Application->ConfigValue('User_LoggedInGroup'); if (!in_array($default_group, $user_groups)){ - $user_groups[]=$default_group; + $user_groups[] = $default_group; } - $fields['PaymentType']['options_sql'] .= ' AND '; - $fields['PaymentType']['options_sql'] .= ' (PortalGroups LIKE "%%,'.implode(',%%" OR PortalGroups LIKE "%%,', $user_groups).',%%")'; - + $fields['PaymentType']['options_sql'] = str_replace( + 'ORDER BY ', + 'AND (PortalGroups LIKE "%%,'.implode(',%%" OR PortalGroups LIKE "%%,', $user_groups).',%%") ORDER BY ', + $fields['PaymentType']['options_sql'] + ); } $this->Application->setUnitOption($event->Prefix, 'Fields', $fields); Index: branches/5.1.x/units/orders/orders_tag_processor.php =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 13465) +++ branches/5.1.x/units/orders/orders_tag_processor.php (.../orders_tag_processor.php) (revision 13549) @@ -1,6 +1,6 @@ show category name + // use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag return $this->Application->ParseBlock($params, 1); } Index: branches/5.1.x/admin_templates/visits/visits_list_incommerce.tpl =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/admin_templates/visits/visits_list_incommerce.tpl (.../visits_list_incommerce.tpl) (revision 13100) +++ branches/5.1.x/admin_templates/visits/visits_list_incommerce.tpl (.../visits_list_incommerce.tpl) (revision 13549) @@ -64,7 +64,7 @@ - + Index: branches/5.1.x/units/orders/orders_config.php =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/units/orders/orders_config.php (.../orders_config.php) (revision 13465) +++ branches/5.1.x/units/orders/orders_config.php (.../orders_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'ord', - 'ItemClass' => Array('class'=>'OrdersItem','file'=>'orders_item.php','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'OrdersEventHandler','file'=>'orders_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'OrdersTagProcessor','file'=>'orders_tag_processor.php','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'OrdersItem', 'file' => 'orders_item.php', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'OrdersEventHandler', 'file' => 'orders_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'OrdersTagProcessor', 'file' => 'orders_tag_processor.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, - 'Hooks' => Array( - Array( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'ord', - 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnPreSave' ), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnRecalculateItems', - ), + 'Hooks' => Array ( + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'ord', + 'HookToSpecial' => '', + 'HookToEvent' => Array ( 'OnPreSave' ), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnRecalculateItems', + ), - /* OnApplyCoupon is called as hook for OnUpdateCart/OnCheckout, which calls OnRecalcualate themself - Array( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'coup', - 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnApplyCoupon' ), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnRecalculateItems', - ),*/ + /* OnApplyCoupon is called as hook for OnUpdateCart/OnCheckout, which calls OnRecalcualate themself + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'coup', + 'HookToSpecial' => '', + 'HookToEvent' => Array ( 'OnApplyCoupon' ), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnRecalculateItems', + ),*/ - Array( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'u', - 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnCreate' ), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnUserCreate', - ), + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '', + 'HookToEvent' => Array ( 'OnCreate' ), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnUserCreate', + ), - Array( - 'Mode' => hBEFORE, - 'Conditional' => false, - 'HookToPrefix' => 'u', - 'HookToSpecial' => '', - 'HookToEvent' => Array('OnCheckExpiredMembership'), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnCheckRecurringOrders', - ), + Array ( + 'Mode' => hBEFORE, + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '', + 'HookToEvent' => Array ('OnCheckExpiredMembership'), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnCheckRecurringOrders', + ), - Array( - 'Mode' => hAFTER, - 'Conditional' => false, - 'HookToPrefix' => 'u', - 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnLogin' ), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnUserLogin', - ), + Array ( + 'Mode' => hAFTER, + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '', + 'HookToEvent' => Array ( 'OnLogin' ), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnUserLogin', + ), - Array( - 'Mode' => hBEFORE, // before because OnInpLogin is called after real in-portal login and uses data from hooks - 'Conditional' => false, - 'HookToPrefix' => 'u', - 'HookToSpecial' => '', - 'HookToEvent' => Array( 'OnInpLogin' ), - 'DoPrefix' => '', - 'DoSpecial' => '', - 'DoEvent' => 'OnUserLogin', - ), - ), - 'AggregateTags' => Array( - Array( - 'AggregateTo' => 'orditems', - 'AggregatedTagName' => 'LinkRemoveFromCart', - 'LocalTagName' => 'Orditems_LinkRemoveFromCart', - ), - Array( - 'AggregateTo' => 'orditems', - 'AggregatedTagName' => 'ProductLink', - 'LocalTagName' => 'Orderitems_ProductLink', - ), - Array( - 'AggregateTo' => 'orditems', - 'AggregatedTagName' => 'ProductExists', - 'LocalTagName' => 'Orderitems_ProductExists', - ), - ), + Array ( + 'Mode' => hBEFORE, // before because OnInpLogin is called after real in-portal login and uses data from hooks + 'Conditional' => false, + 'HookToPrefix' => 'u', + 'HookToSpecial' => '', + 'HookToEvent' => Array ( 'OnInpLogin' ), + 'DoPrefix' => '', + 'DoSpecial' => '', + 'DoEvent' => 'OnUserLogin', + ), + ), + 'AggregateTags' => Array ( + Array ( + 'AggregateTo' => 'orditems', + 'AggregatedTagName' => 'LinkRemoveFromCart', + 'LocalTagName' => 'Orditems_LinkRemoveFromCart', + ), + Array ( + 'AggregateTo' => 'orditems', + 'AggregatedTagName' => 'ProductLink', + 'LocalTagName' => 'Orderitems_ProductLink', + ), + Array ( + 'AggregateTo' => 'orditems', + 'AggregatedTagName' => 'ProductExists', + 'LocalTagName' => 'Orderitems_ProductExists', + ), + ), - 'QueryString' => Array( - 1 => 'id', - 2 => 'Page', - 3 => 'PerPage', - 4 => 'event', - 5 => 'mode', - ), + 'QueryString' => Array ( + 1 => 'id', + 2 => 'Page', + 3 => 'PerPage', + 4 => 'event', + 5 => 'mode', + ), 'IDField' => 'OrderId', - 'StatusField' => Array('Status'), // field, that is affected by Approve/Decline events + 'StatusField' => Array ('Status'), // field, that is affected by Approve/Decline events 'ViewMenuPhrase' => 'la_title_Orders', 'CatalogTabIcon' => 'icon16_item.png', 'TitleField' => 'OrderNumber', - 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('ord'=>'!la_title_Adding_Order!'), - 'edit_status_labels' => Array('ord'=>'!la_title_Editing_Order!'), - 'new_titlefield' => Array('ord'=>'!la_title_New_Order!'), - ), + 'TitlePresets' => Array ( + 'default' => Array ( + 'new_status_labels' => Array ('ord' => '!la_title_Adding_Order!'), + 'edit_status_labels' => Array ('ord' => '!la_title_Editing_Order!'), + 'new_titlefield' => Array ('ord' => '!la_title_New_Order!'), + ), - 'orders_incomplete' => Array( 'prefixes' => Array('ord.incomplete_List'), - 'format' => "!la_title_IncompleteOrders!", - ), + 'orders_incomplete' => Array ( 'prefixes' => Array ('ord.incomplete_List'), + 'format' => "!la_title_IncompleteOrders!", + ), - 'orders_pending' => Array( 'prefixes' => Array('ord.pending_List'), - 'format' => "!la_title_PendingOrders!", - ), + 'orders_pending' => Array ( 'prefixes' => Array ('ord.pending_List'), + 'format' => "!la_title_PendingOrders!", + ), - 'orders_backorders' => Array( 'prefixes' => Array('ord.backorders_List'), - 'format' => "!la_title_BackOrders!", - ), + 'orders_backorders' => Array ( 'prefixes' => Array ('ord.backorders_List'), + 'format' => "!la_title_BackOrders!", + ), - 'orders_toship' => Array( 'prefixes' => Array('ord.toship_List'), - 'format' => "!la_title_OrdersToShip!", - ), + 'orders_toship' => Array ( 'prefixes' => Array ('ord.toship_List'), + 'format' => "!la_title_OrdersToShip!", + ), - 'orders_processed' => Array( 'prefixes' => Array('ord.processed_List'), - 'format' => "!la_title_OrdersProcessed!", - ), + 'orders_processed' => Array ( 'prefixes' => Array ('ord.processed_List'), + 'format' => "!la_title_OrdersProcessed!", + ), - 'orders_returns' => Array( 'prefixes' => Array('ord.returns_List'), - 'format' => "!la_title_OrdersReturns!", - ), + 'orders_returns' => Array ( 'prefixes' => Array ('ord.returns_List'), + 'format' => "!la_title_OrdersReturns!", + ), - 'orders_denied' => Array( 'prefixes' => Array('ord.denied_List'), - 'format' => "!la_title_OrdersDenied!", - ), - 'orders_archived' => Array( 'prefixes' => Array('ord.archived_List'), - 'format' => "!la_title_OrdersArchived!", - ), + 'orders_denied' => Array ( 'prefixes' => Array ('ord.denied_List'), + 'format' => "!la_title_OrdersDenied!", + ), + 'orders_archived' => Array ( 'prefixes' => Array ('ord.archived_List'), + 'format' => "!la_title_OrdersArchived!", + ), - 'orders_search' => Array( 'prefixes' => Array('ord.search_List'), - 'format' => "!la_title_OrdersSearch!", - ), + 'orders_search' => Array ( 'prefixes' => Array ('ord.search_List'), + 'format' => "!la_title_OrdersSearch!", + ), - 'orders_edit_general' => Array('prefixes' => Array('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_General!"), - 'orders_edit_billing' => Array('prefixes' => Array('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderBilling!"), - 'orders_edit_shipping' => Array('prefixes' => Array('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderShipping!"), - 'orders_edit_items' => Array('prefixes' => Array('ord', 'orditems_List'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderItems!"), - 'orders_edit_preview' => Array('prefixes' => Array('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderPreview!"), + 'orders_edit_general' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_General!"), + 'orders_edit_billing' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderBilling!"), + 'orders_edit_shipping' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderShipping!"), + 'orders_edit_items' => Array ('prefixes' => Array ('ord', 'orditems_List'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderItems!"), + 'orders_edit_preview' => Array ('prefixes' => Array ('ord'), 'format' => "#ord_status# '#ord_titlefield#' - !la_title_OrderPreview!"), - 'orders_gw_result' => Array('prefixes' => Array('ord'), 'format' => "!la_title_OrderGWResult!"), + 'orders_gw_result' => Array ('prefixes' => Array ('ord'), 'format' => "!la_title_OrderGWResult!"), - 'order_items_edit' => Array( 'prefixes' => Array('ord', 'orditems'), - 'new_status_labels' => Array('orditems'=>'!la_title_Adding_Order_Item!'), - 'edit_status_labels' => Array('orditems'=>'!la_title_Editing_Order_Item!'), - 'new_titlefield' => Array('orditems'=>'!la_title_New_Order_Item!'), - 'format' => "#ord_status# '#ord_titlefield#' - #orditems_status# '#orditems_titlefield#'", - ), + 'order_items_edit' => Array ( 'prefixes' => Array ('ord', 'orditems'), + 'new_status_labels' => Array ('orditems' => '!la_title_Adding_Order_Item!'), + 'edit_status_labels' => Array ('orditems' => '!la_title_Editing_Order_Item!'), + 'new_titlefield' => Array ('orditems' => '!la_title_New_Order_Item!'), + 'format' => "#ord_status# '#ord_titlefield#' - #orditems_status# '#orditems_titlefield#'", + ), - 'orders_export' => Array('format' => '!la_title_OrdersExport!'), + 'orders_export' => Array ('format' => '!la_title_OrdersExport!'), - 'orders_product_edit' => Array('format' => '!la_title_Editing_Order_Item!'), + 'orders_product_edit' => Array ('format' => '!la_title_Editing_Order_Item!'), - ), + ), 'EditTabPresets' => Array ( 'Default' => Array ( @@ -193,16 +194,16 @@ ), ), - 'PermSection' => Array('main' => 'in-commerce:orders'), + 'PermSection' => Array ('main' => 'in-commerce:orders'), - 'Sections' => Array( - 'in-commerce:orders' => Array( + 'Sections' => Array ( + 'in-commerce:orders' => Array ( 'parent' => 'in-commerce', 'icon' => 'in-commerce:orders', 'label' => 'la_tab_Orders', - 'url' => Array('t' => 'in-commerce/orders/orders_pending_list', 'pass' => 'm'), - 'permissions' => Array('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:deny', 'advanced:archive', 'advanced:place', 'advanced:process', 'advanced:ship', 'advanced:reset_to_pending'), + 'url' => Array ('t' => 'in-commerce/orders/orders_pending_list', 'pass' => 'm'), + 'permissions' => Array ('view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:deny', 'advanced:archive', 'advanced:place', 'advanced:process', 'advanced:ship', 'advanced:reset_to_pending'), 'priority' => 1, 'type' => stTREE, ), @@ -214,44 +215,44 @@ ), ), - 'StatisticsInfo' => Array( - 'pending' => Array( + 'StatisticsInfo' => Array ( + 'pending' => Array ( 'icon' => 'core:icon16_item.png', 'label' => 'la_title_Orders', 'js_url' => "#url#", - 'url' => Array('t' => 'in-commerce/orders/orders_pending_list', 'pass' => 'm'), + 'url' => Array ('t' => 'in-commerce/orders/orders_pending_list', 'pass' => 'm'), 'status' => ORDER_STATUS_PENDING, ), ), 'TableName' => TABLE_PREFIX.'Orders', - 'FilterMenu' => Array( - 'Groups' => Array( - Array('mode' => 'AND', 'filters' => Array(0,1,2,3,4,5,6), 'type' => WHERE_FILTER), - ), + 'FilterMenu' => Array ( + 'Groups' => Array ( + Array ('mode' => 'AND', 'filters' => Array (0,1,2,3,4,5,6), 'type' => WHERE_FILTER), + ), - 'Filters' => Array( - 0 => Array('label' => 'la_Incomplete', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), - 1 => Array('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), - 2 => Array('label' => 'la_BackOrders', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), - 3 => Array('label' => 'la_ToShip', 'on_sql' => '', 'off_sql' => '%1$s.Status != 3' ), - 4 => Array('label' => 'la_Processed', 'on_sql' => '', 'off_sql' => '%1$s.Status != 4' ), - 5 => Array('label' => 'la_Denied', 'on_sql' => '', 'off_sql' => '%1$s.Status != 5' ), - 6 => Array('label' => 'la_Archived', 'on_sql' => '', 'off_sql' => '%1$s.Status != 6' ), - ) - ), + 'Filters' => Array ( + 0 => Array ('label' => 'la_Incomplete', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), + 1 => Array ('label' => 'la_Pending', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 2 => Array ('label' => 'la_BackOrders', 'on_sql' => '', 'off_sql' => '%1$s.Status != 2' ), + 3 => Array ('label' => 'la_ToShip', 'on_sql' => '', 'off_sql' => '%1$s.Status != 3' ), + 4 => Array ('label' => 'la_Processed', 'on_sql' => '', 'off_sql' => '%1$s.Status != 4' ), + 5 => Array ('label' => 'la_Denied', 'on_sql' => '', 'off_sql' => '%1$s.Status != 5' ), + 6 => Array ('label' => 'la_Archived', 'on_sql' => '', 'off_sql' => '%1$s.Status != 6' ), + ) + ), - 'CalculatedFields' => Array( + 'CalculatedFields' => Array ( '' => Array ( 'CustomerName' => 'IF( ISNULL(u.Login), IF (%1$s.PortalUserId = -1, \'root\', IF (%1$s.PortalUserId = -2, \'Guest\', \'n/a\')), CONCAT(u.FirstName,\' \',u.LastName) )', 'Username' => 'IF( ISNULL(u.Login),\'root\',u.Login)', 'OrderNumber' => 'CONCAT(LPAD(Number,6,"0"),\'-\',LPAD(SubNumber,3,"0") )', 'SubtotalWithoutDiscount' => '(SubTotal + DiscountTotal)', 'SubtotalWithDiscount' => '(SubTotal)', 'AmountWithoutVAT' => '(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0))', - 'TotalAmount' => 'ROUND(SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount,2)', + 'TotalAmount' => 'SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount', 'CouponCode' => 'pc.Code', 'CouponName' => 'pc.Name', 'AffiliateUser' => 'IF( LENGTH(au.Login),au.Login,\'!la_None!\')', @@ -265,7 +266,7 @@ 'SubtotalWithoutDiscount' => '(SubTotal + DiscountTotal)', 'SubtotalWithDiscount' => '(SubTotal)', 'AmountWithoutVAT' => '(SubTotal+IF(ShippingTaxable=1, ShippingCost, 0)+IF(ProcessingTaxable=1, ProcessingFee, 0))', - 'TotalAmount' => 'ROUND(SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount,2)', + 'TotalAmount' => 'SubTotal+ShippingCost+VAT+ProcessingFee+InsuranceFee-GiftCertificateDiscount', /*'ItemsCount' => 'COUNT(%1$s.OrderId)',*/ ), ), @@ -295,203 +296,257 @@ LEFT JOIN '.TABLE_PREFIX.'PortalUser au ON af.PortalUserId = au.PortalUserId', ), - 'SubItems' => Array('orditems'), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('OrderDate' => 'desc'), + 'SubItems' => Array ('orditems'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('OrderDate' => 'desc'), ) ), - 'Fields' => Array( - 'OrderId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0, 'filter_type' => 'equals'), - 'Number' => Array('type' => 'int','required'=>1,'formatter'=>'kFormatter', 'unique'=>Array('SubNumber'),'format'=>'%06d', 'max_value_inc'>999999, 'not_null' => '1','default' => 0), - 'SubNumber' => Array('type' => 'int','required'=>1,'formatter'=>'kFormatter','unique'=>Array('Number'), 'format'=>'%03d', 'max_value_inc'>999, 'not_null' => '1','default' => 0), - 'Status' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter','options'=>Array(0=>'la_Incomplete',1=>'la_Pending',2=>'la_BackOrders',3=>'la_ToShip',4=>'la_Processed',5=>'la_Denied',6=>'la_Archived'), 'use_phrases'=>1, 'not_null' => '1','default' => 0, 'filter_type' => 'equals'), - 'OnHold' => Array ( - 'type' => 'int', - 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, - 'not_null' => 1, 'default' => 0 - ), - 'OrderDate' => Array('type' => 'int', 'formatter'=>'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), - 'PortalUserId'=>Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options'=>Array(-1=>'root',-2=>'Guest'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'','left_key_field'=>'PortalUserId','left_title_field'=>'Login','required'=>1,'not_null'=>1,'default'=>-1), - 'OrderIP' => Array('type' => 'string','not_null' => '1','default' => '', 'filter_type' => 'like'), - 'UserComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'AdminComment' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'BillingTo' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingCompany' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingPhone' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingFax' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingEmail' => Array('type' => 'string','formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i','not_null' => '1','default' => ''), - 'BillingAddress1' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingAddress2' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingCity' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingState' => Array( - 'type' => 'string', - 'formatter' => 'kOptionsFormatter', 'options' => Array(), - 'not_null' => 1, 'default' => '' - ), - 'BillingZip' => Array('type' => 'string','not_null' => '1','default' => ''), - 'BillingCountry' => Array( - 'type' => 'string', - 'formatter' => 'kOptionsFormatter', - 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode - FROM '.TABLE_PREFIX.'CountryStates - WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' - ORDER BY Name', - 'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => 'USA' - ), - 'VAT' => Array('type' => 'float','formatter'=>'kFormatter','not_null'=>1,'default' => '0','format'=>'%01.2f'), - 'VATPercent' => Array('type' => 'float','formatter'=>'kFormatter','not_null'=>1,'default' => '0','format'=>'%01.3f'), - 'PaymentType' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter','options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'PaymentTypes WHERE Status = 1', 'option_key_field'=>'PaymentTypeId','option_title_field'=>'Description', 'not_null' => 1, 'default' => 0), - 'PaymentAccount' => Array('type' => 'string','not_null' => '1', 'cardtype_field' => 'PaymentCardType', 'default' => '', 'filter_type' => 'like'), - 'PaymentNameOnCard' => Array('type' => 'string','not_null' => '1','default' => ''), - 'PaymentCCExpDate' => Array('type' => 'string', 'formatter'=>'kCCDateFormatter', 'month_field' => 'PaymentCCExpMonth', 'year_field'=>'PaymentCCExpYear', 'not_null' => '1','default' => ''), - 'PaymentCardType' => Array('type' => 'string', 'not_null' => 1, 'formatter'=>'kOptionsFormatter', 'options' => Array('' => '','1' => 'Visa','2' => 'Mastercard', '3' => 'Amex', '4' => 'Discover', '5' => 'Diners Club', '6' => 'JBC'), 'default' => ''), - 'PaymentExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'ShippingTo' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingCompany' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingPhone' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingFax' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingEmail' => Array('type' => 'string','formatter'=>'kFormatter', 'regexp'=>'/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i','not_null' => '1','default' => ''), - 'ShippingAddress1' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingAddress2' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingCity' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingState' => Array( - 'type' => 'string', - 'formatter' => 'kOptionsFormatter', 'options' => Array(), - 'not_null' => 1, 'default' => '' - ), - 'ShippingZip' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingCountry' => Array( - 'type' => 'string', 'formatter' => 'kOptionsFormatter', - 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode - FROM '.TABLE_PREFIX.'CountryStates - WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' - ORDER BY Name', - 'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', - 'not_null' => 1, 'default' => 'USA' - ), - 'ShippingType' => Array('type' => 'int','formatter'=>'kOptionsFormatter','options_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'ShippingType WHERE Status = 1','option_key_field'=>'ShippingID','option_title_field'=>'Name', 'not_null' => 1, 'default' => 0), - 'ShippingCost' => Array('type' => 'double','formatter'=>'kFormatter','format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'ShippingCustomerAccount' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingTracking' => Array('type' => 'string','not_null' => '1','default' => ''), - 'ShippingDate' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), - 'SubTotal' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), - 'CostTotal' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'OriginalAmount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'ShippingOption' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'default'=>0), - 'ShippingGroupOption' => Array('type' => 'int', 'not_null' => 1, 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array(0 => 'la_auto_group_shipments', 1 => 'la_manual_group_shipments'), 'default'=>0), - 'GiftCertificateId' => Array('type' => 'int','default' => null), - 'GiftCertificateDiscount' => Array('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',), - 'ShippingInfo' => Array('type' => 'string', 'default' => NULL), - 'CouponId' => Array('type' => 'int','default' => null), - 'CouponDiscount' => Array('type' => 'float','not_null' => '1','default' => '0.00','formatter'=>'kFormatter','format'=>'%01.2f'), - 'DiscountTotal' => Array('type' => 'float','not_null' => '1','default' => '0.00','formatter'=>'kFormatter','format'=>'%01.2f'), - 'TransactionStatus' => Array('type' => 'int', 'formatter'=>'kOptionsFormatter', 'options' => Array(0=>'la_Invalid', 1 => 'la_Verified', 2 => 'la_Penging'), 'use_phrases'=>1, 'not_null' => '1','default' => 2), - 'GWResult1' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'default' => NULL), - 'GWResult2' => Array('type' => 'string', 'formatter'=>'kSerializedFormatter', 'default' => NULL), - 'AffiliateId' => Array('type'=>'int','formatter'=>'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array(0 => 'lu_None'),'left_sql'=>'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'','left_key_field'=>'AffiliateId','left_title_field'=>'Login','not_null'=>1,'default'=>0), - 'VisitId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'AffiliateCommission' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '1','default' => '0.0000'), - 'ProcessingFee' => Array('type' => 'double', 'formatter'=>'kFormatter','format'=>'%.02f', 'not_null' => '0','default' => '0.0000'), - 'InsuranceFee' => Array ('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'ShippingTaxable' => Array('type' => 'int', 'not_null' => 0, 'default' => 0), - 'ProcessingTaxable' => Array('type' => 'int', 'not_null' => 0, 'default' => 0), - 'IsRecurringBilling' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'ChargeOnNextApprove' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0), - 'NextCharge' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), - 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'GoogleOrderNumber' => Array ('type' => 'string', 'default' => NULL), // MySQL BIGINT UNSIGNED = 8 Bytes, PHP int = 4 Bytes -> threat as string - ), + 'Fields' => Array ( + 'OrderId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0, 'filter_type' => 'equals'), + 'Number' => Array ('type' => 'int', 'required' =>1, 'formatter' => 'kFormatter', 'unique' =>Array ('SubNumber'), 'format' => '%06d', 'max_value_inc'>999999, 'not_null' => 1, 'default' => 0), + 'SubNumber' => Array ('type' => 'int', 'required' =>1, 'formatter' => 'kFormatter', 'unique' =>Array ('Number'), 'format' => '%03d', 'max_value_inc'>999, 'not_null' => 1, 'default' => 0), + 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' =>Array (0=> 'la_Incomplete',1=> 'la_Pending',2=> 'la_BackOrders',3=> 'la_ToShip',4=> 'la_Processed',5=> 'la_Denied',6=> 'la_Archived'), 'use_phrases' =>1, 'not_null' => 1, 'default' => 0, 'filter_type' => 'equals'), + 'OnHold' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'OrderDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'required' => 1, 'default' => '#NOW#'), + 'PortalUserId' =>Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' =>Array (-1=> 'root',-2=> 'Guest'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'PortalUser WHERE `%s` = \'%s\'', 'left_key_field' => 'PortalUserId', 'left_title_field' => 'Login', 'required' =>1, 'not_null' =>1, 'default' =>-1), + 'OrderIP' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'filter_type' => 'like'), + 'UserComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'AdminComment' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'BillingTo' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingCompany' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingFax' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingEmail' => Array ( + 'type' => 'string', + 'formatter' => 'kFormatter', + 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', + 'not_null' => 1, 'default' => '', + ), + 'BillingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingCity' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingState' => Array ( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (), + 'option_key_field' => 'DestAbbr', + 'option_title_field' => 'Translation', + 'not_null' => 1, 'default' => '', + ), + 'BillingZip' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'BillingCountry' => Array( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode + FROM '.TABLE_PREFIX.'CountryStates + WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' + ORDER BY Name', + 'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', + 'not_null' => 1, 'default' => 'USA' + ), + 'VAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' =>1, 'default' => '0', 'format' => '%01.2f'), + 'VATPercent' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'not_null' =>1, 'default' => '0', 'format' => '%01.3f'), + 'PaymentType' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s + FROM ' . TABLE_PREFIX . 'PaymentTypes + WHERE Status = 1 + ORDER BY Priority DESC, Name ASC', + 'option_key_field' => 'PaymentTypeId', 'option_title_field' => 'Description', + 'not_null' => 1, 'default' => 0 + ), + + 'PaymentAccount' => Array ('type' => 'string', 'not_null' => 1, 'cardtype_field' => 'PaymentCardType', 'default' => '', 'filter_type' => 'like'), + 'PaymentNameOnCard' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'PaymentCCExpDate' => Array ('type' => 'string', 'formatter' => 'kCCDateFormatter', 'month_field' => 'PaymentCCExpMonth', 'year_field' => 'PaymentCCExpYear', 'not_null' => 1, 'default' => ''), + 'PaymentCardType' => Array ('type' => 'string', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'options' => Array ('' => '', '1' => 'Visa', '2' => 'Mastercard', '3' => 'Amex', '4' => 'Discover', '5' => 'Diners Club', '6' => 'JBC'), 'default' => ''), + 'PaymentExpires' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'ShippingTo' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingCompany' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingPhone' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingFax' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingEmail' => Array ( + 'type' => 'string', 'not_null' => 1, 'default' => '', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (), + 'option_key_field' => 'DestAbbr', + 'option_title_field' => 'Translation', + ), + 'ShippingAddress1' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingAddress2' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingCity' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingState' => Array ( + 'type' => 'string', 'formatter' => 'kOptionsFormatter', + 'options' => Array (), + 'option_key_field' => 'DestAbbr', 'option_title_field' => 'Translation', + 'not_null' => 1, 'default' => ''), + 'ShippingZip' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingCountry' => Array( + 'type' => 'string', 'formatter' => 'kOptionsFormatter', + 'options_sql' => ' SELECT IF(l%2$s_Name = "", l%3$s_Name, l%2$s_Name) AS Name, IsoCode + FROM '.TABLE_PREFIX.'CountryStates + WHERE Type = ' . DESTINATION_TYPE_COUNTRY . ' + ORDER BY Name', + 'option_key_field' => 'IsoCode', 'option_title_field' => 'Name', + 'not_null' => 1, 'default' => 'USA' + ), + 'ShippingType' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s + FROM ' . TABLE_PREFIX . 'ShippingType + WHERE Status = 1', + 'option_key_field' => 'ShippingID', + 'option_title_field' => 'Name', + 'not_null' => 1, 'default' => 0, + ), + 'ShippingCost' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'ShippingCustomerAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingTracking' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ShippingDate' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), + 'SubTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'ReturnTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'CostTotal' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'OriginalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'ShippingOption' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_ship_all_together', 1 => 'la_ship_backorder_separately', 2 => 'la_ship_backorders_upon_avail'), 'default' =>0), + 'ShippingGroupOption' => Array ('type' => 'int', 'not_null' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array (0 => 'la_auto_group_shipments', 1 => 'la_manual_group_shipments'), 'default' =>0), + 'GiftCertificateId' => Array ('type' => 'int', 'default' => null), + 'GiftCertificateDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00',), + 'ShippingInfo' => Array ('type' => 'string', 'default' => NULL), + 'CouponId' => Array ('type' => 'int', 'default' => null), + 'CouponDiscount' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'), + 'DiscountTotal' => Array ('type' => 'float', 'not_null' => 1, 'default' => '0.00', 'formatter' => 'kFormatter', 'format' => '%01.2f'), + 'TransactionStatus' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (0=> 'la_Invalid', 1 => 'la_Verified', 2 => 'la_Penging'), 'use_phrases' =>1, 'not_null' => 1, 'default' => 2), + 'GWResult1' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL), + 'GWResult2' => Array ('type' => 'string', 'formatter' => 'kSerializedFormatter', 'default' => NULL), + 'AffiliateId' => Array ('type' => 'int', 'formatter' => 'kLEFTFormatter', 'error_msgs' => Array ('invalid_option' => '!la_error_UserNotFound!'), 'options' => Array (0 => 'lu_None'), 'left_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Affiliates af LEFT JOIN '.TABLE_PREFIX.'PortalUser pu ON pu.PortalUserId = af.PortalUserId WHERE `%s` = \'%s\'', 'left_key_field' => 'AffiliateId', 'left_title_field' => 'Login', 'not_null' =>1, 'default' =>0), + 'VisitId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'AffiliateCommission' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.0000'), + 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '0', 'default' => '0.0000'), + 'InsuranceFee' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'ShippingTaxable' => Array ('type' => 'int', 'not_null' => 0, 'default' => 0), + 'ProcessingTaxable' => Array ('type' => 'int', 'not_null' => 0, 'default' => 0), + 'IsRecurringBilling' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes',), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'ChargeOnNextApprove' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes',), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'NextCharge' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null), + 'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'GoogleOrderNumber' => Array ('type' => 'string', 'default' => NULL), // MySQL BIGINT UNSIGNED = 8 Bytes, PHP int = 4 Bytes -> threat as string + ), - 'VirtualFields' => Array( - 'CustomerName' => Array('type'=>'string','default'=>'','filter_type'=>'like'), - 'TotalAmount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'AmountWithoutVAT' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'SubtotalWithDiscount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'SubtotalWithoutDiscount' => Array('type' => 'float', 'formatter'=>'kFormatter', 'format'=>'%01.2f', 'not_null' => '1','default' => '0.00'), - 'OrderNumber' => Array('type'=>'string','default'=>'', 'filter_type' => 'like'), + 'VirtualFields' => Array ( + 'CustomerName' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'), + 'TotalAmount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'AmountWithoutVAT' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'SubtotalWithDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'SubtotalWithoutDiscount' => Array ('type' => 'float', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'not_null' => 1, 'default' => '0.00'), + 'OrderNumber' => Array ('type' => 'string', 'default' => '', 'filter_type' => 'like'), - // for ResetToUser - 'UserTo' => Array('type'=>'string','default'=>''), - 'UserCompany' => Array('type'=>'string','default'=>''), - 'UserPhone' => Array('type'=>'string','default'=>''), - 'UserFax' => Array('type'=>'string','default'=>''), - 'UserEmail' => Array('type'=>'string','default'=>''), - 'UserAddress1' => Array('type'=>'string','default'=>''), - 'UserAddress2' => Array('type'=>'string','default'=>''), - 'UserCity' => Array('type'=>'string','default'=>''), - 'UserState' => Array('type'=>'string','default'=>''), - 'UserZip' => Array('type'=>'string','default'=>''), - 'UserCountry' => Array('type'=>'string','default'=>''), + // for ResetToUser + 'UserTo' => Array ('type' => 'string', 'default' => ''), + 'UserCompany' => Array ('type' => 'string', 'default' => ''), + 'UserPhone' => Array ('type' => 'string', 'default' => ''), + 'UserFax' => Array ('type' => 'string', 'default' => ''), + 'UserEmail' => Array ('type' => 'string', 'default' => ''), + 'UserAddress1' => Array ('type' => 'string', 'default' => ''), + 'UserAddress2' => Array ('type' => 'string', 'default' => ''), + 'UserCity' => Array ('type' => 'string', 'default' => ''), + 'UserState' => Array ('type' => 'string', 'default' => ''), + 'UserZip' => Array ('type' => 'string', 'default' => ''), + 'UserCountry' => Array ('type' => 'string', 'default' => ''), - // for Search - 'Username' => Array('type'=>'string','filter_type'=>'like'), - 'OrderSearchId' => Array('type'=>'int','filter_type'=>'equals','filter_field'=>'OrderId'), - 'FromDateTime' => Array('formatter'=>'kDateFormatter','default'=>'','filter_type'=>'range_from','filter_field'=>'OrderDate' ), - 'ToDateTime' => Array('formatter'=>'kDateFormatter','default'=>'','filter_type'=>'range_to','filter_field'=>'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), - 'FromAmount' => Array('type'=>'double', 'formatter'=>'kFormatter', 'format'=>'%01.2f','filter_type'=>'range_from','filter_field'=>'TotalAmount'), - 'ToAmount' => Array('type'=>'double', 'formatter'=>'kFormatter', 'format'=>'%01.2f','filter_type'=>'range_to','filter_field'=>'TotalAmount'), - 'HasBackOrders' => Array('default'=>false), - 'PaymentCVV2' => Array('type'=>'string', 'default'=>false), - 'AffiliateUser' => Array('type'=>'string', 'filter_type' => 'like'), - 'AffiliatePortalUserId' => Array('type'=>'int'), + // for Search + 'Username' => Array ('type' => 'string', 'filter_type' => 'like'), + 'OrderSearchId' => Array ('type' => 'int', 'filter_type' => 'equals', 'filter_field' => 'OrderId'), + 'FromDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_from', 'filter_field' => 'OrderDate' ), + 'ToDateTime' => Array ('formatter' => 'kDateFormatter', 'default' => '', 'filter_type' => 'range_to', 'filter_field' => 'OrderDate', 'empty_time' => adodb_mktime(23,59,59) ), + 'FromAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'filter_type' => 'range_from', 'filter_field' => 'TotalAmount'), + 'ToAmount' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%01.2f', 'filter_type' => 'range_to', 'filter_field' => 'TotalAmount'), + 'HasBackOrders' => Array ('default' =>false), + 'PaymentCVV2' => Array ('type' => 'string', 'default' =>false), + 'AffiliateUser' => Array ('type' => 'string', 'filter_type' => 'like'), + 'AffiliatePortalUserId' => Array ('type' => 'int'), - // export related fields: begin - 'ExportFormat' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CSV', /*2 => 'XML'*/), 'default' => 1), - 'ExportFilename' => Array('type' => 'string', 'default' => ''), - 'FieldsSeparatedBy' => Array('type' => 'string', 'default' => ','), - 'FieldsEnclosedBy' => Array('type' => 'string', 'default' => '"'), - 'LineEndings' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'Windows', 2 => 'UNIX'), 'default' => 1), - 'LineEndingsInside' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'CRLF', 2 => 'LF'), 'default' => 2), - 'IncludeFieldTitles' => Array('type' => 'int', 'default' => 1), - 'ExportColumns' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()), - 'AvailableColumns' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()), - 'ExportPresets' => Array('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array()), - 'ExportSavePreset' => Array('type'=>'int'), - 'ExportPresetName' => Array('type'=>'string'), - // export related fields: end - ), - 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array( + // export related fields: begin + 'ExportFormat' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CSV', /*2 => 'XML'*/), 'default' => 1), + 'ExportFilename' => Array ('type' => 'string', 'default' => ''), + 'FieldsSeparatedBy' => Array ('type' => 'string', 'default' => ', '), + 'FieldsEnclosedBy' => Array ('type' => 'string', 'default' => '"'), + 'LineEndings' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Windows', 2 => 'UNIX'), 'default' => 1), + 'LineEndingsInside' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'CRLF', 2 => 'LF'), 'default' => 2), + 'IncludeFieldTitles' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 1, + ), + 'ExportColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'AvailableColumns' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportPresets' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ()), + 'ExportSavePreset' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), + 'use_phrases' => 1, 'not_null' => 1, 'default' => 0, + ), + 'ExportPresetName' => Array ('type' => 'string'), + // export related fields: end + ), + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array ( 'default' => 'icon16_item.png', 1 => 'icon16_pending.png', 5 => 'icon16_disabled.png', 'module' => 'core', ), - 'Fields' => Array( - 'OrderId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'OrderNumber' => Array( 'title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'OrderDate' => Array( 'title'=>'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'CustomerName' => Array( 'title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ), - 'PaymentType' => Array( 'title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ), - 'TotalAmount' => Array( 'title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ), - 'AffiliateUser' => Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ), + 'Fields' => Array ( + 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), 'OrderNumber' => Array ( 'title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'OrderDate' => Array ( 'title' => 'la_col_OrderDate', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'CustomerName' => Array ( 'title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ), + 'PaymentType' => Array ( 'title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter', 'width' => 140, ), + 'TotalAmount' => Array ( 'title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_range_filter', 'width' => 140, ), + 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_like_filter', 'width' => 140, ), 'OnHold' => Array ('title' => 'la_col_OnHold', 'filter_block' => 'grid_options_filter', 'width' => 100, ), ), ), - 'Search' => Array( - 'Icons' => Array( + 'Search' => Array ( + 'Icons' => Array ( 'default' => 'icon16_item.png', 1 => 'icon16_pending.png', 5 => 'icon16_disabled.png', 'module' => 'core', ), - 'Fields' => Array( - 'OrderId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), - 'OrderNumber' => Array('title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), - 'Status' => Array('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ), - 'OrderDate' => Array('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), - 'CustomerName' => Array('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), - 'PaymentType' => Array('title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'), - 'TotalAmount' => Array('title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'), - 'AffiliateUser' => Array( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'), - 'OrderIP' => Array('title' => 'la_col_OrderIP', 'filter_block' => 'grid_like_filter'), - 'Username' => Array('title' => 'la_col_Username', 'filter_block' => 'grid_user_like_filter'), - 'PaymentAccount' => Array('title' => 'la_col_CreditCardNumber', 'filter_block' => 'grid_like_filter'), + 'Fields' => Array ( + 'OrderId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 70, ), + 'OrderNumber' => Array ('title' => 'la_col_OrderNumber', 'data_block' => 'grid_ordernumber_td', 'filter_block' => 'grid_like_filter', 'width' => 100, ), + 'Status' => Array ('title' => 'la_col_Status', 'filter_block' => 'grid_options_filter', 'filter_block' => 'grid_options_filter', 'width' => 100, ), + 'OrderDate' => Array ('title' => 'la_col_OrderDate', 'filter_block' => 'grid_date_range_filter', 'width' => 140, ), + 'CustomerName' => Array ('title' => 'la_col_CustomerName', 'data_block' => 'grid_userlink_td', 'user_field' => 'PortalUserId', 'filter_block' => 'grid_like_filter'), + 'PaymentType' => Array ('title' => 'la_col_PaymentType', 'data_block' => 'grid_billinglink_td', 'filter_block' => 'grid_options_filter'), + 'TotalAmount' => Array ('title' => 'la_col_TotalAmount', 'data_block' => 'grid_previewlink_td', 'filter_block' => 'grid_float_range_filter'), + 'AffiliateUser' => Array ( 'title' => 'la_col_AffiliateUser', 'data_block' => 'grid_userlink_td', 'user_field' => 'AffiliatePortalUserId', 'filter_block' => 'grid_user_like_filter'), + 'OrderIP' => Array ('title' => 'la_col_OrderIP', 'filter_block' => 'grid_like_filter'), + 'Username' => Array ('title' => 'la_col_Username', 'filter_block' => 'grid_user_like_filter'), + 'PaymentAccount' => Array ('title' => 'la_col_CreditCardNumber', 'filter_block' => 'grid_like_filter'), ), ), ), Index: branches/5.1.x/units/currencies/currencies_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/currencies/currencies_config.php (.../currencies_config.php) (revision 13156) +++ branches/5.1.x/units/currencies/currencies_config.php (.../currencies_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ('curr' => '!la_title_EditingCurrency!'), 'new_titlefield' => Array ('curr' => '!la_title_NewCurrency!'), ), - 'currencies_list'=>Array ( 'prefixes' => Array ('curr_List'), + 'currencies_list' =>Array ( 'prefixes' => Array ('curr_List'), 'format' => "!la_title_Currencies!", ), - 'currencies_edit'=>Array ( 'prefixes' => Array ('curr'), + 'currencies_edit' =>Array ( 'prefixes' => Array ('curr'), 'new_titlefield' => Array ('curr' => '!la_title_NewCurrency!'), 'format' => "#curr_status# '#curr_titlefield#' - !la_title_General!", ), @@ -101,19 +101,28 @@ 'Sorting' => Array ('ISO' => 'asc'), ) ), - 'Fields' => Array - ( - 'CurrencyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ISO' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'Symbol' => Array ('type' => 'string', 'default' => null), - 'SymbolPosition' => Array ('type' => 'int', 'default' => null,'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Left', 1 => 'la_Right'),'use_phrases' => '1'), - 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'RateToPrimary' => Array ('type' => 'float', 'not_null' => 1, 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.4f', 'default' => 1), - 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'Status' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1, 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1, 'formatter' => 'kOptionsFormatter'), - 'IsPrimary' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - ), + 'Fields' => Array ( + 'CurrencyId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ISO' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'Symbol' => Array ('type' => 'string', 'default' => null), + 'SymbolPosition' => Array ('type' => 'int', 'default' => null, 'formatter' => 'kOptionsFormatter', 'options' => Array (0 => 'la_Left', 1 => 'la_Right'), 'use_phrases' => '1'), + 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), + 'RateToPrimary' => Array ('type' => 'float', 'not_null' => 1, 'min_value_exc' => 0, 'formatter' => 'kFormatter', 'format' => '%0.4f', 'default' => 1), + 'Modified' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 1 => 'la_Active', 0 => 'la_Disabled' ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 1, + ), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + ), 'VirtualFields' => Array ( 'Translation' => Array ('type' => 'string', 'default' => ''), Index: branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 13156) +++ branches/5.1.x/units/shipping_quote_engines/shipping_quote_engines_config.php (.../shipping_quote_engines_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ( 'default' => Array ( 'edit_status_labels' => Array ('sqe' => '!la_title_EditingShippingQuoteEngine!'), ), - 'engine_list'=>Array ( 'prefixes' => Array ('sqe_List'), + 'engine_list' =>Array ( 'prefixes' => Array ('sqe_List'), 'format' => "!la_title_ShippingQuoteEngines!", ), - 'engine_edit'=>Array ( 'prefixes' => Array ('sqe'), + 'engine_edit' =>Array ( 'prefixes' => Array ('sqe'), 'format' => "#sqe_status# '#sqe_titlefield#' - !la_title_General!", ), ), @@ -72,54 +72,122 @@ Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER), ), 'Filters' => Array ( - 'show_active' => Array ('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), - 'ListSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s'), // key - special, value - list select sql - 'ItemSQLs' => Array ( ''=> 'SELECT * FROM %s'), + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s'), 'ListSortings' => Array ( '' => Array ( 'Sorting' => Array ('Name' => 'asc'), ) ), 'Fields' => Array ( - 'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Name' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'FlatSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'), - 'PercentSurcharge' => Array ('type' => 'double', 'not_null' => '1', 'default' => '0'), - 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null' => 1), - 'Properties' => Array ('type' => 'string', 'default' => NULL), - 'ClassName' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - ), + 'EngineId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'FlatSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'), + 'PercentSurcharge' => Array ('type' => 'double', 'not_null' => 1, 'default' => '0'), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'use_phrases' => 1, + 'default' => 0, 'not_null' => 1, + ), + 'Properties' => Array ('type' => 'string', 'default' => NULL), + 'ClassName' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + ), 'VirtualFields' => Array ( - 'AccountLogin' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'AccountPassword' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'UPSEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'UPSAccount' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'UPSInvoiced' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')), - 'FDXEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'FDXAccount' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'FDXInvoiced' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')), - 'DHLEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'DHLAccount' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'DHLInvoiced' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')), - 'USPEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'USPAccount' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'USPInvoiced' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')), - 'ARBEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'ARBAccount' => Array ('type' => 'string', 'not_null' => '1', 'default' => ''), - 'ARBInvoiced' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced')), - '1DYEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - '2DYEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - '3DYEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'GNDEnabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'Enabled', 0 => 'Disabled')), - 'ShipMethod' => Array ('type' => 'string', 'formatter' => 'kOptionsFormatter', 'options' => Array ('DRP' => 'Drop-Off At Carrier Location', 'PCK' => 'Schedule A Special Pickup', 'SCD' => 'Regularly Scheduled Pickup')), - ), + 'AccountLogin' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'AccountPassword' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'UPSEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'UPSAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'UPSInvoiced' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + ), + 'FDXEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'FDXAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'FDXInvoiced' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + ), + 'DHLEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'DHLAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'DHLInvoiced' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + ), + 'USPEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'USPAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'USPInvoiced' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + ), + 'ARBEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'ARBAccount' => Array ('type' => 'string', 'not_null' => 1, 'default' => ''), + 'ARBInvoiced' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Invoiced', 0 => 'NotInvoiced'), + ), + '1DYEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + '2DYEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + '3DYEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'GNDEnabled' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (1 => 'Enabled', 0 => 'Disabled'), + ), + 'ShipMethod' => Array ( + 'type' => 'string', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( + 'DRP' => 'Drop-Off At Carrier Location', + 'PCK' => 'Schedule A Special Pickup', + 'SCD' => 'Regularly Scheduled Pickup'), + ), + ), 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ( Index: branches/5.1.x/units/payment_type/payment_type_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 13156) +++ branches/5.1.x/units/payment_type/payment_type_config.php (.../payment_type_config.php) (revision 13549) @@ -1,6 +1,6 @@ Array ('pt' => '!la_title_NewPaymentType!'), ), - 'payment_type_list'=>Array ( 'prefixes' => Array ('pt_List'), + 'payment_type_list' =>Array ( 'prefixes' => Array ('pt_List'), 'format' => "!la_title_PaymentTypes!", ), - 'payment_type_edit'=>Array ( 'prefixes' => Array ('pt'), + 'payment_type_edit' =>Array ( 'prefixes' => Array ('pt'), 'new_titlefield' => Array ('pt' => '!la_title_NewPaymentType!'), 'format' => "#pt_status# '#pt_titlefield#' - !la_title_General!", ), @@ -84,7 +84,7 @@ Array ('mode' => 'AND', 'filters' => Array ('show_active', 'show_disabled'), 'type' => WHERE_FILTER), ), 'Filters' => Array ( - 'show_active' => Array ('label' =>'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), + 'show_active' => Array ('label' => 'la_Active', 'on_sql' => '', 'off_sql' => '%1$s.Status != 1' ), 'show_disabled' => Array ('label' => 'la_Disabled', 'on_sql' => '', 'off_sql' => '%1$s.Status != 0' ), ) ), @@ -108,24 +108,47 @@ ) ), 'Fields' => Array ( - 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), - 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required'=>true, 'max_len' => 100), - 'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => NULL), - 'Instructions' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'AdminComments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'Status' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_Enabled', 0 => 'la_Disabled' ), 'default' => 0, 'not_null' => 1), - 'Priority' => Array ('type' => 'int', 'not_null' => true, 'default' => 0), - 'IsPrimary' => Array ('type' => 'int', 'not_null' => true, 'default' => 0), - 'BuiltIn' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_BuiltIn', 0 => 'la_UserDefined' ), 'default' => 0, 'not_null' => 1 ), - 'GatewayId' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %s FROM '.TABLE_PREFIX.'Gateways', 'option_key_field' => 'GatewayId', 'option_title_field' => 'Name', 'default' => 1, 'not_null' => 1), - 'PlacedOrdersEdit' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => '1', 'default' => '0.00'), - 'PortalGroups' => Array ('type' => 'string', 'default' => NULL), - ), -/* 'VirtualFields' => Array ( - 'Qty' => 1, - ),*/ - + 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0,), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'default' => '', 'required' =>true, 'max_len' => 100), + 'Description' => Array ('type' => 'string', 'max_len' => 255, 'default' => null), + 'Instructions' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), + 'AdminComments' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'BuiltIn' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_BuiltIn', 0 => 'la_UserDefined' ), 'default' => 0, 'not_null' => 1 ), + 'GatewayId' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options_sql' => 'SELECT %s FROM ' . TABLE_PREFIX . 'Gateways', + 'option_key_field' => 'GatewayId', + 'option_title_field' => 'Name', + 'default' => 1, 'not_null' => 1, + ), + 'PlacedOrdersEdit' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'ProcessingFee' => Array ('type' => 'double', 'formatter' => 'kFormatter', 'format' => '%.02f', 'not_null' => 1, 'default' => '0.00'), + 'PortalGroups' => Array ('type' => 'string', 'default' => null), + ), + /* + 'VirtualFields' => Array ( + 'Qty' => 1, + ), + */ 'Grids' => Array ( 'Default' => Array ( 'Icons' => Array ( Index: branches/5.1.x/units/product_options/product_options_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/product_options/product_options_config.php (.../product_options_config.php) (revision 13156) +++ branches/5.1.x/units/product_options/product_options_config.php (.../product_options_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'po', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'ProductOptionsEventHandler','file'=>'product_options_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'ProductOptionsTagProcessor','file'=>'product_options_tag_processor.php','build_event'=>'OnBuild'), - 'RegisterClasses' => Array( - Array('pseudo'=>'kProductOptionsHelper','class'=>'kProductOptionsHelper','file'=>'product_options_helper.php','build_event'=>''), + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'ProductOptionsEventHandler', 'file' => 'product_options_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'ProductOptionsTagProcessor', 'file' => 'product_options_tag_processor.php', 'build_event' => 'OnBuild'), + 'RegisterClasses' => Array ( + Array ('pseudo' => 'kProductOptionsHelper', 'class' => 'kProductOptionsHelper', 'file' => 'product_options_helper.php', 'build_event' => ''), ), 'AutoLoad' => true, - 'Hooks' => Array( + 'Hooks' => Array ( ), - 'AggregateTags' => Array( - Array( + 'AggregateTags' => Array ( + Array ( 'AggregateTo' => '#PARENT#', 'AggregatedTagName' => 'ListOptions', 'LocalTagName' => 'ListOptions', ), ), - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', @@ -48,25 +48,35 @@ 'ParentPrefix' => 'p', 'AutoDelete' => true, 'AutoClone' => true, - 'SubItems' => array('poc'), - 'ListSQLs' => Array( ''=>'SELECT * FROM %s', + 'SubItems' => Array ('poc'), + 'ListSQLs' => Array ( '' => 'SELECT * FROM %s', ), // key - special, value - list select sql - 'ItemSQLs' => Array( ''=>'SELECT * FROM %s', + 'ItemSQLs' => Array ( '' => 'SELECT * FROM %s', ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('Name' => 'asc'), - 'ForcedSorting' => Array('Priority' => 'desc'), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + 'ForcedSorting' => Array ('Priority' => 'desc'), ) ), 'Fields' => Array ( - 'ProductOptionId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'ProductId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Name' => Array('type' => 'string', 'required' => 1, 'max_len' => 255, 'not_null' => 1, 'default' => '',), - 'OptionType' => Array('type' => 'int', 'required' => 1, 'formatter'=>'kOptionsFormatter', 'use_phrases' => 1, 'options'=>Array(0 => '!la_EmptyValue!', 1 => '!la_type_select!', 5 => '!la_type_text!', 4 => '!la_type_textarea!', 3 => '!la_type_radio!', 6 => '!la_type_checkbox!' /*, 2 => '!la_type_password!' */), 'not_null' => 1, 'default' => 0), - 'Required' => Array('type' => 'int', 'not_null'=>1, 'default'=>0, 'formatter'=>'kOptionsFormatter', 'use_phrases'=>1, 'options'=>array(0=>'la_No', 1=>'la_Yes')), - 'Listable' => Array('type' => 'int', 'not_null'=>1, 'default'=>0, 'formatter'=>'kOptionsFormatter', 'use_phrases'=>1, 'options'=>array(0=>'la_No', 1=>'la_Yes')), - 'Priority' => Array('type' => 'int', 'not_null'=>1, 'default'=>0), + 'ProductOptionId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'ProductId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Name' => Array ('type' => 'string', 'required' => 1, 'max_len' => 255, 'not_null' => 1, 'default' => '',), + 'OptionType' => Array ('type' => 'int', 'required' => 1, 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' =>Array (1 => '!la_type_select!', 5 => '!la_type_text!', 4 => '!la_type_textarea!', 3 => '!la_type_radio!', 6 => '!la_type_checkbox!' /*, 2 => '!la_type_password!' */), 'not_null' => 1, 'default' => 0), + 'Required' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Listable' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array (0 => 'la_No', 1 => 'la_Yes'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Priority' => Array ('type' => 'int', 'not_null' =>1, 'default' =>0), 'Values' => Array ('type' => 'string', 'default' => NULL), 'Prices' => Array ('type' => 'string', 'default' => NULL), 'PriceTypes' => Array ('type' => 'string', 'default' => NULL), @@ -75,19 +85,19 @@ 'VirtualFields' => Array ( ), - 'Grids' => Array( + 'Grids' => Array ( - 'Default' => Array( - 'Icons' => Array( + 'Default' => Array ( + 'Icons' => Array ( 'default' => 'icon16_item.png', 'module' => 'core', ), // icons for each StatusField values, if no matches or no statusfield selected, then "default" icon is used - 'Fields' => Array( - 'ProductOptionId' => Array( 'title'=>'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array( 'title'=>'la_col_Name', 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'), - 'OptionType' => Array( 'title'=>'la_col_OptionType', 'filter_block' => 'grid_options_filter'), - 'Required' => Array( 'title'=>'la_col_Required', 'filter_block' => 'grid_options_filter'), - /*'Listable' => Array( 'title'=>'la_col_Listable', 'filter_block' => 'grid_options_filter'),*/ + 'Fields' => Array ( + 'ProductOptionId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'option_name_td', 'filter_block' => 'grid_like_filter'), + 'OptionType' => Array ( 'title' => 'la_col_OptionType', 'filter_block' => 'grid_options_filter'), + 'Required' => Array ( 'title' => 'la_col_Required', 'filter_block' => 'grid_options_filter'), + /*'Listable' => Array ( 'title' => 'la_col_Listable', 'filter_block' => 'grid_options_filter'),*/ ), ), Index: branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php =================================================================== diff -u -r13156 -r13549 --- branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php (.../affiliate_payment_types_config.php) (revision 13156) +++ branches/5.1.x/units/affiliate_payment_types/affiliate_payment_types_config.php (.../affiliate_payment_types_config.php) (revision 13549) @@ -1,6 +1,6 @@ 'apt', - 'ItemClass' => Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'), - 'ListClass' => Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'), - 'EventHandlerClass' => Array('class'=>'AffiliatePaymentTypesEventHandler','file'=>'affiliate_payment_types_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'AffiliatePaymentTypesEventHandler', 'file' => 'affiliate_payment_types_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), 'AutoLoad' => true, - 'AggregateTags' => Array( - Array( + 'AggregateTags' => Array ( + Array ( 'AggregateTo' => 'u', 'AggregatedTagName' => 'ListAffiliatesPaymentTypes', 'LocalTagName' => 'PrintList', 'LocalSpecial' => 'active', ), ), - 'QueryString' => Array( + 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', @@ -37,29 +37,29 @@ ), 'IDField' => 'PaymentTypeId', - 'StatusField' => Array('Status', 'IsPrimary'), // field, that is affected by Approve/Decline events + 'StatusField' => Array ('Status', 'IsPrimary'), // field, that is affected by Approve/Decline events 'TitleField' => 'Name', - 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('apt'=>'!la_title_Adding_Affiliate_Payment_Type!'), - 'edit_status_labels' => Array('apt'=>'!la_title_Editing_Affiliate_Payment_Type!'), - 'new_titlefield' => Array('apt'=>'!la_title_New_Affiliate_Payment_Type!'), + 'TitlePresets' => Array ( + 'default' => Array ( 'new_status_labels' => Array ('apt' => '!la_title_Adding_Affiliate_Payment_Type!'), + 'edit_status_labels' => Array ('apt' => '!la_title_Editing_Affiliate_Payment_Type!'), + 'new_titlefield' => Array ('apt' => '!la_title_New_Affiliate_Payment_Type!'), ), - 'affiliate_payment_types_list' => Array('prefixes' => Array('apt_List'), 'format' => "!la_title_AffiliatePaymentTypes!"), - 'affiliate_payment_types_edit' => Array('prefixes' => Array('apt'), 'format' => "#apt_status# '#apt_titlefield#' - !la_title_General!"), + 'affiliate_payment_types_list' => Array ('prefixes' => Array ('apt_List'), 'format' => "!la_title_AffiliatePaymentTypes!"), + 'affiliate_payment_types_edit' => Array ('prefixes' => Array ('apt'), 'format' => "#apt_status# '#apt_titlefield#' - !la_title_General!"), ), - 'PermSection' => Array('main' => 'in-commerce:affiliate_payment_types'), + 'PermSection' => Array ('main' => 'in-commerce:affiliate_payment_types'), - 'Sections' => Array( - 'in-commerce:affiliate_payment_types' => Array( + 'Sections' => Array ( + 'in-commerce:affiliate_payment_types' => Array ( 'parent' => 'in-commerce:affiliates_folder', 'icon' => 'affiliates', 'label' => 'la_tab_AffiliatePaymentTypes', - 'url' => Array('t' => 'in-commerce/affiliate_plans/affiliate_payment_types_list', 'pass' => 'm'), - 'permissions' => Array( + 'url' => Array ('t' => 'in-commerce/affiliate_plans/affiliate_payment_types_list', 'pass' => 'm'), + 'permissions' => Array ( 'view', 'add', 'edit', 'delete', 'advanced:approve', 'advanced:decline', 'advanced:set_primary', 'advanced:move_up', 'advanced:move_down' ), @@ -70,27 +70,37 @@ 'TableName' => TABLE_PREFIX.'AffiliatePaymentTypes', - 'ListSQLs' => Array('' => 'SELECT * FROM %s'), - 'ItemSQLs' => Array('' => 'SELECT * FROM %s'), + 'ListSQLs' => Array ('' => 'SELECT * FROM %s'), + 'ItemSQLs' => Array ('' => 'SELECT * FROM %s'), - 'ListSortings' => Array( - '' => Array( - 'ForcedSorting' => Array('IsPrimary' => 'desc', 'Priority' => 'desc'), - 'Sorting' => Array('Name' => 'asc'), + 'ListSortings' => Array ( + '' => Array ( + 'ForcedSorting' => Array ('IsPrimary' => 'desc', 'Priority' => 'desc'), + 'Sorting' => Array ('Name' => 'asc'), ) ), - 'Fields' => Array( - 'PaymentTypeId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Name' => Array('type' => 'string','not_null' => '1', 'required' => 1, 'default' => ''), - 'Description' => Array('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), - 'IsPrimary' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'Status' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'Priority' => Array('type' => 'int','not_null' => 1, 'default' => 0), - ), + 'Fields' => Array ( + 'PaymentTypeId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Description' => Array ('type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => NULL), + 'Status' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_Disabled', 1 => 'la_Active', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'IsPrimary' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', + 'options' => Array ( 0 => 'la_No', 1 => 'la_Yes', ), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0, + ), + 'Priority' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + ), - 'Grids' => Array( - 'Default' => Array( + 'Grids' => Array ( + 'Default' => Array ( 'Icons' => Array ( 'default' => 'icon16_item.png', '0_0' => 'icon16_disabled.png', @@ -99,10 +109,10 @@ '1_1' => 'icon16_primary.png', 'module' => 'core', ), - 'Fields' => Array( - 'PaymentTypeId' => Array( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), - 'Name' => Array( 'title' => 'la_col_Name', 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), - 'Description' => Array( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Fields' => Array ( + 'PaymentTypeId' => Array ( 'title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ), + 'Name' => Array ( 'title' => 'la_col_Name', 'data_block' => 'affiliate_payment_type_caption_td', 'filter_block' => 'grid_like_filter', 'width' => 200, ), + 'Description' => Array ( 'title' => 'la_col_Description', 'filter_block' => 'grid_like_filter', 'width' => 200, ), ), ), Index: branches/5.1.x/install/english.lang =================================================================== diff -u -r13137 -r13549 --- branches/5.1.x/install/english.lang (.../english.lang) (revision 13137) +++ branches/5.1.x/install/english.lang (.../english.lang) (revision 13549) @@ -114,8 +114,6 @@ RW5kZWQgT24= RXhwaXJhdGlvbg== RXh0LiBQcmljZQ== - TmFtZQ== - RmlsZW5hbWU= RmxhdCBTdXJjaGFyZ2U= RnJvbSBBbW91bnQ= RnJvbSBVc2Vy @@ -324,7 +322,6 @@ RW5kIERhdGU= RXhwaXJhdGlvbg== RmVhdHVyZWQ= - RmlsZQ== Rmlyc3QgRGF5 RmxhdCBTdXJjaGFyZ2U= TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw== @@ -394,7 +391,6 @@ TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw== TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A= TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA== - UXVhbnRpdHk= UXR5IEJhY2tPcmRlcmVk UXR5IEluIFN0b2Nr TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ= @@ -550,7 +546,6 @@ TmV3IFplYWxhbmQgRG9sbGFy UmlhbCBPbWFuaQ== T25saW5lIFN0b3Jl - RS1tYWls RXhjaGFuZ2U= TGlzdGluZw== UGVybWFuZW50IENvb2tpZQ== @@ -651,9 +646,9 @@ U2VsZWN0ZWQgT25seQ== TmFtZQ== VHlwZQ== - U2hpcCBhbGwgaXRlbXMgdG9nZXRoZXI= - U2hpcCBiYWNrb3JkZXJzIHVwb24gYXZhaWxhYmxl - U2hpcCBiYWNrb3JkZXJlZCBpdGVtcyBzZXBhcmF0ZWx5 + U2hpcCBhbGwgaXRlbXMgdG9nZXRoZXI= + U2hpcCBiYWNrb3JkZXJzIHVwb24gYXZhaWxhYmxl + U2hpcCBiYWNrb3JkZXJlZCBpdGVtcyBzZXBhcmF0ZWx5 U2FpbnQgSGVsZW5hIFBvdW5k VG9sYXI= U2xvdmFrIEtvcnVuYQ== @@ -958,10 +953,10 @@ Q29tbWVudCBQcm9kdWN0 Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc= VmlldyBQcm9kdWN0 + U2hpcG1lbnQ= + U2hpcHBpbmcgVHlwZQ== Q29tbWVudCB0aGlzIFByb2R1Y3Q= U2hpcHBpbmcgSW5mb3JtYXRpb24= - U2hpcG1lbnQ= - U2hpcHBpbmcgVHlwZQ== U3ViamVjdDogQWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBoYXMgYmVlbiBpc3N1ZWQKCllvdXIgYWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBoYXMgYmVlbiBpc3N1ZWQsIHBsZWFzZSBsb2dpbiB0byBZb3VyIEFjY291bnQsIEFmZmlsaWF0ZSBQYXltZW50cyBzZWN0aW9uIHRvIGNoZWNrIHRoZSBkZXRhaWxzLg== Index: branches/5.1.x/install/install_data.sql =================================================================== diff -u -r13465 -r13549 --- branches/5.1.x/install/install_data.sql (.../install_data.sql) (revision 13465) +++ branches/5.1.x/install/install_data.sql (.../install_data.sql) (revision 13549) @@ -329,17 +329,13 @@ INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'lu_PermName_Product.Modify_desc', 'lu_PermName_Product.Modify_desc', 'In-Commerce'); INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'lu_PermName_Product.View_desc', 'lu_PermName_Product.View_error', 'In-Commerce'); -INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 14, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.REVIEW', 13, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 13, 1, 0, {ProductCatId}); -INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 13, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'FAVORITES', 13, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 13, 1, 0, {ProductCatId}); -INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 12, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 12, 1, 0, {ProductCatId}); -INSERT INTO Permissions VALUES (DEFAULT, 'CATEGORY.VIEW', 11, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.ADD', 11, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.DELETE', 11, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.MODIFY', 11, 1, 0, {ProductCatId}); Index: branches/5.1.x/units/gateways/gw_classes/paybox.php =================================================================== diff -u -r13100 -r13549 --- branches/5.1.x/units/gateways/gw_classes/paybox.php (.../paybox.php) (revision 13100) +++ branches/5.1.x/units/gateways/gw_classes/paybox.php (.../paybox.php) (revision 13549) @@ -1,6 +1,6 @@ Application->HREF($tag_params['cancel_template'],'',Array('pass'=>'m')); $txt_amount = sprintf("%.2f", $item_data['TotalAmount']); - $params['PBX_TOTAL'] = eregi_replace("[.,]", '', $txt_amount); + $params['PBX_TOTAL'] = str_replace( Array('.', ','), '', $txt_amount); $params['PBX_CMD'] = $this->Application->GetSID().','.MD5($item_data['OrderId']); /*$params['order_id'] = $item_data['OrderId']; @@ -96,8 +96,8 @@ $ret = implode("\n", $rets); - $ret = eregi_replace("^.*\!\!", '', $ret); - $ret = chop($ret, '!'); + $ret = preg_replace('/^(.*)!!/is', '', $ret); + $ret = rtrim($ret, '!'); return ''.$ret.'
'; }