Skip to content

Commit

Permalink
Add to providers select format and prices type to send orders.
Browse files Browse the repository at this point in the history 
NOTE: of aixada_queries_all.sql: This commit removes duplicate procedures and others who worked on tables that are not of Aixada.
  • Loading branch information
@jorix
jorix committed Jan 10, 2017
1 parent 61f418f commit 358b187
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 5 deletions.
2 changes: 1 addition & 1 deletion col_names.php
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a:27:{s:14:"aixada_account";a:9:{i:0;s:2:"id";i:1;s:10:"account_id";i:2;s:8:"quantity";i:3;s:17:"payment_method_id";i:4;s:11:"currency_id";i:5;s:11:"description";i:6;s:11:"operator_id";i:7;s:2:"ts";i:8;s:7:"balance";}s:19:"aixada_account_desc";a:4:{i:0;s:2:"id";i:1;s:11:"description";i:2;s:12:"account_type";i:3;s:6:"active";}s:11:"aixada_cart";a:7:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:5:"uf_id";i:3;s:13:"date_for_shop";i:4;s:11:"operator_id";i:5;s:12:"ts_validated";i:6;s:13:"ts_last_saved";}s:15:"aixada_currency";a:3:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:8:"one_euro";}s:15:"aixada_incident";a:11:{i:0;s:2:"id";i:1;s:7:"subject";i:2;s:16:"incident_type_id";i:3;s:11:"operator_id";i:4;s:7:"details";i:5;s:8:"priority";i:6;s:13:"ufs_concerned";i:7;s:20:"commission_concerned";i:8;s:18:"provider_concerned";i:9;s:2:"ts";i:10;s:6:"status";}s:20:"aixada_incident_type";a:3:{i:0;s:2:"id";i:1;s:11:"description";i:2;s:10:"definition";}s:15:"aixada_iva_type";a:4:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:7:"percent";i:3;s:11:"description";}s:13:"aixada_member";a:19:{i:0;s:2:"id";i:1;s:17:"custom_member_ref";i:2;s:5:"uf_id";i:3;s:4:"name";i:4;s:7:"address";i:5;s:3:"nif";i:6;s:3:"zip";i:7;s:4:"city";i:8;s:6:"phone1";i:9;s:6:"phone2";i:10;s:3:"web";i:11;s:9:"bank_name";i:12;s:12:"bank_account";i:13;s:7:"picture";i:14;s:5:"notes";i:15;s:6:"active";i:16;s:11:"participant";i:17;s:5:"adult";i:18;s:2:"ts";}s:12:"aixada_order";a:11:{i:0;s:2:"id";i:1;s:11:"provider_id";i:2;s:14:"date_for_order";i:3;s:11:"ts_sent_off";i:4;s:13:"date_received";i:5;s:13:"date_for_shop";i:6;s:5:"total";i:7;s:5:"notes";i:8;s:15:"revision_status";i:9;s:12:"delivery_ref";i:10;s:11:"payment_ref";}s:17:"aixada_order_item";a:11:{i:0;s:2:"id";i:1;s:5:"uf_id";i:2;s:16:"favorite_cart_id";i:3;s:8:"order_id";i:4;s:16:"unit_price_stamp";i:5;s:11:"iva_percent";i:6;s:15:"rev_tax_percent";i:7;s:14:"date_for_order";i:8;s:10:"product_id";i:9;s:8:"quantity";i:10;s:10:"ts_ordered";}s:20:"aixada_order_to_shop";a:13:{i:0;s:13:"order_item_id";i:1;s:5:"uf_id";i:2;s:8:"order_id";i:3;s:16:"unit_price_stamp";i:4;s:11:"iva_percent";i:5;s:15:"rev_tax_percent";i:6;s:10:"product_id";i:7;s:8:"quantity";i:8;s:7:"arrived";i:9;s:7:"revised";i:10;s:27:"aixada_order_to_shop_ibfk_1";i:11;s:27:"aixada_order_to_shop_ibfk_2";i:12;s:27:"aixada_order_to_shop_ibfk_3";}s:21:"aixada_orderable_type";a:2:{i:0;s:2:"id";i:1;s:11:"description";}s:21:"aixada_payment_method";a:3:{i:0;s:2:"id";i:1;s:11:"description";i:2;s:7:"details";}s:12:"aixada_price";a:4:{i:0;s:10:"product_id";i:1;s:2:"ts";i:2;s:13:"current_price";i:3;s:11:"operator_id";}s:14:"aixada_product";a:22:{i:0;s:2:"id";i:1;s:11:"provider_id";i:2;s:4:"name";i:3;s:11:"description";i:4;s:7:"barcode";i:5;s:18:"custom_product_ref";i:6;s:6:"active";i:7;s:17:"responsible_uf_id";i:8;s:17:"orderable_type_id";i:9;s:18:"order_min_quantity";i:10;s:11:"category_id";i:11;s:15:"rev_tax_type_id";i:12;s:14:"iva_percent_id";i:13;s:10:"unit_price";i:14;s:21:"unit_measure_order_id";i:15;s:20:"unit_measure_shop_id";i:16;s:9:"stock_min";i:17;s:12:"stock_actual";i:18;s:11:"delta_stock";i:19;s:15:"description_url";i:20;s:7:"picture";i:21;s:2:"ts";}s:23:"aixada_product_category";a:2:{i:0;s:2:"id";i:1;s:11:"description";}s:33:"aixada_product_orderable_for_date";a:4:{i:0;s:2:"id";i:1;s:10:"product_id";i:2;s:14:"date_for_order";i:3;s:12:"closing_date";}s:15:"aixada_provider";a:20:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:7:"contact";i:3;s:7:"address";i:4;s:3:"nif";i:5;s:3:"zip";i:6;s:4:"city";i:7;s:6:"phone1";i:8;s:6:"phone2";i:9;s:3:"fax";i:10;s:5:"email";i:11;s:3:"web";i:12;s:9:"bank_name";i:13;s:12:"bank_account";i:14;s:7:"picture";i:15;s:5:"notes";i:16;s:6:"active";i:17;s:17:"responsible_uf_id";i:18;s:18:"offset_order_close";i:19;s:2:"ts";}s:19:"aixada_rev_tax_type";a:4:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:11:"description";i:3;s:15:"rev_tax_percent";}s:16:"aixada_shop_item";a:8:{i:0;s:2:"id";i:1;s:7:"cart_id";i:2;s:13:"order_item_id";i:3;s:16:"unit_price_stamp";i:4;s:10:"product_id";i:5;s:8:"quantity";i:6;s:11:"iva_percent";i:7;s:15:"rev_tax_percent";}s:21:"aixada_stock_movement";a:8:{i:0;s:2:"id";i:1;s:10:"product_id";i:2;s:11:"operator_id";i:3;s:16:"movement_type_id";i:4;s:17:"amount_difference";i:5;s:11:"description";i:6;s:16:"resulting_amount";i:7;s:2:"ts";}s:26:"aixada_stock_movement_type";a:3:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:11:"description";}s:9:"aixada_uf";a:5:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:6:"active";i:3;s:7:"created";i:4;s:9:"mentor_uf";}s:19:"aixada_unit_measure";a:3:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:4:"unit";}s:11:"aixada_user";a:12:{i:0;s:2:"id";i:1;s:5:"login";i:2;s:8:"password";i:3;s:5:"email";i:4;s:5:"uf_id";i:5;s:9:"member_id";i:6;s:11:"provider_id";i:7;s:8:"language";i:8;s:9:"gui_theme";i:9;s:18:"last_login_attempt";i:10;s:21:"last_successful_login";i:11;s:10:"created_on";}s:16:"aixada_user_role";a:2:{i:0;s:7:"user_id";i:1;s:4:"role";}s:14:"aixada_version";a:3:{i:0;s:2:"id";i:1;s:11:"module_name";i:2;s:7:"version";}}
a:27:{s:14:"aixada_account";a:9:{i:0;s:2:"id";i:1;s:10:"account_id";i:2;s:8:"quantity";i:3;s:17:"payment_method_id";i:4;s:11:"currency_id";i:5;s:11:"description";i:6;s:11:"operator_id";i:7;s:2:"ts";i:8;s:7:"balance";}s:19:"aixada_account_desc";a:4:{i:0;s:2:"id";i:1;s:11:"description";i:2;s:12:"account_type";i:3;s:6:"active";}s:11:"aixada_cart";a:7:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:5:"uf_id";i:3;s:13:"date_for_shop";i:4;s:11:"operator_id";i:5;s:12:"ts_validated";i:6;s:13:"ts_last_saved";}s:15:"aixada_currency";a:3:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:8:"one_euro";}s:15:"aixada_incident";a:11:{i:0;s:2:"id";i:1;s:7:"subject";i:2;s:16:"incident_type_id";i:3;s:11:"operator_id";i:4;s:7:"details";i:5;s:8:"priority";i:6;s:13:"ufs_concerned";i:7;s:20:"commission_concerned";i:8;s:18:"provider_concerned";i:9;s:2:"ts";i:10;s:6:"status";}s:20:"aixada_incident_type";a:3:{i:0;s:2:"id";i:1;s:11:"description";i:2;s:10:"definition";}s:15:"aixada_iva_type";a:4:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:7:"percent";i:3;s:11:"description";}s:13:"aixada_member";a:19:{i:0;s:2:"id";i:1;s:17:"custom_member_ref";i:2;s:5:"uf_id";i:3;s:4:"name";i:4;s:7:"address";i:5;s:3:"nif";i:6;s:3:"zip";i:7;s:4:"city";i:8;s:6:"phone1";i:9;s:6:"phone2";i:10;s:3:"web";i:11;s:9:"bank_name";i:12;s:12:"bank_account";i:13;s:7:"picture";i:14;s:5:"notes";i:15;s:6:"active";i:16;s:11:"participant";i:17;s:5:"adult";i:18;s:2:"ts";}s:12:"aixada_order";a:11:{i:0;s:2:"id";i:1;s:11:"provider_id";i:2;s:14:"date_for_order";i:3;s:11:"ts_sent_off";i:4;s:13:"date_received";i:5;s:13:"date_for_shop";i:6;s:5:"total";i:7;s:5:"notes";i:8;s:15:"revision_status";i:9;s:12:"delivery_ref";i:10;s:11:"payment_ref";}s:17:"aixada_order_item";a:12:{i:0;s:2:"id";i:1;s:5:"uf_id";i:2;s:16:"favorite_cart_id";i:3;s:8:"order_id";i:4;s:16:"unit_price_stamp";i:5;s:11:"iva_percent";i:6;s:15:"rev_tax_percent";i:7;s:14:"date_for_order";i:8;s:10:"product_id";i:9;s:8:"quantity";i:10;s:5:"notes";i:11;s:10:"ts_ordered";}s:20:"aixada_order_to_shop";a:13:{i:0;s:13:"order_item_id";i:1;s:5:"uf_id";i:2;s:8:"order_id";i:3;s:16:"unit_price_stamp";i:4;s:11:"iva_percent";i:5;s:15:"rev_tax_percent";i:6;s:10:"product_id";i:7;s:8:"quantity";i:8;s:7:"arrived";i:9;s:7:"revised";i:10;s:27:"aixada_order_to_shop_ibfk_1";i:11;s:27:"aixada_order_to_shop_ibfk_2";i:12;s:27:"aixada_order_to_shop_ibfk_3";}s:21:"aixada_orderable_type";a:2:{i:0;s:2:"id";i:1;s:11:"description";}s:21:"aixada_payment_method";a:3:{i:0;s:2:"id";i:1;s:11:"description";i:2;s:7:"details";}s:12:"aixada_price";a:4:{i:0;s:10:"product_id";i:1;s:2:"ts";i:2;s:13:"current_price";i:3;s:11:"operator_id";}s:14:"aixada_product";a:22:{i:0;s:2:"id";i:1;s:11:"provider_id";i:2;s:4:"name";i:3;s:11:"description";i:4;s:7:"barcode";i:5;s:18:"custom_product_ref";i:6;s:6:"active";i:7;s:17:"responsible_uf_id";i:8;s:17:"orderable_type_id";i:9;s:18:"order_min_quantity";i:10;s:11:"category_id";i:11;s:15:"rev_tax_type_id";i:12;s:14:"iva_percent_id";i:13;s:10:"unit_price";i:14;s:21:"unit_measure_order_id";i:15;s:20:"unit_measure_shop_id";i:16;s:9:"stock_min";i:17;s:12:"stock_actual";i:18;s:11:"delta_stock";i:19;s:15:"description_url";i:20;s:7:"picture";i:21;s:2:"ts";}s:23:"aixada_product_category";a:2:{i:0;s:2:"id";i:1;s:11:"description";}s:33:"aixada_product_orderable_for_date";a:4:{i:0;s:2:"id";i:1;s:10:"product_id";i:2;s:14:"date_for_order";i:3;s:12:"closing_date";}s:15:"aixada_provider";a:22:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:7:"contact";i:3;s:7:"address";i:4;s:3:"nif";i:5;s:3:"zip";i:6;s:4:"city";i:7;s:6:"phone1";i:8;s:6:"phone2";i:9;s:3:"fax";i:10;s:5:"email";i:11;s:3:"web";i:12;s:9:"bank_name";i:13;s:12:"bank_account";i:14;s:7:"picture";i:15;s:5:"notes";i:16;s:6:"active";i:17;s:17:"responsible_uf_id";i:18;s:18:"offset_order_close";i:19;s:17:"order_send_format";i:20;s:17:"order_send_prices";i:21;s:2:"ts";}s:19:"aixada_rev_tax_type";a:4:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:11:"description";i:3;s:15:"rev_tax_percent";}s:16:"aixada_shop_item";a:8:{i:0;s:2:"id";i:1;s:7:"cart_id";i:2;s:13:"order_item_id";i:3;s:16:"unit_price_stamp";i:4;s:10:"product_id";i:5;s:8:"quantity";i:6;s:11:"iva_percent";i:7;s:15:"rev_tax_percent";}s:21:"aixada_stock_movement";a:8:{i:0;s:2:"id";i:1;s:10:"product_id";i:2;s:11:"operator_id";i:3;s:16:"movement_type_id";i:4;s:17:"amount_difference";i:5;s:11:"description";i:6;s:16:"resulting_amount";i:7;s:2:"ts";}s:26:"aixada_stock_movement_type";a:3:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:11:"description";}s:9:"aixada_uf";a:5:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:6:"active";i:3;s:7:"created";i:4;s:9:"mentor_uf";}s:19:"aixada_unit_measure";a:3:{i:0;s:2:"id";i:1;s:4:"name";i:2;s:4:"unit";}s:11:"aixada_user";a:12:{i:0;s:2:"id";i:1;s:5:"login";i:2;s:8:"password";i:3;s:5:"email";i:4;s:5:"uf_id";i:5;s:9:"member_id";i:6;s:11:"provider_id";i:7;s:8:"language";i:8;s:9:"gui_theme";i:9;s:18:"last_login_attempt";i:10;s:21:"last_successful_login";i:11;s:10:"created_on";}s:16:"aixada_user_role";a:2:{i:0;s:7:"user_id";i:1;s:4:"role";}s:14:"aixada_version";a:3:{i:0;s:2:"id";i:1;s:11:"module_name";i:2;s:7:"version";}}
4 changes: 2 additions & 2 deletions make_canned_responses.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class canned_table_manager {
require 'local_config/lang/' . $language . '.php';


$rs = $db->Execute('SHOW TABLES');
$rs = $db->Execute("SHOW TABLES LIKE 'aixada_%'");
while ($row = $rs->fetch_array()) {
$current_table = $row[0];
$tables[] = $current_table;
Expand Down Expand Up @@ -139,7 +139,7 @@ function make_canned_queries()
$strSQL = "delimiter |\n\n";

global $db;
$rs = $db->Execute('SHOW TABLES');
$rs = $db->Execute("SHOW TABLES LIKE 'aixada_%'");
while ($row = $rs->fetch_array()) {
$tables[] = $row[0];
}
Expand Down
53 changes: 53 additions & 0 deletions manage_providers.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ function reloadWhat(){
rowComplete : function (rowIndex, row){
setCheckBoxes('#frm_provider_edit');
populateSelect(gProviderSelects,'#tbl_provider_edit');
refreshSelectValue('#tbl_provider_edit .sOrderSendFormat');
refreshSelectValue('#tbl_provider_edit .sOrderSendPrices');
}

});
Expand Down Expand Up @@ -394,6 +396,8 @@ function prepareProviderForm(){

//construct the responsible uf select
populateSelect(gProviderSelects,'#tbl_provider_new');
setSelectValue('#tbl_provider_edit .sOrderSendFormat', 'default');
setSelectValue('#tbl_provider_edit .sOrderSendPrices', 'default');

//new providers have no id
$('#tbl_provider_new input[name=id]').remove();
Expand Down Expand Up @@ -1263,6 +1267,20 @@ function loadSelectHTML(urlStr, destination){
})
}

