Menu
▾
▴
[Oscss-commit] SF.net SVN: oscss:[4659] branches/2.1.1/catalog
|
From: <os...@us...> - 2012-11-05 21:48:01
|
Revision: 4659
http://oscss.svn.sourceforge.net/oscss/?rev=4659&view=rev
Author: oscim
Date: 2012-11-05 21:47:54 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
correction coquille , add boutton select all
Modified Paths:
--------------
branches/2.1.1/catalog/admin/includes/header.php
branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql
Modified: branches/2.1.1/catalog/admin/includes/header.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/header.php 2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/admin/includes/header.php 2012-11-05 21:47:54 UTC (rev 4659)
@@ -117,19 +117,20 @@
"bProcessing": true,
"bServerSide": true,
"oSearch": { "sSearch": "", "bEscapeRegex": true },
+ "aLengthMenu": [[25, 50, 100, -1], [25, 50, 100, "All"]],
"oLanguage": {
- "sLengthMenu": "<?php echo sprintf(TEXT_MAXI_ROW_BY_PAGE,"_MENU_")?>",
- "sZeroRecords": "Nothing found - sorry",
- "sInfo": "<?php echo sprintf(TEXT_DISPLAY_NUMBER_OF,"_START_","_END_","_TOTAL_")?>",
- "sInfoEmtpy": "Showing 0 to 0 of 0 records",
- "sInfoFiltered": "<?php echo sprintf(TEXT_FILTRED_ON,"_MAX_")?> ",
- "sSearch": "<?php echo IMAGE_SEARCH ?>",
- "oPaginate": {
- "sFirst": "<?php echo FIRST ?>",
- "sPrevious": "<?php echo PREV ?>",
- "sNext": "<?php echo NEXT ?>",
- "sLast": "<?php echo PREVIOUS ?>"
- }
+ "sLengthMenu": "<?php echo sprintf(TEXT_MAXI_ROW_BY_PAGE,"_MENU_")?>",
+ "sZeroRecords": "Nothing found - sorry",
+ "sInfo": "<?php echo sprintf(TEXT_DISPLAY_NUMBER_OF,"_START_","_END_","_TOTAL_")?>",
+ "sInfoEmtpy": "Showing 0 to 0 of 0 records",
+ "sInfoFiltered": "<?php echo sprintf(TEXT_FILTRED_ON,"_MAX_")?> ",
+ "sSearch": "<?php echo IMAGE_SEARCH ?>",
+ "oPaginate": {
+ "sFirst": "<?php echo FIRST ?>",
+ "sPrevious": "<?php echo PREV ?>",
+ "sNext": "<?php echo NEXT ?>",
+ "sLast": "<?php echo PREVIOUS ?>"
+ }
},
<?php if( ($col=call_user_func(array(tep_extrac_querystring(JSONSTATMENT,'type'), 'tep_get_modele'))) && is_array($col)): ?>
"aoColumns": [
Modified: branches/2.1.1/catalog/admin/includes/modules/pages/orders.php
===================================================================
--- branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/admin/includes/modules/pages/orders.php 2012-11-05 21:47:54 UTC (rev 4659)
@@ -255,8 +255,13 @@
0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
);
- self::$InitInfo['tfooter']['listing']=self::$InitInfo['theader']['listing'];
+ self::$InitInfo['tfooter']['listing']=array(
+ 0 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>' ' ),
+ 1 =>array('width'=>'2%', 'class'=>'tcenter', 'txt'=>'<input type="checkbox" id="select_all" name="select_all">' ),
+ );
+
+
self::$InitInfo['modele']['listing']=array(
0 =>false,
1 =>false,
@@ -1059,6 +1064,7 @@
$query_raw = "SELECT DISTINCT ".$adjust->listfields.
" FROM " . TABLE_ORDERS . " o ".
" LEFT JOIN " . TABLE_ORDERS_TOTAL . " ot on (o.orders_id = ot.orders_id) ".
+ " LEFT JOIN " . TABLE_ORDERS_PRODUCTS . " op on (op.orders_id = o.orders_id) ".
" LEFT JOIN " . TABLE_STATUS . " s ON(o.orders_status = s.status_id and s.status_type='orders' and s.language_id = '" . (int)$adjust->languages_id . "') ".
" WHERE ot.class = 'ot_total' ".$adjust->sWhere.
" ORDER BY ".((!empty($adjust->sOrder)) ? $adjust->sOrder : 'o.orders_id DESC');
@@ -1305,7 +1311,11 @@
$col=count(self::DTheaderTable());
return array(
0 => self::$InitInfo['tfooter']['listing'] ,
- 1 =>array( array('colspan'=>$col, 'class'=>'tleft', 'txt'=>'<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ) )
+ 1 =>array(
+ array(
+ 'colspan'=>$col,
+ 'class'=>'tleft',
+ 'txt'=>'<span class="fleft">'.__('action multiple') . ' ' . tep_draw_pull_down_menu('status_multi', array_merge(array(array('id' => '', 'text' => __('text action multiple orders'))), orders::$orders_statuses) ) . __('export: ') . tep_draw_pull_down_menu('modeexport', orders::$export->mode ).'</span> <span class="fleft" style="margin-left:50px;"> '. tep_image_submit('button_confirm.gif', IMAGE_CONFIRM, '' ).'</span>' ) )
) ;
}
else
@@ -1339,7 +1349,7 @@
if(isset($orders['orders_status_name'])) $ord['orders_status_name']=sprintf( CsrtAction::getFormat('type_color'), $orders['orders_status_color'], $orders['orders_status_name'] );
$ord[0]=$orders['orders_id'];
- $ord[1]=tep_draw_checkbox_field('action_multi['.$orders['orders_id'].']','action_mutli_'.$orders['orders_id'],$orders['orders_id']);
+ $ord[1]=tep_draw_checkbox_field('action_multi['.$orders['orders_id'].']','action_mutli_'.$orders['orders_id'],$orders['orders_id'], '','',' class="multi" ');
$ord['action']=self::get_item_action($ord);
$res[]=$ord;
}
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql 2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_holding_orders_products.sql 2012-11-05 21:47:54 UTC (rev 4659)
@@ -25,6 +25,7 @@
products_tax decimal(7,4) default '0.0000' not null ,
products_quantity int(2) default '0' not null ,
products_stock_attributes varchar(255) default NULL,
+ products_stock_extra varchar(255) default NULL,
products_returned tinyint(2) unsigned default '0' ,
products_exchanged tinyint(2) default '0' not null ,
products_exchanged_id int(11) default '0' not null ,
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql 2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/tables/osc_orders_products.sql 2012-11-05 21:47:54 UTC (rev 4659)
@@ -23,8 +23,9 @@
products_price decimal(15,4) default '0.0000' not null ,
final_price decimal(15,4) default '0.0000' not null ,
products_tax decimal(7,4) default '0.0000' not null ,
- products_quantity int(2) default '0' not null ,
+ products_quantity int(3) default '0' not null ,
products_stock_attributes varchar(255) default NULL,
+ products_stock_extra varchar(255) default NULL,
products_returned tinyint(2) default '0' null ,
products_exchanged tinyint(2) default '0' not null ,
products_exchanged_id int(11) default '0' not null ,
Modified: branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql
===================================================================
--- branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql 2012-11-05 15:24:36 UTC (rev 4658)
+++ branches/2.1.1/catalog/install/includes/sql/mysql/upgrade/2.1.0_2.1.1/tables/osc_orders_products.sql 2012-11-05 21:47:54 UTC (rev 4659)
@@ -14,3 +14,6 @@
ALTER TABLE osc_orders_products ADD products_type int(1) NOT NULL DEFAULT '1' AFTER products_id;
+ALTER TABLE osc_orders_products ADD products_stock_extra varchar(255) default NULL AFTER products_stock_attributes;
+
+ ,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
