diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 135a6469..58c6727a 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -209,18 +209,18 @@ class ReceiptBillPdf < Prawn::Document product_name = item.product_name - if item.status = 'promotion' && (item.remark =='promotion nett price' || item.remark == 'promotion discount') - sub_total += -item.price #(item.qty*item.unit_price) - comment for room charges - qty = -item.qty - total_price = -item.price #item.qty*item.unit_price - comment for room charges - price = -item.unit_price - else + # if item.status = 'promotion' && (item.remark =='promotion nett price' || item.remark == 'promotion discount') + # sub_total += -item.price #(item.qty*item.unit_price) - comment for room charges + # qty = -item.qty + # total_price = -item.price #item.qty*item.unit_price - comment for room charges + # price = -item.unit_price + # else sub_total += item.price #(item.qty*item.unit_price) - comment for room charges qty = item.qty total_price = item.price #item.qty*item.unit_price - comment for room charges price = item.unit_price - end + # end if !show_price.nil? && show_price.value.to_i>0 diff --git a/db/sym_master.sql b/db/sym_master.sql index 60b5e6f5..3677fc2f 100755 --- a/db/sym_master.sql +++ b/db/sym_master.sql @@ -825,55 +825,6 @@ delete from sym_node; values('order_queue_stations','sx_2_cloud', 200, current_timestamp, current_timestamp); # End Oqs Channel -### Batch Monitoring ###### - -#Monitor# -insert into sym_monitor (monitor_id, node_group_id, external_id, type, threshold, run_period, run_count, severity_level, enabled, create_time, last_update_by, last_update_time) -value ('SystemBatchErrorMonitor', 'All', 'All', 'batchError', 1, 1, 1, 300, 1, now(), 'admin', now()); - -insert into sym_monitor (monitor_id, node_group_id, external_id, type, threshold, run_period, run_count, severity_level, enabled, create_time, last_update_by, last_update_time) -value ('SystemBatchUnsendMonitor', 'All', 'All', 'batchUnsent', 10, 1, 1, 100, 1, now(), 'admin', now()); - -insert into sym_monitor (monitor_id, node_group_id, external_id, type, threshold, run_period, run_count, severity_level, enabled, create_time, last_update_by, last_update_time) -value ('SystemLogMonitor', 'All', 'All', 'log', 1, 1, 1, 300, 1, now(), 'admin', now()); - -#Parameter# -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.allow.untrusted.cert', 'true', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.auth', 'true', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.from', 'sym_alert@smartsales.asia', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.host', 'smtp.mailgun.org', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.password', '1cc051ec3edf699d17b78e5cd14ceb6b', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.port', '465', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.starttls', 'false', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.transport', 'smtps', now(), 'admin', now()); - -insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) -value ('All', 'All', 'smtp.user', 'postmaster@smartsales.asia', now(), 'admin', now()); - -insert into sym_notification (notification_id, node_group_id, external_id, severity_level, type, expression, enabled, create_time, last_update_by, last_update_time) -value ('notify_info', 'ALL', 'ALL', 100, 'email', 'info@connect.smartsales.asia', 1, now(), 'admin', now()); - -insert into sym_notification (notification_id, node_group_id, external_id, severity_level, type, expression, enabled, create_time, last_update_by, last_update_time) -value ('notify_severe', 'ALL', 'ALL', 300, 'email', 'info@connect.smartsales.asia', 1, now(), 'admin', now()); - - - -### End of Batch Monitoring #### insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) values ('000','sx','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000');