function setSelectValue(destination, value) {
$(destination).prev().val(value);
refreshSelectValue(destination);
}

function refreshSelectValue(destination) {
var selValue = $(destination).prev().val();
if (selValue == ''){
var selValue = $(destination).children('select:first').val();
$(destination).prev().attr('value',selValue);
} else {
$(destination).children('select').val(selValue).attr('selected','selected');
}
}

function manageEditStockBtn(){
//since the whole product form runs through the xml2html class
Expand Down Expand Up @@ -1939,6 +1957,41 @@ function exportProducts(){
<td></td>
<td></td>
</tr>
<tr>
<td><label for="order_send_format"><?php echo '=order_send_format'; ?></label></td>
<td>
<input type="hidden" name="order_send_format" value="{order_send_format}"/>
<span class="textAlignLeft sOrderSendFormat">
<select>
<option value="default"><?='=default';?></option>
<option value="Prod"><?='Prod';?></option>
<option value="Matrix"><?='Matrix';?></option>
<option value="Prod_Matrix"><?='Prod_Matrix';?></option>
<option value="ProdUf"><?='ProdUf';?></option>
<option value="Prod_ProdUf"><?='Prod_ProdUf';?></option>
<option value="UfProd"><?='UfProd';?></option>
</select>
</span>
</td>
<td></td>
<td></td>
</tr>
<tr>
<td colspan=""><label for="order_send_prices"><?php echo '=order_send_prices'; ?></label></td>
<td>
<input type="hidden" name="order_send_prices" value="{order_send_prices}"/>
<span class="textAlignLeft sOrderSendPrices">
<select>
<option value="default"><?='=default';?></option>
<option value="cost_amount"><?='=cost_amount';?></option>
<option value="cost"><?='=cost';?></option>
<option value="none"><?='=none';?></option>
</select>
</span>
</td>
<td></td>
<td></td>
</tr>
</tbody>
<tfoot>
<tr>
Expand Down
2 changes: 2 additions & 0 deletions sql/aixada.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ create table aixada_provider (
active tinyint default 1,
responsible_uf_id int default null,
offset_order_close int default 4, /* default offset closing of order in days*/
order_send_format varchar(25) default 'default',
order_send_prices varchar(15) default 'default'
ts timestamp not null default current_timestamp,
primary key (id),
key (active),
Expand Down
15 changes: 15 additions & 0 deletions sql/dbUpgradeTo2.8.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,21 @@ IF NOT EXISTS (
'> ALTER aixada_order_item ADD notes', '2.8');
END IF;

IF NOT EXISTS (
SELECT * FROM information_schema.columns WHERE table_schema = DATABASE()
AND table_name ='aixada_provider'
AND column_name = 'order_send_format'
) THEN
ALTER TABLE aixada_provider ADD COLUMN
order_send_format varchar(25) default 'default'
AFTER offset_order_close;
ALTER TABLE aixada_provider ADD COLUMN
order_send_prices varchar(15) default 'default'
AFTER order_send_format;
insert into aixada_version (module_name, version) values (
'> ALTER aixada_provider ADD order_send_format and order_send_prices', '2.8');
END IF;

insert into aixada_version (module_name, version) values (
CONCAT('END dbUpdate_280_c02: ', SYSDATE()), '2.8');

Expand Down
3 changes: 3 additions & 0 deletions sql/queries/canned_queries.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ begin
aixada_order_item.product_id,
aixada_product.name as product,
aixada_order_item.quantity,
aixada_order_item.notes,
aixada_order_item.ts_ordered
from aixada_order_item
left join aixada_uf as aixada_uf on aixada_order_item.uf_id=aixada_uf.id
Expand Down Expand Up @@ -443,6 +444,8 @@ begin
aixada_uf.id as responsible_uf_id,
aixada_uf.name as responsible_uf_name,
aixada_provider.offset_order_close,
aixada_provider.order_send_format,
aixada_provider.order_send_prices,
aixada_provider.ts
from aixada_provider
left join aixada_uf as aixada_uf on aixada_provider.responsible_uf_id=aixada_uf.id";
Expand Down
13 changes: 11 additions & 2 deletions sql/setup/aixada_queries_all.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ begin
p.id,
p.name,
p.description,
p.orderable_type_id,
c.id as cart_id,
c.date_for_shop,
c.ts_last_saved,
Expand Down Expand Up @@ -359,7 +360,9 @@ begin
p.id,
p.name,
p.description,
p.orderable_type_id,
oi.quantity as quantity,
oi.notes,
oi.favorite_cart_id,
oi.order_id,
oi.unit_price_stamp as unit_price,
Expand Down Expand Up @@ -883,7 +886,8 @@ begin
set @q = concat("select
oi.*,
p.name,
p.provider_id,
p.provider_id,
p.orderable_type_id,
1 as arrived,
0 as revised,
si.quantity as shop_quantity
Expand All @@ -906,6 +910,7 @@ begin
oi.*,
p.name,
p.provider_id,
p.orderable_type_id,
1 as arrived,
0 as revised,
si.quantity as shop_quantity
Expand All @@ -921,7 +926,7 @@ begin
and p.provider_id = ",the_provider_id,"
", wherec ,"
order by
oi.product_id;");
oi.product_id;");

end if;

Expand Down Expand Up @@ -2359,6 +2364,7 @@ begin
/** no date provided we assume that we are shopping, i.e. all active products are shown stock + orderable **/
if the_date = 0 then
set wherec = concat(wherec, " and p.unit_measure_shop_id = u.id ");
set wherec = concat(wherec, " and p.orderable_type_id <> 3 "); /* Exclude product as order notes */

/** hack: date=-1 works to filter stock only products **/
elseif the_date = '1234-01-01' then
Expand Down Expand Up @@ -5016,6 +5022,7 @@ begin
aixada_order_item.product_id,
aixada_product.name as product,
aixada_order_item.quantity,
aixada_order_item.notes,
aixada_order_item.ts_ordered
from aixada_order_item
left join aixada_uf as aixada_uf on aixada_order_item.uf_id=aixada_uf.id
Expand Down Expand Up @@ -5226,6 +5233,8 @@ begin
aixada_uf.id as responsible_uf_id,
aixada_uf.name as responsible_uf_name,
aixada_provider.offset_order_close,
aixada_provider.order_send_format,
aixada_provider.order_send_prices,
aixada_provider.ts
from aixada_provider
left join aixada_uf as aixada_uf on aixada_provider.responsible_uf_id=aixada_uf.id";
Expand Down

0 comments on commit 358b187

Please sign in to comment.