git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflit modified changes

Browse Source
This commit is contained in:
EikhantMon
2018-05-25 17:44:36 +06:30
parent 1ae55f1af2 578c14ccc3
commit 7ddbd7d78a
11 changed files with 584 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/controllers/oqs/print_controller.rb
View File

@@ -4,32 +4,26 @@ class Oqs::PrintController < ApplicationController
def print
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
printer = PrintSetting.all
unique_code="OrderItemPdf"
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_item_slim|
if order_item_slim[0] == 'OrderSlimPdf'
if order_item_slim[1] == '1'
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderItemPdf'
unique_code="OrderItemPdf"
elsif printer_setting.unique_code == 'OrderItemSlimPdf'
unique_code="OrderItemSlimPdf"
else
unique_code="OrderItemPdf"
end
elsif order_item_slim[0] == 'OrderSetPdf'
if order_item_slim[1] == '1'
elsif printer_setting.unique_code == 'OrderSetItemPdf'
unique_code="OrderSetItemPdf"
else
unique_code="OrderItemPdf"
end
elsif order_item_slim[0] == 'OrderSlimCustomisePdf'
if order_item_slim[1] == '1'
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf"
else
unique_code="OrderItemPdf"
end
end
end
end
end
end
assigned_item_id = params[:id]
options = params[:options]
assigned_item = AssignedOrderItem.find(assigned_item_id)
@@ -59,28 +53,23 @@ class Oqs::PrintController < ApplicationController
def print_order_summary
if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf
printer = PrintSetting.all
unique_code="OrderSummaryPdf"
if !order_slim_pdf.empty?
order_slim_pdf.each do |order_summary_slim|
if order_summary_slim[0] == 'OrderSlimPdf'
if order_summary_slim[1] == '1'
if !printer.empty?
printer.each do |printer_setting|
if printer_setting.unique_code == 'OrderSummaryPdf'
unique_code="OrderSummaryPdf"
elsif printer_setting.unique_code == 'OrderSummarySlimPdf'
unique_code="OrderSummarySlimPdf"
else
unique_code="OrderSummaryPdf"
end
elsif order_summary_slim[0] == 'OrderSetPdf'
if order_summary_slim[1] == '1'
elsif printer_setting.unique_code == 'OrderSummarySetPdf'
unique_code="OrderSummarySetPdf"
else
unique_code="OrderSummaryPdf"
end
elsif order_summary_slim[0] == 'OrderSlimCustomisePdf'
if order_summary_slim[1] == '1'
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
unique_code="OrderSummaryCustomisePdf"
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
unique_code="OrderSummarySlimCustomisePdf"
else
unique_code="OrderSummaryPdf"
end
end
end
end
end
end