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

conflict data

Browse Source
This commit is contained in:
phyusin
2018-05-28 10:46:04 +06:30
parent 597bab756f 7ddbd7d78a
commit c4cefb05ae
8 changed files with 347 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/orders_controller.rb
View File

@@ -242,6 +242,8 @@ class Api::OrdersController < Api::ApiController
unique_code="OrderItemSlimPdf"
elsif printer_setting.unique_code == 'OrderSetItemPdf'
unique_code="OrderSetItemPdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemCustomisePdf'
unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'

2
app/controllers/oqs/edit_controller.rb
View File

@@ -63,6 +63,8 @@ class Oqs::EditController < BaseOqsController
unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
unique_code="OrderSetItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf"
end
end
end

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

@@ -19,6 +19,8 @@ class Oqs::PrintController < ApplicationController
unique_code="OrderItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf'
unique_code="OrderSetItemCustomisePdf"
elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf'
unique_code="OrderItemSlimCustomisePdf"
end
end
end
@@ -67,7 +69,9 @@ class Oqs::PrintController < ApplicationController
elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf'
unique_code="OrderSummaryCustomisePdf"
elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf'
unique_code="OrderSummarySetCustomisePdf"
unique_code="OrderSummarySetCustomisePdf"
elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf'
unique_code="OrderSummarySlimCustomisePdf"
end
end
end