diff --git a/Gemfile b/Gemfile index 63dfa163..73701b6c 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.1.0' #gem 'mysql2', '>= 0.3.18', '< 0.5' gem 'pg' -gem 'mysql2', '>= 0.3.18', '< 0.5' +gem 'mysql2' #Use PosgreSQL @@ -41,12 +41,13 @@ gem 'rack-cors' # image upload gem 'carrierwave', '~> 1.0' gem 'mini_magick' -gem 'jquery-fileupload-rails' +gem 'jquery-fileupload-rails', '~> 0.4.7' #Report and Printing gems gem 'cups' gem 'prawn' gem 'prawn-table' +gem 'prawn-qrcode' gem 'to_xls-rails' gem 'rubyzip', '= 1.0.0' gem 'axlsx', '= 2.0.1' diff --git a/Gemfile.lock b/Gemfile.lock index a983f5c1..0db34edf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,88 +1,92 @@ GIT remote: https://github.com/capistrano/rbenv.git - revision: c029e4128e4a8f25adda35795f5729bd4f62e51f + revision: b8807f3bbb3f424ac42cc8838a38822e028d0aa3 specs: - capistrano-rbenv (2.1.3) + capistrano-rbenv (2.1.4) capistrano (~> 3.1) sshkit (~> 1.3) GEM remote: https://rubygems.org/ specs: - actioncable (5.1.4) - actionpack (= 5.1.4) + actioncable (5.1.7) + actionpack (= 5.1.7) nio4r (~> 2.0) websocket-driver (~> 0.6.1) - actionmailer (5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) + actionmailer (5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.1.4) - actionview (= 5.1.4) - activesupport (= 5.1.4) + actionpack (5.1.7) + actionview (= 5.1.7) + activesupport (= 5.1.7) rack (~> 2.0) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.1.4) - activesupport (= 5.1.4) + actionview (5.1.7) + activesupport (= 5.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.1.4) - activesupport (= 5.1.4) + activejob (5.1.7) + activesupport (= 5.1.7) globalid (>= 0.3.6) - activemodel (5.1.4) - activesupport (= 5.1.4) - activerecord (5.1.4) - activemodel (= 5.1.4) - activesupport (= 5.1.4) + activemodel (5.1.7) + activesupport (= 5.1.7) + activerecord (5.1.7) + activemodel (= 5.1.7) + activesupport (= 5.1.7) arel (~> 8.0) - activesupport (5.1.4) + activesupport (5.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (~> 0.7) + i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) aescrypt (1.0.0) - airbrussh (1.3.0) + airbrussh (1.4.0) sshkit (>= 1.6.1, != 1.7.0) arel (8.0.0) axlsx (2.0.1) htmlentities (~> 4.3.1) nokogiri (>= 1.4.1) rubyzip (~> 1.0.0) - axlsx_rails (0.5.1) + axlsx_rails (0.5.2) actionpack (>= 3.1) axlsx (>= 2.0.1) - bcrypt (3.1.11) - bindex (0.5.0) + bcrypt (3.1.13) + bindex (0.8.1) builder (3.2.3) - byebug (9.1.0) + byebug (11.0.1) cancancan (1.17.0) capistrano (3.10.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + capistrano-bundler (1.6.0) capistrano (~> 3.1) - sshkit (~> 1.2) - capistrano-rails (1.3.1) + capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) +<<<<<<< HEAD capistrano3-puma (3.1.1) capistrano (~> 3.7) capistrano-bundler puma (~> 3.4) carrierwave (1.2.1) +======= + carrierwave (1.3.1) +>>>>>>> b025cc2cfd2b10df84cc1cee458efa4eef108752 activemodel (>= 4.0.0) activesupport (>= 4.0.0) mime-types (>= 1.16) - chartkick (2.2.5) + chartkick (3.2.1) chronic (0.10.2) + chunky_png (1.3.11) coffee-rails (4.2.2) coffee-script (>= 2.2.0) railties (>= 4.0.0) @@ -90,46 +94,45 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) - connection_pool (2.2.1) - crass (1.0.2) + concurrent-ruby (1.1.5) + connection_pool (2.2.2) + crass (1.0.5) cups (0.1.10) - database_cleaner (1.6.2) + database_cleaner (1.7.0) diff-lcs (1.3) - erubi (1.7.0) + erubi (1.9.0) execjs (2.7.0) factory_girl (4.9.0) activesupport (>= 3.0.0) factory_girl_rails (4.9.0) factory_girl (~> 4.9.0) railties (>= 3.0.0) - faker (1.8.4) - i18n (~> 0.5) - ffi (1.9.18) - filterrific (2.1.2) - font-awesome-rails (4.7.0.2) - railties (>= 3.2, < 5.2) - globalid (0.4.1) + faker (2.5.0) + i18n (~> 1.6.0) + ffi (1.11.1) + filterrific (5.2.1) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) + globalid (0.4.2) activesupport (>= 4.2.0) htmlentities (4.3.4) - httparty (0.15.6) + httparty (0.15.7) multi_xml (>= 0.5.2) - i18n (0.9.1) + i18n (1.7.0) concurrent-ruby (~> 1.0) - jbuilder (2.7.0) + jbuilder (2.9.1) activesupport (>= 4.2.0) - multi_json (>= 1.2) jquery-fileupload-rails (0.4.7) actionpack (>= 3.1) railties (>= 3.1) sass (>= 3.2) - jquery-rails (4.3.1) + jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (2.1.0) + json (2.2.0) kaminari (1.0.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.0.1) @@ -145,108 +148,114 @@ GEM listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.1.1) + loofah (2.3.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.7.0) + mail (2.7.1) mini_mime (>= 0.1.1) material_icons (2.2.1) railties (>= 3.2) - method_source (0.9.0) - mime-types (3.1) + method_source (0.9.2) + mime-types (3.3) mime-types-data (~> 3.2015) - mime-types-data (3.2016.0521) - mini_magick (4.8.0) - mini_mime (1.0.0) - mini_portile2 (2.3.0) - minitest (5.10.3) - momentjs-rails (2.17.1) + mime-types-data (3.2019.1009) + mini_magick (4.9.5) + mini_mime (1.0.2) + mini_portile2 (2.4.0) + minitest (5.12.2) + momentjs-rails (2.20.1) railties (>= 3.1) - multi_json (1.12.2) multi_xml (0.6.0) - mysql2 (0.4.10) + mysql2 (0.5.2) nested_form (0.3.2) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.2.0) - nio4r (2.1.0) - nokogiri (1.8.1) - mini_portile2 (~> 2.3.0) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) + nio4r (2.5.2) + nokogiri (1.10.4) + mini_portile2 (~> 2.4.0) pdf-core (0.7.0) - pdfjs_viewer-rails (0.2.0) + pdfjs_viewer-rails (0.3.1) json (> 1.8.4) rails (> 4.2.0) sass-rails (~> 5.0) - pg (0.21.0) + pg (1.1.4) prawn (2.2.2) pdf-core (~> 0.7.0) ttfunk (~> 1.5) + prawn-qrcode (0.4.0) + prawn (>= 1) + rqrcode (>= 1.0.0) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) - puma (3.10.0) - rack (2.0.3) - rack-cors (1.0.2) - rack-protection (2.0.0) + puma (3.12.1) + rack (2.0.7) + rack-cors (1.0.3) + rack-protection (2.0.7) rack - rack-test (0.7.0) + rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.1.4) - actioncable (= 5.1.4) - actionmailer (= 5.1.4) - actionpack (= 5.1.4) - actionview (= 5.1.4) - activejob (= 5.1.4) - activemodel (= 5.1.4) - activerecord (= 5.1.4) - activesupport (= 5.1.4) + rails (5.1.7) + actioncable (= 5.1.7) + actionmailer (= 5.1.7) + actionpack (= 5.1.7) + actionview (= 5.1.7) + activejob (= 5.1.7) + activemodel (= 5.1.7) + activerecord (= 5.1.7) + activesupport (= 5.1.7) bundler (>= 1.3.0) - railties (= 5.1.4) + railties (= 5.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.3) - loofah (~> 2.0) - railties (5.1.4) - actionpack (= 5.1.4) - activesupport (= 5.1.4) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.1.7) + actionpack (= 5.1.7) + activesupport (= 5.1.7) method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.2.1) - rb-fsevent (0.10.2) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) + rake (13.0.0) + rb-fsevent (0.10.3) + rb-inotify (0.10.0) + ffi (~> 1.0) redis (3.3.5) roo (1.13.2) nokogiri rubyzip spreadsheet (> 0.6.4) - rspec-core (3.7.0) - rspec-support (~> 3.7.0) - rspec-expectations (3.7.0) + rqrcode (1.1.1) + chunky_png (~> 1.0) + rqrcode_core (~> 0.1.0) + rqrcode_core (0.1.0) + rspec-core (3.8.2) + rspec-support (~> 3.8.0) + rspec-expectations (3.8.5) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-mocks (3.7.0) + rspec-support (~> 3.8.0) + rspec-mocks (3.8.2) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.7.0) - rspec-rails (3.7.1) + rspec-support (~> 3.9.0) + rspec-rails (3.9.0) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.7.0) - rspec-expectations (~> 3.7.0) - rspec-mocks (~> 3.7.0) - rspec-support (~> 3.7.0) - rspec-support (3.7.0) - ruby-ole (1.2.12.1) + rspec-core (~> 3.8.0) + rspec-expectations (~> 3.8.0) + rspec-mocks (~> 3.8.0) + rspec-support (~> 3.8.0) + rspec-support (3.8.3) + ruby-ole (1.2.12.2) rubyzip (1.0.0) - sass (3.5.3) + sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sass-rails (5.0.6) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) @@ -254,57 +263,57 @@ GEM tilt (>= 1.1, < 3) schema_to_scaffold (0.8.0) activesupport (>= 3.2.1) - shoulda-matchers (3.1.2) + shoulda-matchers (3.1.3) activesupport (>= 4.0.0) - sidekiq (5.0.5) - concurrent-ruby (~> 1.0) - connection_pool (~> 2.2, >= 2.2.0) + sidekiq (5.2.7) + connection_pool (~> 2.2, >= 2.2.2) + rack (>= 1.5.0) rack-protection (>= 1.5.0) - redis (>= 3.3.4, < 5) - simple_form (3.5.0) - actionpack (> 4, < 5.2) - activemodel (> 4, < 5.2) - spreadsheet (1.1.4) + redis (>= 3.3.5, < 5) + simple_form (5.0.1) + actionpack (>= 5.0) + activemodel (>= 5.0) + spreadsheet (1.2.4) ruby-ole (>= 1.0) spring (2.0.2) activesupport (>= 4.2) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) spring (>= 1.2, < 3.0) - sprockets (3.7.1) + sprockets (3.7.2) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.1) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.15.1) + sshkit (1.20.0) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) tether-rails (1.4.0) rails (>= 3.1) - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.8) + tilt (2.0.10) to_xls-rails (1.3.1) spreadsheet (>= 0.8.5) ttfunk (1.5.1) - turbolinks (5.0.1) - turbolinks-source (~> 5) - turbolinks-source (5.0.3) - tzinfo (1.2.4) + turbolinks (5.2.1) + turbolinks-source (~> 5.2) + turbolinks-source (5.2.0) + tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (3.2.0) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) - web-console (3.5.1) + web-console (3.7.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) railties (>= 5.0) websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - whenever (0.9.7) + websocket-extensions (0.1.4) + whenever (1.0.0) chronic (>= 0.6.3) PLATFORMS @@ -333,7 +342,7 @@ DEPENDENCIES font-awesome-rails (~> 4.7, >= 4.7.0.2) httparty (~> 0.15.5) jbuilder (~> 2.5) - jquery-fileupload-rails + jquery-fileupload-rails (~> 0.4.7) jquery-rails jquery-ui-rails kaminari (~> 1.0.1) @@ -341,11 +350,12 @@ DEPENDENCIES material_icons mini_magick momentjs-rails - mysql2 (>= 0.3.18, < 0.5) + mysql2 nested_form pdfjs_viewer-rails pg prawn + prawn-qrcode prawn-table puma (~> 3.0) rack-cors @@ -370,7 +380,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 2.4.1p111 + ruby 2.3.1p112 BUNDLED WITH 2.0.2 diff --git a/README.md b/README.md index 0621cc43..4d81b144 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Osaka => Campaign Id => {"campaign_type_id": 5} BITP - Auth Token => pZBHXEFbGNj/G => New => V3 + Auth Token => pZBHXEFbGNj/G => New => V3 iua0SjUHzRaQw => rj0MJ0XI5GsKZehE => Old => V2 => code2lab => Old @@ -34,11 +34,11 @@ Person and Extra Time 2) must create Adult and Child in settings/item_attributes 3) must be PSA_[a-z/0-9] for Adult and PSC_[a-z/0-9] for Child in settings/menu_categories/[cat_id]/simple_menu_items 3) must be PSAI_[a-z/0-9] for Adult and PSCI_[a-z/0-9] for Child in settings/simple_menu_items/[item_id]/menu_item_instances - -For Extra Time - item_instance_code + +For Extra Time + item_instance_code * must start with 'Ext'[a..z]'_'[1..100] - * note : don't add character after '_' + * note : don't add character after '_' For Order Printing 1)) ********* Order Pdf ********* @@ -50,18 +50,18 @@ For Order Printing 1) settings/print_settings (a) Unique Code => OrderSetItemPdf & OrderSummarySetPdf (b) Font is present => {Header font size:11, Item Font Size:9} - Font is blank => {Header font size:12, Item Font Size:10} + Font is blank => {Header font size:12, Item Font Size:10} 3)) ********* Order Slim Pdf ********* 1) settings/print_settings (a) Unique Code => OrderItemSlimPdf & OrderSummarySlimPdf (b) Font is present => {Header font size:11, Item Font Size:9} Font is blank => {Header font size:12, Item Font Size:10} 4)) ********* Order Customise PDF ********* - 1) settings/print_settings + 1) settings/print_settings (a) Unique Code => OrderItemCustomisePdf & OrderSummaryCustomisePdf - (b) Can change Header font size and Item Font Size as you like + (b) Can change Header font size and Item Font Size as you like 5)) ********* Order Set Pdf ********* - 1) settings/print_settings + 1) settings/print_settings (a) Unique Code => OrderSetItemCustomisePdf & OrderSummarySetCustomisePdf (b) Can change Header font size and Item Font Size as you like 6)) ********* Order Slim Customise PDF @@ -82,6 +82,23 @@ For ReceiptBillA5Pdf For ReceiptBillAltName options 1) settings/lookups => { type:print_settings, name:ReceiptBillAltName, value:1 } +For Using Star Printer + *** Need to change these print settings + 1) settings/print_settings/unique_code => OrderItemStarPdf + 2) settings/print_settings/unique_code => ReceiptBillStarPdf + 3) settings/print_settings/unique_code => SaleItemsStarPdf + *** Other print settings aren't need to change. + +For Show Sale Items Summary at CloseCashierPrint + 1) settings/print_settings + a) Check => Shift Sale Items + +For Show/Hide AddOrder Button in QuickService + 1) settings/lookups => {type:quickservice_add_order, name: QuickServiceAddOrder, value:1 OR 0} + +For Show Print Button in ReceiptNo Report + 1) settings/lookups => {type:reprint_receipt, name: Reprint Receipt in Report, value:1} + For Bank Integration setting 1) rake db:migrate for card_sale_trans, card_settle_trans 2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 } @@ -100,20 +117,20 @@ For call waiter pdf i) Name : Calling Waiter ii) Unique Code: CallWaiterPdf iii)Template: ... - iv) Font: Zawgyi-One + iv) Font: Zawgyi-One v) Printer: #printer name Membership Actions SQL * update membership_actions set additional_parameter='{\"campaign_type_id\":5}' where id=10; SQL Update after rake clear:data runned - * update seed_generators + * update seed_generators i) TableBooking, Order, OrderItem, sale, SaleOrder, SaleItem, SaleTax, SalePayment, SaleAudit, AssignedOrderItem => { current:0, next:0 } - ** Note :: do not update Customer + ** Note :: do not update Customer Change type in mysql *run if you got font error for Myanmar, Chinese, etc... - => ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table + => ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table => ALTER DATABASE [database_name] CHARACTER SET utf8 COLLATE utf8_unicode_ci #for database For split bill @@ -124,9 +141,9 @@ For Sidekiq => Create New Lookups => lookup_type = sidekiq, Name = sidekiq , Value = 1 or 0 For Clear Menu - 1) rake clear:menu # menu,menu item,menu category,menu item instance,account,item option,item attribute,item set - -For Check CUp status + 1) rake clear:menu # menu,menu item,menu category,menu item instance,account,item option,item attribute,item set + +For Check CUp status ###please open sudo cat /etc/sudoers ### cope and parse @@ -177,16 +194,16 @@ For CloseCashierCustomisePdf in lookups 1) settings/print_settings 2) settings/lookups => { type:print_settings, name: CloseCashierCustomisePdf, value:1 } -<---- Extra Fields Script -----> -For MoveTablePdf in lookups +<---- Extra Fields Script -----> +For MoveTablePdf in lookups *** Both Table and Room Moving *** 1) settings/lookups => { type:print_settings, name: MoveTablePdf, value:1 } -For MoveTablePdf in print settings - * Backend > Printer > Print Settings > New - i) Name : Move Table - ii) Unique Code: MoveTablePdf - iii)Template: ... +For MoveTablePdf in print settings + * Backend > Printer > Print Settings > New + i) Name : Move Table + ii) Unique Code: MoveTablePdf + iii)Template: ... iv) Font: Zawgyi-One v) Printer: #printer name /* Tax Profile Group Types in lookups */ @@ -200,7 +217,7 @@ For MoveTablePdf in print settings 1) settings/lookups => { type:ReceiptPdfView, name: Receipt Pdf View, value:1 or 0 } => 1 is active and 0 is in-active -Add Kitchen Role of Employee +Add Kitchen Role of Employee => 1) settings/lookups => { type:employee_roles, name: Kitchen, value:kitchen } Add Base URL for DOEMAL @@ -235,12 +252,12 @@ For Login expiry time Menu Image (Import guideline) - => First, check shop_code, is there in shops table and prefix shop_code in image name? + => First, check shop_code, is there in shops table and prefix shop_code in image name? => You all must do this step * If there is shop_code in shops table (mark in one place/ note and set NULL for this record for a while) and prefix shop_code for image name (like (121_ABC.png)), and copy and paste images into Application/[sxrestaurant]/public/image/menu_images. * If there is shop_code/ no shop_code in shops table but no prefix in image name (* skip set NULL step) , copy and paste images into Application/…./image/menu_images. => Second, import [menu].xlsx file in /settings/menus and then checked image is uploaded into Application/[sxrestaurant]/public/image/menu_images and insert into menu_items table in database. - => Last, if shop has shop_code, update marked/noted shop_code into shops table again. + => Last, if shop has shop_code, update marked/noted shop_code into shops table again. For Edit Order Open & Close 1) settings/lookups => {type:edit_order, name:EditOrderOrigami, value: {1 or 0}} @@ -273,13 +290,22 @@ For Online Order Receipt Setting 1) settings/lookups => { type:order_reservation, name:ReceiptBill, value: {0 or 1} } 2) settings/print_settings => {name: ReceiptBillOrder, unique_code: ReceiptBillOrderPdf, ....} +For Close Cashier Print Settings +settings/lookups => {type:close_cashier_print, name:CloseCashierPrint, value: {0 or 1} } + +For Second Display View Setting +settings/lookups => {type:display_type, name: Display Type, value: 2} + +For show total before tax in receipt bill +settings/lookups => {type:show_total_before_tax, name:Show Total Before Tax, value: {0 or 1}} + * ToDo list 1. Migration 2. Quick Service 3. Order & Reservation - + * System Dependencies * Configuration @@ -299,7 +325,7 @@ For Online Order Receipt Setting 1. OQS - 1. Filter + 1. Filter 2. Order Item to each Stations 3. Edit Order Item @@ -313,12 +339,12 @@ For Online Order Receipt Setting 3. CRM - 1. Customer Management + 1. Customer Management 2. Queue Management - + 4. Backend - + 1. Dining Setup 2. Queue Station Setup @@ -355,19 +381,17 @@ For Online Order Receipt Setting 1. 2-Column => Main Content - col-9, Information - col-3 2. 3-Column => Sub Lint - col-2, Main Content - col-7, Information - col-3 - > Pixel + > Pixel Main Header Bar - height => 50 px Side Navigation - Weight => 230 px Main Content Padding => 15 px 2. Color - + > BUTTON 1. Submit/Add/Edit/Confirm buttons => btn-primary (theme color) 2. Show/Detail Buttons => btn-info 3. Delete => btn-delete 4. Cancel/Back => btn-default - - diff --git a/app/assets/images/online_order_icon.png b/app/assets/images/online_order_icon.png new file mode 100644 index 00000000..b9e74994 Binary files /dev/null and b/app/assets/images/online_order_icon.png differ diff --git a/app/assets/images/user_icon.png b/app/assets/images/user_icon.png new file mode 100644 index 00000000..a977c32e Binary files /dev/null and b/app/assets/images/user_icon.png differ diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index 409b5c84..68cf44d7 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -37,7 +37,7 @@ $(document).on('turbolinks:load', function() { // oqs_id = $(this).find(".oqs-id").text(); $("#oqs_active").attr('data-id',$('.oqs_click').val()); var url = 'oqs/get_items/'+$('.oqs_click').val(); - + show_details(url,null); } @@ -49,11 +49,11 @@ $(document).on('turbolinks:load', function() { $(".tables").on("click", function(){ active = $(this).hasClass('selected-table'); - if (active) { + if (active) { $(this).removeClass('bg-blue'); $(this).addClass('green'); $(this).removeClass('selected-table'); - }else{ + }else{ $(this).removeClass('green'); $(this).addClass('bg-blue'); $(this).addClass('selected-table'); @@ -63,7 +63,7 @@ $(document).on('turbolinks:load', function() { var table_id =[]; for (i = 0; i < list.length; i++) { table_id.push(list[i].value); - } + } console.log(table_id) $('#table').val(table_id); @@ -75,7 +75,7 @@ $(document).on('turbolinks:load', function() { }else{ var table = null } - + if (oqs_id > 0 || status != "All" || table != null) { $(".oqs_click").removeClass('oqs_active'); $(".queue_station").removeClass('queue_station_box'); @@ -86,7 +86,7 @@ $(document).on('turbolinks:load', function() { // oqs_id = $(this).find(".oqs-id").text(); $("#oqs_active").attr('data-id',oqs_id); var url = 'oqs/get_items/'+oqs_id; - + show_details(url,table,status); }else{ $("#completed").removeClass('hide') @@ -95,7 +95,7 @@ $(document).on('turbolinks:load', function() { }); // $(".oqs_click").on("click", function(){ - $(document).on('change', '.oqs_click', function(event){ + $(document).on('change', '.oqs_click', function(event){ oqs_id = $(this).val(); status = $("#status").val(); var table_id = $('#table_id').val(); @@ -104,7 +104,7 @@ $(document).on('turbolinks:load', function() { }else{ var table = null } - + if (oqs_id > 0 || status != "All" || table_id != null) { $(".oqs_click").removeClass('oqs_active'); $(".queue_station").removeClass('queue_station_box'); @@ -115,7 +115,7 @@ $(document).on('turbolinks:load', function() { // oqs_id = $(this).find(".oqs-id").text(); $("#oqs_active").attr('data-id',oqs_id); var url = 'oqs/get_items/'+oqs_id; - + show_details(url,table,status); }else{ $("#completed").removeClass('hide') @@ -124,7 +124,7 @@ $(document).on('turbolinks:load', function() { }); //End Click // $(".status_click").on("click", function(){ - $(document).on('change', '.status_click', function(event){ + $(document).on('change', '.status_click', function(event){ oqs_id = $("#oqs_id").val(); status = $(this).val(); var table_id = $('#table_id').val(); @@ -144,7 +144,7 @@ $(document).on('turbolinks:load', function() { // oqs_id = $(this).find(".oqs-id").text(); $("#oqs_active").attr('data-id',oqs_id); var url = 'oqs/get_items/'+oqs_id; - + show_details(url,table,status); }else{ $("#completed").removeClass('hide') @@ -152,17 +152,17 @@ $(document).on('turbolinks:load', function() { } }); //End Click - - function show_details(url,table_id,status){ + + function show_details(url,table_id,status){ console.log(table_id) var oqs_append = $('.oqs_append'); oqs_append.empty(); var filter = $('.filter').text(); - + //Start Ajax - $.ajax({ - type: "GET", - url: url, + $.ajax({ + type: "GET", + url: url, data: {'filter':filter,'table_id':table_id,'status':status}, dataType: "json", success: function(data) { @@ -175,7 +175,7 @@ $(document).on('turbolinks:load', function() { var options = data[field]["options"]; } - var date = new Date(data[field]["created_at"]); + var date = new Date(data[field]["created_at"]); // var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); var show_date =date.getHours()+ ':' + date.getMinutes() +' '+(date.getHours() >= 12 ? 'PM' : 'AM'); var set_menu_items = data[field]["set_menu_items"]; @@ -193,7 +193,7 @@ $(document).on('turbolinks:load', function() { table_type = data[field]["table_type"] +'-'+data[field]["zone"] }else{ table_type = "No Table" - + } var delivery_status = '' if (data[field]["delivery_status"] == true) { @@ -235,24 +235,24 @@ $(document).on('turbolinks:load', function() { +'' +'' - +''; - + +''; + $('.oqs_append').append(row); - } + } } }); - //end Ajax + //end Ajax } - $(document).on('click', '.queue_station', function(event){ + $(document).on('click', '.queue_station', function(event){ $('#print_order_item').removeAttr("disabled",""); $('#print_order_summary').removeAttr("disabled",""); - var orderNo = $(this).attr('data-order-no'); + var orderNo = $(this).attr('data-order-no'); var orderZone=$(this).children().children().children('.order-zone').text().trim(); var orderZoneType=$(this).children().children().children('.order-zone-type').text().trim(); // var orderItem=$(this).children().children().children('.order-item').text(); var assigned_item_id = $(this).children().find(".assigned-order-item").text(); - var orderQty = $(this).children().children().children('.order-qty').text(); + var orderQty = $(this).children().children().children('.order-qty').text(); var orderBy = $(this).children().children().children().children('.order-by').text(); var orderAt = $(this).children().children().children().children('.order-at').text(); var orderCustomer = $(this).children().children('.order-customer').text(); @@ -272,10 +272,10 @@ $(document).on('turbolinks:load', function() { data: { 'status' : order_status }, success: function(res){ // console.log(res); - for (i = 0; i < res["items"].length; i++) { - var data = JSON.stringify(res["items"][i]); - var parse_data = JSON.parse(data); - var assigned_order_items = []; + for (i = 0; i < res["items"].length; i++) { + var data = JSON.stringify(res["items"][i]); + var parse_data = JSON.parse(data); + var assigned_order_items = []; var assigned_order_item_id = ''; if(res["assigned_order_items"]!= undefined && res["assigned_order_items"]!=''){ assigned_order_items = JSON.parse(JSON.stringify(res["assigned_order_items"])); @@ -286,7 +286,7 @@ $(document).on('turbolinks:load', function() { }); } // console.log(assigned_order_item_id); - + var set_menu_items = parse_data.set_menu_items; var set_instance_items = ""; if(set_menu_items!=null){ @@ -309,16 +309,16 @@ $(document).on('turbolinks:load', function() { "" + parse_data.qty + "" + ""; } - + }else{ var order_item_row = "" + "" + parse_data.item_name + set_instance_items + "" + "" + parse_data.qty + "" + ""; } - + $("#oqs-order-details-table").children("tbody").append(order_item_row); - } + } } }) @@ -329,21 +329,21 @@ $(document).on('turbolinks:load', function() { $(this).addClass('selected-item'); }); - $(document).on('click', '.order-item-edit', function(event){ + $(document).on('click', '.order-item-edit', function(event){ var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(5); window.location.href = '/oqs/'+ assigned_item_id + "/edit/oqs"; }); // complete for queue item - - $(document).on('click', '.order-complete', function(event){ + + $(document).on('click', '.order-complete', function(event){ //e.preventDefault(); var _self = $(this); // To know in ajax return var assigned_item_id=$(this).attr('id').substr(15); var params = { 'id':assigned_item_id }; - - // Call update_delivery_status() for changed delivery and move to delivery + + // Call update_delivery_status() for changed delivery and move to delivery $.ajax({ type: 'POST', url: '/oqs/update_delivery', @@ -383,7 +383,7 @@ $(document).on('turbolinks:load', function() { } else { window.location.href = "/origami/room/" + table_id - } + } }); // Page reload location.reload(); @@ -392,7 +392,7 @@ $(document).on('turbolinks:load', function() { }); // Print Order Item - $(document).on('click', '#print_order_item', function(event){ + $(document).on('click', '#print_order_item', function(event){ $(this).attr("disabled","disabled"); var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text(); var options = $('.selected-item').children('.card-block').find('.item-options').text(); diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 6ab73e7a..64208520 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1,17 +1,17 @@ -$(function() { +//middle edit +$(function() { var role = $('#role').val(); var second_display_lookup = $("#display_type").val(); - console.log(second_display_lookup); type = window.location.href.indexOf("quick_service") || window.location.href.indexOf("food_court"); modify_order = window.location.href.indexOf("modify_order"); - + //click menu sidebar menu category $(".product").on("click", function(){ var url = $(this).attr('data-ref'); - show_product_list(url); - }); + show_product_list(url); + }); //show menu item list when click menu category - function show_product_list(url_item){ + function show_product_list(url_item){ var menu_list = $('.menu_items_list'); menu_list.empty(); @@ -25,20 +25,19 @@ $(function() { if (type ==-1 && modify_order == -1){ url_item = url_item } - console.log(url_item) //Start Ajax - $.ajax({ - type: "GET", - url: url_item, + $.ajax({ + type: "GET", + url: url_item, data: {}, dataType: "json", success: function(data) { - + var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); product = data; - for(var field in product) { + for(var field in product) { if (product[field].unit_price > 0) { qty = 1; options = []; @@ -54,28 +53,16 @@ $(function() { if (type ==-1 && modify_order == -1){ image_path = product[field].image_path.url; } - }else{ - image_path = "/image/logo.png"; - } - row = '
' + + row = '
' +'
' +'
' +'
'+ product[field].name +'
' - +"
" - +"" - +'view_list' - +'
' + +'
' - +"
" - - // +"
" - // +"" - // +"
" - - +'
' - +''+ product[field].unit_price +'' + +'
' + +'
' + +''+ product[field].unit_price +'' + +"
" + +"" + +'view_list' + +'
' +'
' + + +'
'; + } + else + { + row = '
' + +'
' + +'
' + +"
" + +'
'+ product[field].name +'
' +'
' - +'
'; + + + +'
' + + +"
" + + +'
' + + +'
' + +''+ product[field].unit_price +'' + +"
" + +"" + +'view_list' + +'
' + +'
' + + +'
'; + } $('.menu_items_list').append(row); } } } }); - //end Ajax + //end Ajax } //end show list function //click menu sidebar menu category @@ -114,7 +156,7 @@ $(function() { sub_category = $(this).siblings('.sub_category_list'); show_sub_category_list(sub_url,sub_category,menu_id); } - }); + }); //End menu category Click //click menu sidebar menu category @@ -125,19 +167,19 @@ $(function() { var menu_id = $(this).attr("data-id"); var url = "get_menu_category/"+menu_id; show_menu_item_list(url,menu_id); - }); + }); //End menu category Click //show menu item list when click menu category - function show_menu_item_list(url_item,menu_id){ + function show_menu_item_list(url_item,menu_id){ var menu_list = $('.menu_items_list'); menu_list.empty(); menus = JSON.parse(localStorage.getItem("menus")); if (menus != null) { - for(var i in menus) { + for(var i in menus) { var categories = menus[i]["categories"]; - for(var ii in categories) { + for(var ii in categories) { if (categories[ii]["id"] == menu_id) { var menu_items = categories[ii]["items"]; show_menu_list(menu_items); @@ -148,7 +190,7 @@ $(function() { type = window.location.href.indexOf("quick_service") || window.location.href.indexOf("food_court"); modify_order = window.location.href.indexOf("modify_order"); - + if (type != -1 && modify_order != -1) { url_item = '../../../addorders/'+url_item; }if(modify_order == -1 && type != -1){ @@ -159,9 +201,9 @@ $(function() { } //Start Ajax - $.ajax({ - type: "GET", - url: url_item, + $.ajax({ + type: "GET", + url: url_item, data: {}, dataType: "json", success: function(data) { @@ -171,12 +213,12 @@ $(function() { show_menu_list(menu_items); } }); - //end Ajax + //end Ajax } } //end show list function //click item row for item set - $(document).on('click', '.set_item_box', function(event){ + $(document).on('click', '.set_item_box', function(event){ $(".instance-list").empty(); $(".options-list").empty(); $(".selected-set-list").empty(); @@ -189,8 +231,8 @@ $(function() { instances = $(this).data('instances'); item_options = $(this).data('options'); - for(var field in item_sets) { - + for(var field in item_sets) { + $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]); value = item_sets[field]["instances"]; @@ -198,9 +240,9 @@ $(function() { $(value).each(function(i){ menus = JSON.parse(localStorage.getItem("menus")); if (menus != null) { - for(var j in menus) { + for(var j in menus) { var categories = menus[j]["categories"]; - for(var ii in categories) { + for(var ii in categories) { var items = categories[ii]["items"]; for(var iii in items) { var result = items[iii]["instances"]; @@ -232,7 +274,7 @@ $(function() { +'
' +'
' +'
' - $(".instance-list").append(row); + $(".instance-list").append(row); } } } @@ -281,22 +323,21 @@ $(function() { +'' +' ' - $(".instance-list").append(row); + $(".instance-list").append(row); } }); } }); } - - for(var j in item_options) { + for(var j in item_options) { value = item_options[j]["values"]; type = item_options[j]["type"]; row = "

"+type+"

" $(value).each(function(i){ - row +=""; + row +=""; }); - $(".options-list").append(row); + $(".options-list").append(row); } $('.set-item').attr('data-code',instances[0]['code']); $('.set-item').attr('data-name',instances[0]['name']); @@ -313,8 +354,8 @@ $(function() { $('#set_unit_price').text($(this).attr('data-price')); // $('#set_unit_price').text(0); }); - // click instance for add item set - $(document).on('click', '.instance_box', function(event){ + // click instance for add item set + $(document).on('click', '.instance_box', function(event){ $(".options-list").empty(); @@ -326,18 +367,18 @@ $(function() { max_qty = $(this).data('max-qty'); code = $(this).data('code'); - + if (rowCount.length+1 <= max_qty) { - for(var field in item_options) { + for(var field in item_options) { value = item_options[field]["values"]; type = item_options[field]["type"]; row = "

"+type+"

" $(value).each(function(i){ - row +=""; + +value[i]+""; }); - $(".options-list").append(row); + $(".options-list").append(row); } } // if($(this).hasClass('selected-instance') == true){ @@ -364,7 +405,7 @@ $(function() { var total_price = +sub_total + +total; $(this).addClass('selected-instance'); - set = "
'+$(this).data('name')+'' +'
' +'
' - + +' ' +'
' // +'
' @@ -397,11 +438,11 @@ $(function() { // } $('#set_unit_price').text(price); $('#set_total_price').text(total_price); - + }); //End selecct attribute buttom - - // click add order - $(document).on('click', '#remove_set', function(event){ + + // click add order + $(document).on('click', '#remove_set', function(event){ code = $(this).parent().parent('.selected-set').attr('data-code'); instance = $(".selected-instance"); $(instance).each(function(i){ @@ -412,8 +453,8 @@ $(function() { $(this).parent().parent('.selected-set').remove(); }); - // click add order - $(document).on('click', '.set_order', function(event){ + // click add order + $(document).on('click', '.set_order', function(event){ total_price = $('#set_total_price').text(); qty = parseInt($('#set_count').val()); item_code = $('#set_item_code').text(); @@ -448,9 +489,9 @@ $(function() { +''+rowCount+'' +'' + item_name+ ' ' + name +' ' + option_name +'' +'' + qty + '' - +'' + +'' + parseFloat(total).toFixed(2) - +'' + +'' +''; $(".summary-items tbody").append(row); var rowCount = $('.summary-items tbody tr').length+1; @@ -473,9 +514,9 @@ $(function() { +''+rowCount+'' +'' + item_name+ ' ' + name +' ' + set_option_name +'' +'' + qty + '' - +'' + +'' + parseFloat(total).toFixed(2) - +'' + +'' +''; $(".summary-items tbody").append(row); rowCount = rowCount + 1; @@ -494,12 +535,11 @@ $(function() { // btnClass: 'btn-danger', // }); } - + }); //End add order Click //click item row for add order - $(document).on('click', '.menu_item_box', function(event){ - + $(document).on('click', '.menu_item_box', function(event){ $('.attributes-list').empty(); $('.options-list').empty(); $('#modal_box_img').empty(); @@ -532,20 +572,20 @@ $(function() { }else{ image = ""; } - + }else{ if (modify_order) { image = ""; }else{ image = ""; } - + } - + $('#modal_box_img').append(image); instance_attributes = [] - for(var field in instances) { + for(var field in instances) { value = instances[field].values; $(value).each(function(i){ options = value[i]; @@ -556,7 +596,7 @@ $(function() { // data: {id:value[i]}, // success:function(result){ - // options = result["name"]; + // options = result["name"]; // instance_attributes.push(options); // } // }); @@ -570,14 +610,14 @@ $(function() { // url: '../../api/restaurant/menu_item_attributes/'+selected_item[i], // data: {id:selected_item[i]}, // success:function(result){ - // name = result["name"]; + // name = result["name"]; // selected_arr.push(name); // } // }); // }); - for(var field in attributes) { + for(var field in attributes) { value = attributes[field]["values"]; type = attributes[field]["type"] row = "
"+attributes[field]["type"]+"
"; @@ -595,20 +635,20 @@ $(function() { +type+"' data-value='"+value[i]+"' class='btn btn- waves-effect attribute_btn " + status +" "+ type +" '"+ disabled +" >" +value[i] - +""; + +""; }); - $(".attributes-list").append(row); + $(".attributes-list").append(row); } - for(var field in item_options) { + for(var field in item_options) { value = item_options[field]["values"]; type = item_options[field]["type"]; row = "

"+type+"

" $(value).each(function(i){ - row +=""; + row +=""; }); - $(".options-list").append(row); + $(".options-list").append(row); } // $('#count').val(1); @@ -622,14 +662,14 @@ $(function() { $('#unit_price').text(data.attr('data-price')); }); - // click select option icon for add - $(document).on('click', '.attribute_btn', function(event){ + // click select option icon for add + $(document).on('click', '.attribute_btn', function(event){ // $('.change_qty').val(1); value = $(this).data('value'); type = $(this).data('type'); instances = $(this).data('instances'); - + attributes = $(".attribute_btn"); $(attributes).each(function(i){ if ($(attributes[i]).attr('data-type')==type){ @@ -642,33 +682,34 @@ $(function() { // $('.'+type).removeClass("selected-attribute"); // } // $(this).addClass('selected-attribute'); - + var selected_attr = get_selected_attributes('selected-attribute'); qty = $('.change_qty').val(); - for(var field in instances) { + for(var field in instances) { item_attr = instances[field].values; - + if(JSON.stringify(item_attr) == JSON.stringify(selected_attr)){ - unit_price = instances[field].price ; + unit_price = instances[field].price ; total_price = qty * unit_price ; $('#instance_name').text(instances[field].name); $('#instance_code').text(instances[field].code); $('#promotion_price').text(instances[field].promotion_price); $('#total_price').text(total_price); $('#unit_price').text(unit_price); - } + } } - + }); //End selecct attribute buttom - // click select option icon for add - $(document).on('click', '.option_btn', function(event){ + // click select option icon for add + $(document).on('click', '.option_btn', function(event){ active =$(this).hasClass('selected-option'); value = $(this).data('value'); type = $(this).data('type'); group = $(this).data('group'); + console.log(group); options = $(".option_btn"); $(options).each(function(i){ if ($(options[i]).attr('data-type')==type){ @@ -680,7 +721,7 @@ $(function() { }else{ $(this).addClass('selected-option'); } - + if(group == "set_menu"){ option_arr = get_selected_attributes('selected-option'); @@ -699,32 +740,63 @@ $(function() { if(group == "set_menu_default"){ option_arr = get_selected_attributes('selected-option'); $('.set-item').attr('data-options',JSON.stringify(option_arr)); - $('.set_default_option').text(option_arr); + $('.set_default_option').text(option_arr); } - - }); //End selecct attribute buttom - // click add order - $(document).on('click', '.add_to_order', function(event){ + }); //End selecct attribute buttom + // click select option icon for add + $(document).on('click', '.check_option_btn', function(event){ + active =$(this).hasClass('selected-option'); + value = $(this).data('value'); + type = $(this).data('type'); + group = $(this).data('group'); + if (active) { + $(this).removeClass('selected-option'); + }else{ + $(this).addClass('selected-option'); + } + if(group == "set_menu"){ + option_arr = get_selected_attributes('selected-option'); + $(".selected-set:last").attr('data-options',JSON.stringify(option_arr)); + $(".selected-set:last").children().children('#instance_option').text(option_arr); + // instance = $(".selected-instance"); + // $(instance).each(function(i){ + // if ($(instance[i]).attr('data-code')==code){ + // option_arr = get_selected_attributes('selected-option'); + // $(instance[i]).attr('data-options',JSON.stringify(option_arr)); + // $(instance[i]).children().children('#instance_option').text(option_arr); + // } + // }); + } + + if(group == "set_menu_default"){ + option_arr = get_selected_attributes('selected-option'); + $('.set-item').attr('data-options',JSON.stringify(option_arr)); + $('.set_default_option').text(option_arr); + } + + }); //End selecct attribute buttom + // click add order + $(document).on('click', '.add_to_order', function(event){ total_price = $('#total_price').text(); qty = parseInt($('#count').val()); - var item_row = $('.selected-attribute'); + var item_row = $('.selected-attribute'); attribute_arr = get_selected_attributes('selected-attribute'); option_arr = get_selected_attributes('selected-option'); if (item_row.length>0) { var instances = jQuery.parseJSON(item_row.attr('data-instances')); - - for(var field in instances) { - + + for(var field in instances) { + attrbu = JSON.stringify(attribute_arr); - instan = JSON.stringify(instances[field].values); + instan = JSON.stringify(instances[field].values); var newarr = new Set(instan); result = false; - for(var i in attrbu) { + for(var i in attrbu) { if (newarr.has(attrbu[i])) { result = true; break; @@ -732,6 +804,8 @@ $(function() { } if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values)) { + console.log('instances'); + console.log(attrbu); $('.add_to_order').attr('data-instance-code',instances[field].code); $('.add_to_order').attr('data-instance',instances[field].name); $('.add_to_order').attr('data-price',instances[field].price); @@ -758,22 +832,22 @@ $(function() { } show_item_detail(item_data,"add_to_order"); calculate_sub_total(); - + }); //End add order Click - - // click plus icon for add - $(document).on('click', '.add_icon', function(event){ + + // click plus icon for add + $(document).on('click', '.add_icon', function(event){ var item_data = $(this); if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { item = get_item(item_data,"add_icon"); customer_display_view(item,"add"); } show_item_detail(item_data,"add_icon"); - calculate_sub_total(); + calculate_sub_total(); }); //End Add Icon Click function show_item_detail(data,click_type){ - + testqty = parseInt($('.item_box').children('data_qty').text()); qty = parseInt(data.attr('data-qty')); append = 0; price = data.attr('data-price'); @@ -786,42 +860,42 @@ $(function() { } d_option = data.attr('data-opt'); if (click_type != "add_icon"){ - option_name = "-"+data.attr('data-options'); - data_option = data.attr('data-options') ; + option_name = "-"+data.attr('data-options'); + data_option = data.attr('data-options') ; }else{ option_name = ' '; data_option = '[]'; } var rowCount = $('.summary-items tbody tr').length+1; var item_row = $('.summary-items tbody tr'); - + $(item_row).each(function(i){ item_code = $(item_row[i]).attr('data-code'); instance_code = $(item_row[i]).attr('data-instance-code'); r_option = $(item_row[i]).attr('data-opt'); - if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { - if (qty > 1) { + if (item_code == data.attr('data-item-code') && instance_code == data.attr('data-instance-code')&&r_option == d_option) { + if (qty > 1) { qty = parseInt($(item_row[i]).children('#item_qty').text()) + qty; - }else{ + }else{ qty = parseInt($(item_row[i]).children('#item_qty').text()) + 1; } - + $(item_row[i]).children('#item_qty').text(qty); parseFloat($(item_row[i]).children('#item_price').text(parseFloat(price*qty).toFixed(2))); append =1; - }else{ - if (qty > 1) { + }else{ + if (qty > 1) { qty = qty; - }else{ + }else{ qty = 1; } - } - }); + } + }); if (append===0) { row ="'+rowCount+'' +'' + data.attr('data-name')+ ' ' + instance +''+option_name+'' +'' + qty + '' - +'' + +'' + parseFloat(price).toFixed(2) - +'' + +'' +''; $(".summary-items tbody").append(row); } @@ -844,8 +918,11 @@ $(function() { e.preventDefault(); $("#oqs_loading_wrapper").show(); var cashier_type = $("#link_type").val(); + localStorage.setItem('cashier_type',cashier_type); quick_service = window.location.href.indexOf("quick_service"); + localStorage.setItem('quick_service',quick_service); food_court = window.location.href.indexOf("food_court"); + localStorage.setItem('food_court',food_court); if (quick_service != -1 || food_court != -1) { type = cashier_type; var table_type = $('#table_type').text(); @@ -863,15 +940,15 @@ $(function() { } var order_items = JSON.stringify(get_order_item_rows()); if (booking_id.length > 0) { - + var params = {'order_source': type, 'order_type': "dine_in", 'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id, - 'table_id': table_id, + 'table_id': table_id, 'order_items': order_items,'create_type' : "create_only" }; }else{ var params = {'order_source': type, 'order_type': "dine_in", 'customer_id': customer_id, 'guest_info': "", - 'table_id': table_id, + 'table_id': table_id, 'order_items': order_items,'create_type' : "create_only" }; } @@ -881,7 +958,7 @@ $(function() { url: ajax_url, data: params, dataType: "json", - success:function(result){ + success:function(result){ if (type == "quick_service" || type=="food_court") { window.location.href = "/origami/"+type; }else{ @@ -890,7 +967,7 @@ $(function() { } else { window.location.href = "/origami/room/" + table_id; - } + } } if ($('#server_mode').val() != "cloud" && second_display_lookup == 2){ customer_display_view(null,"reload"); @@ -930,18 +1007,18 @@ $(function() { } var order_items = JSON.stringify(get_order_item_rows()); if (booking_id.length > 0) { - + var params = {'order_source': type, 'order_type': "dine_in", 'customer_id': customer_id, 'guest_info': "",'booking_id':booking_id, - 'table_id': table_id, + 'table_id': table_id, 'order_items': order_items,'sale_id': sale_id,'create_type': "create_pay" }; }else{ var params = {'order_source': type, 'order_type': "dine_in", 'customer_id': customer_id, 'guest_info': "", - 'table_id': table_id, + 'table_id': table_id, 'order_items': order_items,'sale_id': sale_id,'create_type': "create_pay" }; } - + $.ajax({ type: "POST", url: ajax_url, @@ -967,7 +1044,7 @@ $(function() { window.location.href = "/origami/sale/"+result.data["sale_id"]+"/"+type+"/payment"; } } - } + } }); }); @@ -985,6 +1062,7 @@ $(function() { $('.summary-items tr').filter(function(){ if ($(this).attr('data-active') == 'true'){ if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { + var item_data = $(this); item = get_item(item_data,"remove_icon"); customer_display_view(item,"remove"); } @@ -995,26 +1073,27 @@ $(function() { }); //click close - $('#sx_itemModal').on('click','#close', function(){ + $('#sx_itemModal').on('click','#close', function(){ $(".item_box").removeAttr("data-active"); }); - $('#sx_item_set_detailModal').on('click','#close', function(){ + $('#sx_item_set_detailModal').on('click','#close', function(){ $("#sx_item_set_detailModal").css({ 'display': "none" }); }); //click save buttom after change qty - $('#sx_itemModal').on('click','#save', function(){ + $('#sx_itemModal').on('click','#save', function(){ if ($('#modal-qty').val()>0) { - summary_items_filter(); + summary_items_filter(); calculate_sub_total(); + }else{ swal("Opps", "Please enter number for qty ","warning"); } - + }); //calculate subtotal - function calculate_sub_total(){ + function calculate_sub_total(){ var total_price = 0; var total_qty = 0; var taxable_amount = 0; @@ -1023,16 +1102,16 @@ $(function() { $(item_row).each(function(i){ var unit_price = parseFloat($(item_row[i]).attr('data-price')); var qty = parseFloat($(item_row[i]).children('#item_qty').text()); - total_qty += qty; - total_price += qty*unit_price; - }); + total_qty += qty; + total_price += qty*unit_price; + }); var fixed_total_price = parseFloat(total_price).toFixed(2); var fixed_taxable_amount = parseFloat(taxable_amount).toFixed(2); - $('#sub_total').empty(); + $('#sub_total').empty(); $('#sub_total').append(fixed_total_price); - $('#total_qty').empty(); + $('#total_qty').empty(); $('#total_qty').append(total_qty); if (item_row.length > 0) { @@ -1046,16 +1125,17 @@ $(function() { $('.summary-items tr').filter(function(){ if ($(this).attr('data-active') == 'true'){ qty = $('#modal-qty').val(); + $(this).attr('data-qty',qty); price = parseFloat($(this).attr('data-price')); total_price = parseFloat(price*qty).toFixed(2); $(this).find('#item_qty').text(qty); - $(this).find('.item-cell-price').text(total_price); - + $(this).find('.item-cell-price').text(total_price); + $(this).removeAttr('data-active'); - + if ($('#server_mode').val() != "cloud" && second_display_lookup == 2) { - var item_data = $(this); + var item_data = $(this); item = get_item(item_data,"update_icon"); customer_display_view(item,"update_qty"); } @@ -1065,17 +1145,17 @@ $(function() { /* Get Item rows */ function get_order_item_rows(){ - var order_items = []; + var order_items = []; var item_row = $('.summary-items tbody tr'); $(item_row).each(function(i){ var order_item = {}; - + order_item.order_item_id = $(item_row[i]).attr('data-row'); order_item.item_instance_code = $(item_row[i]).attr('data-instance-code'); order_item.quantity = $(item_row[i]).children('#item_qty').text(); //parent id if ($(item_row[i]).attr('data-parent')=="true") { - parent_id = $(item_row[i]).attr('data-row'); + parent_id = $(item_row[i]).attr('data-row'); } if ($(item_row[i]).attr('data-sub-item')=="true") { order_item.parent_order_item_id = parent_id @@ -1083,7 +1163,7 @@ $(function() { //end parent id order_item.options = $(item_row[i]).attr('data-options'); order_items.push(order_item); - }); + }); return order_items; } // Get Selected Class @@ -1123,14 +1203,14 @@ $(function() { window.location.href = "/origami/room/" + table_id; } } - }); + }); // Get Selected Class function change_qty_plus_minus(id,plus,minus) { - var count = parseInt($('#'+id).val()); + var count = parseInt($('#'+id).val()); - $('#'+plus).on("click", function(){ - count++; + $('#'+plus).on("click", function(){ + count++; $('#'+id).val(count); if (id == "count") { @@ -1150,7 +1230,7 @@ $(function() { }else{ total_price = count*price; } - + $("#set_total_price").text(total_price); } }); @@ -1159,7 +1239,7 @@ $(function() { // var count = parseInt($('#'+id).val()); // var countEl = document.getElementById(id); - + if (count > 1) { count--; $('#'+id).val(count); @@ -1183,7 +1263,7 @@ $(function() { } $("#set_total_price").text(total_price); } - } + } }) } @@ -1221,31 +1301,31 @@ $(function() { //click menu sidebar menu category - $(document).on('click', '.sub_clickssss', function(event){ + $(document).on('click', '.sub_clickssss', function(event){ event.preventDefault(); var menu_id = $(this).attr("data-id"); var url = "get_menu_sub_category/"+menu_id; sub_category = $(this).find('.sub_category_list'); - show_sub_category_list(url,sub_category,menu_id); - }); + show_sub_category_list(url,sub_category,menu_id); + }); //End menu category Click //show menu item list when click menu category - function show_sub_category_list(url,sub_category,menu_id){ + function show_sub_category_list(url,sub_category,menu_id){ var sub_category_list = $('.sub_category_list'); sub_category_list.empty(); menus = JSON.parse(localStorage.getItem("menus")); if (menus != null) { - for(var j in menus) { + for(var j in menus) { var categories = menus[j]["categories"]; - for(var ii in categories) { - if (menu_id == categories[ii]["parent_id"]) { + for(var ii in categories) { + if (menu_id == categories[ii]["parent_id"]) { $(sub_category).removeClass('hidden'); row = '
  • ' +''+ categories[ii].name+'' - +'
    • ' ; + +'' ; $(sub_category).append(row); } } @@ -1260,9 +1340,9 @@ $(function() { var url = url; } //Start Ajax - $.ajax({ - type: "GET", - url: url, + $.ajax({ + type: "GET", + url: url, data: {}, dataType: "json", success: function(data) { @@ -1275,27 +1355,27 @@ $(function() { // }else{ // $(sub_category).addClass('hidden'); // } - for(var i in data) { + for(var i in data) { row = '
  • ' +''+ data[i].name+'' - +'
    • ' ; + +'' ; $(sub_category).append(row); //end is_sub_item false } } } }); - //end Ajax + //end Ajax } } /* Get Item rows */ - function get_item(data,click_type){ - var sale_items = []; - + function get_item(data,click_type){ + var sale_items = []; + var sale_item = {}; - sale_item.qty = parseInt(data.attr('data-qty')) + sale_item.qty = parseInt(data.attr('data-qty')); sale_item.name = data.attr('data-name'); sale_item.price = data.attr('data-price'); sale_item.item_code = data.attr('data-item-code') @@ -1306,13 +1386,13 @@ $(function() { sale_item.click_type = click_type sale_item.instance = data.attr('data-instance') sale_items.push(sale_item); - return sale_items; + } /* Get Item rows */ function get_set_item(items){ - var sale_items = []; + var sale_items = []; var item = {}; item.code = $('.set-item').attr('data-code'); item.name = $('.set-item').attr('data-name'); @@ -1326,7 +1406,7 @@ $(function() { sale_items.push(item); $(items).each(function(i){ - var sale_item = {}; + var sale_item = {}; sale_item.code = $(items[i]).attr('data-code'); sale_item.name = $(items[i]).attr('data-name'); sale_item.item_name = $('#set_name').text(); @@ -1338,7 +1418,7 @@ $(function() { sale_items.push(sale_item); }); - + return sale_items; } @@ -1347,7 +1427,7 @@ $(function() { url = '../../../../origami/customer_view'; } if(modify_order == -1 && type != -1){ - url = '../../origami/customer_view'; + url = '../../origami/customer_view'; } if (type ==-1 && modify_order == -1){ url = '../../origami/customer_view'; @@ -1357,7 +1437,7 @@ $(function() { url: url, data: {"data":data,"status":status}, dataType: "json", - success:function(result){ + success:function(result){ } }); } @@ -1368,7 +1448,7 @@ $(function() { // qty = $(this).val(); // price = $("#set_total_price").text(); // $("#set_total_price").text(qty*price); - // }); + // }); // $(".change_qty").change(function(){ // qty = $(this).val(); @@ -1378,7 +1458,8 @@ $(function() { function show_menu_list(menu_items) { var menu_list = $('.menu_items_list'); menu_list.empty(); - for(var field in menu_items) { + for(var field in menu_items) { + console.log(menu_items[field].instances); if (menu_items[field].is_sub_item == false) { instances = menu_items[field].instances ; @@ -1439,52 +1520,109 @@ $(function() { }else{ image_path = menu_items[field].image; } - - }else{ - if (modify_order) { - image_path = "../../image/logo.png"; - }else{ - image_path = "image/logo.png"; - } - } + row = '
    ' + +'
    ' + +'
    ' + +'
    '+ menu_items[field].name +'
    ' - row = '
    ' - +'
    ' - +'
    ' - +'
    '+ menu_items[field].name +'
    ' - +"
    " - +"" - +add+ '' - +'
    ' - +'
    ' - +"
    " + +'
    ' + +"
    " + +'
    ' + +'
    ' + +''+ price +'' + + "
    " + + "" + + add + + "" + +'
    ' - // +"
    " - // +"" - // +"
    " + +'
    ' + +'
    '; ; + }else{ + row = '
    ' + +'
    ' + +'
    " + + +'
    '+ menu_items[field].name +'
    ' + +'
    ' + +"
    " + +'
    ' + +'
    ' + +''+ price + '' + +"
    " + +"" + +add+ '' + +'
    ' + +'
    ' + + + +'
    ' + +'
    '; + } - +'
    ' - +''+ price +'' - +'
    ' - +'
    ' - +'
    '; ; $('.menu_items_list').append(row); } //end instances in menu-items alest 1 instance @@ -1492,4 +1630,4 @@ $(function() { //end is_sub_item false } } -}); \ No newline at end of file +}); diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 8e3ede95..bd9018fb 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -35,6 +35,7 @@ //= require BSBMaterial/demo.js //= require custom.js //= require jquery-fileupload/basic +//= require induties/induties.js $(document).ready(function() { $('.count-to').countTo(); diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js index 9e5ab3fa..2e32201e 100644 --- a/app/assets/javascripts/channels/second_display_view.js +++ b/app/assets/javascripts/channels/second_display_view.js @@ -1,13 +1,13 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { -// App.messages = App.cable.subscriptions.create('MessagesChannel', { +// App.messages = App.cable.subscriptions.create('MessagesChannel', { connected: function() {}, disconnected: function() {}, - received: function(data) { + received: function(data) { var hostname = location.hostname.trim(); - if(data.from == "" || hostname == data.from){ + if(data.from == "" || hostname == data.from){ var items = data.data; var tax = data.tax_profiles; var status= data.status @@ -16,8 +16,8 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { } $('#second_display_slider').addClass("hidden") $('#second_display_items').removeClass("hidden") - - + + // append items if (status == "add") { for(var i in items) { @@ -34,15 +34,16 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { // d_option = items[i].options; // if (d_option){ - // option_name = "-"+items[i].options; + // option_name = "-"+items[i].options; // }else{ // option_name = ''; // } d_option = items[i].opt; + console.log(d_option) if (items[i].click_type != "add_icon"){ - option_name = "-"+items[i].options; - data_option = items[i].options ; + option_name = "-"+items[i].options; + data_option = items[i].options ; }else{ option_name = ' '; data_option = '[]'; @@ -54,27 +55,28 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { $(item_row).each(function(j){ var item_code = $(item_row[j]).attr('data-code'); var instance_code = $(item_row[j]).attr('data-instance-code'); - var r_option = $(item_row[j]).attr('data-options'); + var r_option = $(item_row[j]).attr('data-opt'); + console.log(r_option) if (item_code == items[i].item_code && instance_code == items[i].instance_code && r_option==d_option) { - if (qty > 1) { + if (qty > 1) { qty = parseInt($(item_row[j]).children('#item_qty').text()) + qty; - }else{ + }else{ qty = parseInt($(item_row[j]).children('#item_qty').text()) + 1; } - + $(item_row[j]).children('#item_qty').text(qty); parseFloat($(item_row[j]).children('#item_price').text(parseFloat(price*qty).toFixed(2))); append =1; }else{ - if (qty > 1) { + if (qty > 1) { qty = qty; - }else{ + }else{ qty = 1; } - } - }); + } + }); if (append===0) { - row ="'+rowCount+'' +'' + items[i].name+ ' ' + instance + ' ' + option_name +'' +'' + qty + '' - +'' + +'' + parseFloat(price).toFixed(2) - +'' + +'' +''; $(".second_display_items tbody").append(row); - + } } } @@ -117,28 +119,29 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { +''+rowCount+'' +'' + item_name+ ' ' + name + ''+option+'' +'' + qty + '' - +'' + +'' + parseFloat(total).toFixed(2) - +'' + +'' +''; $(".second_display_items tbody").append(row); rowCount = rowCount + 1; - + } } //remove item if(status == "remove"){ for(var i in items) { - var item_code = items[i].item_code; + var item_code = items[i].instance_code; $("#order-items-table tbody > tr.item_box_"+item_code+"").remove(); } } //remove item //update item qty if(status == "update_qty"){ + for(var i in items) { - var item_code = items[i].item_code; + var item_code = items[i].instance_code; var item_qty = parseInt(items[i].qty); var item_price = parseFloat(items[i].price); var item_total = parseFloat(item_qty * item_price).toFixed(2); @@ -157,8 +160,8 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { $(item_row).each(function(i){ var unit_price = parseFloat($(item_row[i]).attr('data-price')); var qty = parseFloat($(item_row[i]).children('#item_qty').text()); - total_price += qty*unit_price; - }); + total_price += qty*unit_price; + }); //calculate Tax Amount for(var i in tax) { // substract , to give after discount @@ -177,13 +180,12 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { var fixed_taxable_amount = parseFloat(total_tax_amount).toFixed(2); var fixed_grand_total = parseFloat(total_price + total_tax_amount).toFixed(2); - $('#s_sub_total').empty(); + $('#s_sub_total').empty(); $('#s_sub_total').append(fixed_total_price); - $('#s_tatal_tax').empty(); + $('#s_tatal_tax').empty(); $('#s_tatal_tax').append(fixed_taxable_amount); - $('#s_grand_total').empty(); + $('#s_grand_total').empty(); $('#s_grand_total').append(fixed_grand_total); } } }); - diff --git a/app/assets/javascripts/induties/assign_in_duties.coffee b/app/assets/javascripts/induties/assign_in_duties.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/induties/assign_in_duties.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/induties/induties.js b/app/assets/javascripts/induties/induties.js new file mode 100644 index 00000000..e69de29b diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index d60c2f08..f74f1fa9 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -288,6 +288,8 @@ function show_order_detail(url,sr_no){ data: {}, dataType: "json", success: function(data) { + var scrollTo = document.getElementById('div_card_order'); + $("HTML, body").animate({scrollTop: scrollTo.offsetTop - 60 }, 500 ); // console.log(data); $("#order_remark").text(""); $(".tbl_customer").show(); @@ -373,24 +375,49 @@ function show_order_detail(url,sr_no){ item_price = items[i].unit_price; } var total = items[i].qty * item_price; - if(items[i].options!='[]' && items[i].options!="" && items[i].options!=null){ - row = '' - +''+items[i].item_name - +'
    ' - +' '+items[i].options+'
    '+ - ''+items[i].qty+ ' X'+items[i].unit_price+'' - +'' - +''+ total +'' - +''; - }else{ - row = '' - +''+items[i].item_name - +'
    '+ - ''+items[i].qty+ ' X'+items[i].unit_price+'' - +'' - +''+ total +'' - +''; + var check_mobile =document.getElementsByName("summary_items_mobile")[0].value; + if (check_mobile == "true"){ + if(items[i].options!='[]' && items[i].options!="" && items[i].options!=null){ + row = + '' + +''+items[i].item_name + +'
    ' + +' '+items[i].options+''+ + ''+items[i].qty+ '' + +'' + +''+ total +'' + +''; + }else{ + row = '' + +''+items[i].item_name + +' '+ + ''+items[i].qty+ '' + +''+ total +'' + +''; + } } + else{ + if(items[i].options!='[]' && items[i].options!="" && items[i].options!=null){ + row = '' + +''+items[i].item_name + +'
    ' + +' '+items[i].options+'
    '+ + ''+items[i].qty+ ' X'+items[i].unit_price+'' + +'' + +''+ total +'' + +''; + }else{ + row = '' + +''+items[i].item_name + +'
    '+ + ''+items[i].qty+ ' X'+items[i].unit_price+'' + +'' + +''+ total +'' + +''; + } + } + + $('.summary-items').append(row); } diff --git a/app/assets/stylesheets/BSBMaterial/style.css b/app/assets/stylesheets/BSBMaterial/style.css index ed00c5f5..a4620cf5 100755 --- a/app/assets/stylesheets/BSBMaterial/style.css +++ b/app/assets/stylesheets/BSBMaterial/style.css @@ -2323,7 +2323,7 @@ @media (max-width: 767px) { .navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand { - margin-left: 35px; + margin-left: 15px; width: 73%; } .navbar .navbar-header { display: inline-block; @@ -8054,4 +8054,3 @@ html.ie11 .dropdown-menu ul.menu li a { html.ie11 .bs-searchbox .form-control { width: 90%; } - diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index de416831..ae2de4d8 100755 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -69,11 +69,11 @@ z-index: 1100; } -#sxModal-Content { +#sxModal-Content { position: relative; left: 42%; top: 30%; - background-color: #32ad1a; + background-color: #32ad1a; color: #fff; text-align: center; width: 200px; @@ -92,7 +92,7 @@ #videoElement { width: 480px; height: 375px; - + } .cashier_number{ @@ -243,7 +243,7 @@ i.logout_icon{ span.round-tab:hover{ color: white; border: 1px solid #fff; - background-color:#2196F3; + background-color:#2196F3; } .wizard .nav-tabs > li { width: 25%; @@ -268,4 +268,79 @@ i.logout_icon{ font-size: 14px; color: #FFFFFF; } -/*customer modal UI */ \ No newline at end of file +/*customer modal UI */ + +@media screen and (max-width: 785px) { + section.content{ + margin: 80px 15px 0 225px; + } + + .mbl_view{ + display: none; + } + + .navbar-brand-txt{ + margin-top: -15px; + } + + .toggle_mbl { + text-align: right; + } + + .toggle_mbl img{ + width: 24px; + margin-bottom: 14px; + } + + .toggle_mbl a:hover, a:focus{ + background-color: unset; + } + + .col-mbl-view{ + width: 50%; + } + + .info-box .icon{ + display: none; + } + + .mbl_product_div{ + display: none; + } + + .sidebar .menu{ + top: 10px; + } + + .page-header{ + width: 100% !important; + } + + .ls-closed .bars:after, .ls-closed .bars:before{ + top: 14px; + } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } +} diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 6a97bdcb..3e49913d 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -120,4 +120,79 @@ i.logout_icon{ .table-width{ width: 100%; -} \ No newline at end of file +} + +@media screen and (max-width: 785px) { + section.content{ + margin: 80px 15px 0 225px; + } + + .mbl_view{ + display: none; + } + + .navbar-brand-txt{ + margin-top: -15px; + } + + .toggle_mbl { + text-align: right; + } + + .toggle_mbl img{ + width: 24px; + margin-bottom: 14px; + } + + .toggle_mbl a:hover, a:focus{ + background-color: unset; + } + + .col-mbl-view{ + width: 50%; + } + + .info-box .icon{ + display: none; + } + + .mbl_product_div{ + display: none; + } + + .sidebar .menu{ + top: 10px; + } + + .page-header{ + width: 100% !important; + } + + .ls-closed .bars:after, .ls-closed .bars:before{ + top: 14px; + } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } +} diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index 1ffdb8f0..8c21972d 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -3,12 +3,13 @@ section .content{ } .custom-card-head{ height: 40px; - #background-color: #54A5AF; - background-color: #a1aade; + // background-color: #79D0F2; + background-color: #3F52B5; + color :#fff; + #background-color: #a1aade; opacity: 0.8; padding:5px; - color :#000000; - + font-weight:600; } .custom-card { border: 2px solid rgba(0, 0, 0, 0.125) !important; @@ -16,12 +17,16 @@ section .content{ } .custom-card-footer{ padding:0.35rem 1.25rem !important; + bottom:0; + position: absolute; + width: 100%; + font-weight:900; } - + .custom-card-block { padding: 0.3rem !important; } - + @media (min-width: 34em) { .custom-card-columns { -webkit-column-count: 2; @@ -139,7 +144,7 @@ element.style { margin-bottom: 5px; margin-right: 5px; color:#111 !important; -} +} #logo{ margin: auto; width: 100%; @@ -184,7 +189,7 @@ section.content{ opacity: 1; z-index: 101; filter: alpha(opacity=100); /* ie */ - -moz-opacity: 1; /* mozilla */ + -moz-opacity: 1; /* mozilla */ } #count ,#set_count{ @@ -192,7 +197,7 @@ section.content{ } .menu_item_box{ - cursor: pointer; + cursor: pointer; } /*Logout Icon*/ @@ -236,7 +241,7 @@ i.logout_icon{ .my-toggle{ padding: 15px 20px 10px 10px; line-height:2; - + } .list-menu{ list-style: none; @@ -264,7 +269,7 @@ i.logout_icon{ .list-menu > a:hover{ text-decoration: none; } -.cashier_number{ +.cashier_number, .qty_number{ width: 33%; height:58px; line-height:58px; @@ -300,4 +305,40 @@ i.logout_icon{ .ls-closed section.content { margin-left: 15px !important; margin-right: 15px !important; -} \ No newline at end of file +} +.product_box{ + position:relative; + text-align:center; + font-weight:900; + color:#fff; + font-size:1.5em; + margin:auto; +} +.custom-card-no-img-head{ + #background-color: #54A5AF; + opacity: 0.8; + padding:5px; + color :#273040; + min-height:100px; + height: 150px; + // background-color:#79D0F2; + background-color: #3F52B5; + +} +.menu_item_no_img_box{ + cursor: pointer; + +} +.custom-card-no-img-footer{ + padding:0.35rem 1.25rem !important; + +} +.custom-flex-footer{ + display:flex; +} +.check_option_btn { + white-space: normal !important; + margin-bottom: 5px; + margin-right: 5px; + color: #111 !important; +} diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index b1718ee2..e0308d12 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -11,6 +11,7 @@ @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; @import "reset"; +@import "induties/assign_in_duties"; /*@import "bootstrap-select/css/bootstrap-select.min";*/ @@ -119,9 +120,108 @@ i.logout_icon{ margin-right: 15px; color:#fff !important; # background-color: green !important; -} +} .payment-btn-box { - width: 130px; + width: 130px; height: 50px; -} \ No newline at end of file +} + +@media screen and (max-width: 785px) { + #setting{ display: none;} + .menu-up{ display: none;} + .card-btn{padding: 0px 35px;} +} + +@media screen and (max-width: 785px) { + section.content{ + margin: 80px 15px 0 225px; + } + + .mbl_view{ + display: none; + } + + .navbar-brand-txt{ + margin-top: -15px; + } + + .toggle_mbl { + text-align: right; + } + + .toggle_mbl img{ + width: 24px; + margin-bottom: 14px; + } + + .toggle_mbl a:hover, a:focus{ + background-color: unset; + } + + .col-mbl-view{ + width: 50%; + } + + .info-box .icon{ + display: none; + } + + .mbl_product_div{ + display: none; + } + + .sidebar .menu{ + top: 10px; + } + + .page-header{ + width: 100% !important; + } + + .ls-closed .bars:after, .ls-closed .bars:before{ + top: 14px; + } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } + + .mbl-table{ + display: block; + overflow: scroll; + } + + .mbl-table-card{ + overflow: scroll; + display: inline-block; + } + + .p-l-15{ + padding: 0px 10px; + } + + #order_by{ + width: 100% !important; + } +} diff --git a/app/assets/stylesheets/induties/assign_in_duties.scss b/app/assets/stylesheets/induties/assign_in_duties.scss new file mode 100644 index 00000000..f51fbcff --- /dev/null +++ b/app/assets/stylesheets/induties/assign_in_duties.scss @@ -0,0 +1,96 @@ +// Place all the styles related to the induties/assign_in_duties controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ + +.custom-card-head{ + height: 40px; + background-color: grey; + color :#fff; + opacity: 0.8; + padding:5px; + font-weight:400; + align-items: center; +} +.form-group .form-control { + width: 100%; + border: none; + box-shadow: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + -ms-border-radius: 0; + border-radius: 0; + padding-left: 0; +} +.radio-room{ + margin-right:2rem; +} +.radio-table{ + margin-left:1rem; +} +.bmd-form-group { + position: relative; + padding-top: 0 !important; +} +.btn_create_induty{ + display: inline; + padding: 1.5rem; + margin: 0; +} +.create_induty_card{ + min-height:500px; +} + +#save_induties_by_name{ + -webkit-appearance: none; +} + +.checkboxLabel:before{ + content: '\e40c'; + font-family: "Material Icons"; + font-size: 25px; + vertical-align: middle; + margin-right: 5px; + color: #2196F3; +} + +#save_induties_by_name:checked ~ .checkboxLabel:before{ + content: '\e86c'; +} +.checkboxLabel { + font-size: 18px !important; +} +.add_more{ + content: '\e40c'; + font-family: "Material Icons"; + font-size: 25px; + vertical-align: middle; + margin-right: 5px; + color: #2196F3; +} +.success-msg { + color: #270; + background-color: #DFF2BF; + margin: 10px 0; + padding: 10px; + border-radius: 3px 3px 3px 3px; + display: none; + margin-right: 0.5rem; + margin-left: 0.5rem; +} +.show_all_commissioner_card{ + min-height: 830px; + max-height: 830px; + overflow: scroll; +} +.sweet-alert p { + font-size: 14px !important; + font-weight:bold; +} +.sweet-alert { + top :0; + margin-top: 20px !important; +} +.add_to_charges{ + width:100%; + padding:1rem; +} \ No newline at end of file diff --git a/app/assets/stylesheets/inventory_definitions.scss b/app/assets/stylesheets/inventory_definitions.scss index aa02f08d..d134fbd7 100755 --- a/app/assets/stylesheets/inventory_definitions.scss +++ b/app/assets/stylesheets/inventory_definitions.scss @@ -279,4 +279,79 @@ tr.discount-item-row:hover { i.logout_icon{ position: relative; top: 5px; -} \ No newline at end of file +} + +@media screen and (max-width: 785px) { + section.content{ + margin: 80px 15px 0 225px; + } + + .mbl_view{ + display: none; + } + + .navbar-brand-txt{ + margin-top: -15px; + } + + .toggle_mbl { + text-align: right; + } + + .toggle_mbl img{ + width: 24px; + margin-bottom: 14px; + } + + .toggle_mbl a:hover, a:focus{ + background-color: unset; + } + + .col-mbl-view{ + width: 50%; + } + + .info-box .icon{ + display: none; + } + + .mbl_product_div{ + display: none; + } + + .sidebar .menu{ + top: 10px; + } + + .page-header{ + width: 100% !important; + } + + .ls-closed .bars:after, .ls-closed .bars:before{ + top: 14px; + } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } +} diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index f156d4d3..b9a3f0df 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -22,7 +22,7 @@ display: block; width: 100%; text-align: center; - color: #000; + color: #000; margin-top: -5px; } @@ -117,4 +117,14 @@ .box { margin : 0 -60px 0 -60px; -} \ No newline at end of file +} + +@media screen and (max-width: 785px) { + .login_pwd{width: 90%;} + .login_ent{width: 10%;} + // .card-btn{padding: 0px 35px;} + // .nav-tabs{padding: 0px 44px;} + .box{margin: unset;} + .mbl-btn-usrgp{width: 48%;} + +} diff --git a/app/assets/stylesheets/order_reservation.scss b/app/assets/stylesheets/order_reservation.scss index e46ce76d..d6e9a7fb 100644 --- a/app/assets/stylesheets/order_reservation.scss +++ b/app/assets/stylesheets/order_reservation.scss @@ -99,4 +99,10 @@ td.grand-total-padding { font-size: 17px; padding-top: 20px !important; +} +.mobile_tab-col-teal > li { + margin:auto; +} +.mobile_tab-col-teal{ + margin-left:1.5rem; } \ No newline at end of file diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 2558d846..64cc2937 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -62,8 +62,8 @@ select.form-control { /* .order-info { - min-height:300px; - max-height:500px; + min-height:300px; + max-height:500px; overflow:auto } */ @@ -222,7 +222,7 @@ select.form-control { margin-right: 15px; color:#fff !important; # background-color: green !important; -} +} /* Reciept Style */ #order-charges-table td { @@ -298,13 +298,6 @@ select.form-control { /* Discount */ -.discount-item-row { - cursor: pointer; -} - -tr.discount-item-row:hover { - background-color: #e3e3e3 !important; -} .required abbr{ color: red !important; } @@ -336,11 +329,11 @@ tr.discount-item-row:hover { z-index: 1100; } -#sxModal-Content { +#sxModal-Content { position: relative; left: 42%; top: 30%; - background-color: #32ad1a; + background-color: #32ad1a; color: #fff; text-align: center; width: 200px; @@ -373,7 +366,7 @@ tr.discount-item-row:hover { opacity: 1; filter: alpha(opacity=100); /* ie */ -moz-opacity: 1; /* mozilla */ - + } /* For Payment Page */ @@ -465,7 +458,7 @@ iframe { } .tax-btn-box { - width: 230px; + width: 230px; height: 80px; } @@ -518,12 +511,12 @@ nav.pagination .page a:hover, opacity: 1; z-index: 101; filter: alpha(opacity=100); /* ie */ - -moz-opacity: 1; /* mozilla */ + -moz-opacity: 1; /* mozilla */ } .existing_invoice{ background-color:#ffab51; color:#fff; - + } @@ -628,7 +621,7 @@ nav.pagination .page a:hover, span.round-tab:hover{ color: white; border: 1px solid #fff; - background-color:#2196F3; + background-color:#2196F3; } .wizard .nav-tabs > li { width: 25%; @@ -656,6 +649,81 @@ nav.pagination .page a:hover, /*customer modal UI */ .payment-btn-box { - width: 130px; + width: 130px; height: 50px; -} \ No newline at end of file +} + +@media screen and (max-width: 785px) { + section.content{ + margin: 80px 15px 0 225px; + } + + .mbl_view{ + display: none; + } + + .navbar-brand-txt{ + margin-top: -15px; + } + + .toggle_mbl { + text-align: right; + } + + .toggle_mbl img{ + width: 24px; + margin-bottom: 14px; + } + + .toggle_mbl a:hover, a:focus{ + background-color: unset; + } + + .col-mbl-view{ + width: 50%; + } + + .info-box .icon{ + display: none; + } + + .mbl_product_div{ + display: none; + } + + .sidebar .menu{ + top: 10px; + } + + .page-header{ + width: 100% !important; + } + + .ls-closed .bars:after, .ls-closed .bars:before{ + top: 14px; + } + + .mbl_card{ + width: 100% !important; + } + + .mbl_lbl{ + display: none; + } + + .mbl-style{ + padding: 10px 10px; + } + + .m-auto{ + width: 33%; + } + + .online_order{ + text-align: right; + } + + .mbl-right-btn{ + text-align: right; + } +} diff --git a/app/assets/stylesheets/sx_font.css b/app/assets/stylesheets/sx_font.css index b8b08f2a..b08657e5 100755 --- a/app/assets/stylesheets/sx_font.css +++ b/app/assets/stylesheets/sx_font.css @@ -39,4 +39,4 @@ /* Support for IE. */ font-feature-settings: 'liga'; -} \ No newline at end of file +} diff --git a/app/controllers/api/api_controller.rb b/app/controllers/api/api_controller.rb index a5112ffe..ad38376a 100755 --- a/app/controllers/api/api_controller.rb +++ b/app/controllers/api/api_controller.rb @@ -1,5 +1,5 @@ class Api::ApiController < ActionController::API - include TokenVerification + # include TokenVerification # before_action :lookup_domain helper_method :current_token, :current_login_employee, :get_cashier diff --git a/app/controllers/api/bill_controller.rb b/app/controllers/api/bill_controller.rb index b5cb5573..7a00666a 100755 --- a/app/controllers/api/bill_controller.rb +++ b/app/controllers/api/bill_controller.rb @@ -19,13 +19,12 @@ class Api::BillController < Api::ApiController # for Multiple Cashier by Zone table = DiningFacility.find(booking.dining_facility_id) - bk_order = BookingOrder.find_by_booking_id(booking.booking_id) - order = Order.find(bk_order.order_id) - + order = booking.orders.first + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first - + #for multiple zone with terminal if !shift.nil? cashier = Employee.find(shift.employee_id) @@ -40,65 +39,59 @@ class Api::BillController < Api::ApiController end end - if booking - if booking.sale_id.nil? - @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee, cashier, order.source) - @sale_data = Sale.find_by_sale_id(@sale_id) - else - @status = true - @sale_id = booking.sale_id - @sale_data = Sale.find_by_sale_id(@sale_id) - end + if @sale_data = booking.sale + @status = true + elsif @sale_data = Sale.generate_invoice_from_booking(booking, current_login_employee, cashier, order.source, params[:current_checkin_induties_count]) + @status = true + else + @status = false end end else - @status = false + @status = false @error_message = "There is no order for '#{params[:booking_id]}'" end - elsif (params[:order_id]) - order = Order.find(params[:order_id]) - @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, order.source) - - # for Job - booking = Booking.find_by_sale_id(@sale_id) - table = DiningFacility.find(booking.dining_facility_id) + # elsif (params[:order_id]) + # order = Order.find(params[:order_id]) + # @status, @sale_id = Sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, order.source) + # + # # for Job + # booking = Booking.find_by_sale_id(@sale_id) + # table = DiningFacility.find(booking.dining_facility_id) end - + # Bind shift sale id to sale # @sale_data.shift_sale_id = shift_by_terminal.id # @sale_data.save - if @status + if @sale_data #check checkInOut pdf print - check_booking = Booking.find_by_sale_id(@sale_id) checkout_time = Lookup.collection_of('checkout_time') - terminal = DiningFacility.find_by_id(check_booking.dining_facility_id) + terminal = DiningFacility.find_by_id(booking.dining_facility_id) cashier_terminal = CashierTerminal.find_by_id(terminal.zone_id) if (!checkout_time.empty?) && (ENV["SERVER_MODE"] != "cloud") #no print in cloud server - + unique_code = "CheckInOutPdf" printer = PrintSetting.find_by_unique_code(unique_code) - # print when complete click + # print when complete click order_queue_printer = Printer::OrderQueuePrinter.new(printer) if !printer.nil? - order_queue_printer.print_check_in_out(printer,cashier_terminal , check_booking, table) + order_queue_printer.print_check_in_out(printer,cashier_terminal , booking, table) end - end + end - Promotion.promo_activate(@sale) + Promotion.promo_activate(@sale_data) #BillBroadcastJob.perform_later(table) if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end - ActionCable.server.broadcast "bill_channel",table: table, from: from - end + ActionCable.server.broadcast "bill_channel",table: table, from: from + end else @status = false @error_message = "No Current Open Shift" @@ -131,7 +124,7 @@ class Api::BillController < Api::ApiController #member_info = Customer.get_member_account(customer) # printer = Printer::ReceiptPrinter.new(print_settings) - # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) + # printer.print_receipt_bill(print_settings, false, nil,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details) end def request_bill @@ -139,7 +132,7 @@ class Api::BillController < Api::ApiController is_extra_time = false extra_time = '' - # params[:order_items].each { |i| + # params[:order_items].each { |i| # i["item_instance_code"] = i["item_instance_code"].downcase.to_s # if i["item_instance_code"].include? "ext" # is_extra_time = true @@ -175,18 +168,16 @@ class Api::BillController < Api::ApiController booking_order = BookingOrder.find_by_booking_id(@booking.booking_id) order = Order.find(booking_order.order_id) - if @booking.sale_id.nil? - @sale = Sale.new - @status, @sale_id = @sale.generate_invoice_from_booking(@booking.booking_id, current_login_employee, cashier, order.source) - @sale_data = Sale.find_by_sale_id(@sale_id) - else + if @sale_data = @booking.sale @status = true - @sale_id = @booking.sale_id - @sale_data = Sale.find_by_sale_id(@sale_id) + elsif @sale_data = Sale.generate_invoice_from_booking(@booking, current_login_employee, cashier, order.source,params[:current_checkin_induties_count]) + @status = true + else + @status = false end end - # Promotion.promo_activate(@sale) - @status = true + # Promotion.promo_activate(@sale) + # @status = true # render json: JSON.generate({:status => true, :sale_id => @sale_id, :sale_data => @sale_data.to_json }) else @status = false @@ -197,7 +188,7 @@ class Api::BillController < Api::ApiController @status = false @error_message = "Create order failed, some error occurred!" # render json: JSON.generate({:status => false, :error_message => "Create order failed, some error occurred!"}) - end + end else @status = false @error_message = "Parameters missing!" diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index c893bb64..bd2c3e18 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -47,8 +47,12 @@ class Api::OrdersController < Api::ApiController # end @shop = Shop.first + puts "Hello world" + puts @shop.to_json + return @shop.to_json end + # Description # This API allow new order creation # Input Params @@ -62,11 +66,22 @@ class Api::OrdersController < Api::ApiController Rails.logger.debug "Table ID - " + params[:table_id].to_s if checkin_checkout_time(params[:booking_id]) + + if params[:booking_id].present? + booking = Booking.find(params[:booking_id]) + end + if params[:table_id].present? + if booking.nil? || booking.dining_facility_id.to_i != params[:table_id].to_i + table = DiningFacility.find(params[:table_id]) + booking = table.get_current_booking + end + end + #for extratime is_extra_time = false extra_time = '' - params[:order_items].each { |i| + params[:order_items].each { |i| i["item_instance_code"] = i["item_instance_code"].downcase.to_s if i["item_instance_code"].include? "ext" is_extra_time = true @@ -78,8 +93,7 @@ class Api::OrdersController < Api::ApiController end } #end extra time - puts params[:order_items] - puts "ORDER ITEMS" + # begin @order = Order.new @order.source = params[:order_source] @@ -94,51 +108,26 @@ class Api::OrdersController < Api::ApiController @order.is_extra_time = is_extra_time @order.extra_time = extra_time - #Create Table Booking or Room Booking - if !params["booking_id"].nil? - # check booking id is already completed. - booking = Booking.find(params[:booking_id]) - if booking - if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved' - if !booking.sale_id.nil? - sale_status = check_order_with_booking(booking) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - else - @order.new_booking = false - @order.booking_id = params[:booking_id] - end - else - sale_status = check_order_with_table(params[:table_id]) + #Create Table Booking or Room Booking + if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved' + @order.new_booking = true + else + @order.new_booking = false + @order.booking_id = booking.booking_id + end - if sale_status - return return_json_status_with_code(400, "bill requested") - end - end - end #booking exists - else - sale_status = check_order_with_table(params[:table_id]) - - if sale_status - # return false , @message = "bill requested" - return return_json_status_with_code(400, "bill requested") - end - end - - @status, @booking = @order.generate - if @status && @booking - Order.process_order_queue(@order.order_id,@order.table_id,@order.source) - end - if @order.table_id.to_i > 0 - table = DiningFacility.find(@booking.dining_facility_id) - type = 'order' - from = getCloudDomain #get sub domain in cloud mode - ActionCable.server.broadcast "order_channel",table: table,type:type,from:from - - end - # # for parallel order + @status, @booking = @order.generate + if @status && @booking + Order.process_order_queue(@order.order_id,@order.table_id,@order.source) + end + if @order.table_id.to_i > 0 + table = DiningFacility.find(@booking.dining_facility_id) + type = 'order' + from = getCloudDomain #get sub domain in cloud mode + ActionCable.server.broadcast "order_channel",table: table,type:type,from:from + end + # # for parallel order # remoteIP = "" # begin # @status, @booking = @order.generate @@ -207,12 +196,9 @@ class Api::OrdersController < Api::ApiController def checkin_checkout_time(booking_id) status = true if !booking_id.nil? - today = Time.now.utc - booking = Booking.find(booking_id) - if !booking.nil? - if !booking.checkout_at.nil? - checkout_time = booking.checkout_at.utc - if checkout_time <= today + if booking = Booking.find(booking_id) + if booking.checkout_at.present? + if booking.checkout_at.utc <= Time.now.utc status = false end end @@ -252,11 +238,11 @@ class Api::OrdersController < Api::ApiController oqs = assign_item.order_queue_station printer = PrintSetting.all - + unique_code="OrderItemPdf" if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderItemPdf' + if printer_setting.unique_code == 'OrderItemPdf' unique_code="OrderItemPdf" elsif printer_setting.unique_code == 'OrderItemSlimPdf' unique_code="OrderItemSlimPdf" @@ -268,9 +254,9 @@ class Api::OrdersController < Api::ApiController unique_code="OrderItemCustomisePdf" elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' unique_code="OrderSetItemCustomisePdf" - end + end end - end + end print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) @@ -297,6 +283,5 @@ class Api::OrdersController < Api::ApiController return from end - -end +end diff --git a/app/controllers/api/payment/callback_controller.rb b/app/controllers/api/payment/callback_controller.rb new file mode 100644 index 00000000..89162fc4 --- /dev/null +++ b/app/controllers/api/payment/callback_controller.rb @@ -0,0 +1,18 @@ +class Api::Payment::CallbackController < Api::ApiController + + skip_before_action :authenticate + + def kbzpay + Rails.logger.info params[:Request] + callback_value = params[:Request] + trade_status = params[:Request][:trade_status] + total_amount = params[:Request][:total_amount] + if trade_status == "PAY_SUCCESS" + merch_order_id = params[:Request][:merch_order_id] + + status, filename, sale_receipt_no, printer_name = Payment.pay(getCloudDomain, cash, sale_id, member_info, type, tax_type, path, latest_order_no, shop_detail, current_user, 'kbzpay', merch_order_id) + render json: JSON.generate({:status => status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name}) + end + end + +end diff --git a/app/controllers/api/payment/mobilepayment_controller.rb b/app/controllers/api/payment/mobilepayment_controller.rb new file mode 100644 index 00000000..220cbbeb --- /dev/null +++ b/app/controllers/api/payment/mobilepayment_controller.rb @@ -0,0 +1,56 @@ +class Api::Payment::MobilepaymentController < Api::ApiController + + # skip_before_action :authenticate + + def cash + + cash = params[:cash] + sale_id = params[:sale_id] + cashier_id = params[:cashier_id] + + current_user = Employee.find(cashier_id) + + if(Sale.exists?(sale_id)) + + saleObj = Sale.find(sale_id) + sale_items = SaleItem.get_all_sale_items(sale_id) + shop_detail = Shop.first + + # rounding adjustment + if !path.include? ("credit_payment") + if shop_detail.is_rounding_adj + a = saleObj.grand_total % 25 # Modulus + b = saleObj.grand_total / 25 # Division + #not calculate rounding if modulus is 0 and division is even + #calculate rounding if modulus is zero or not zero and division are not even + if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) + + new_total = Sale.get_rounding_adjustment(saleObj.grand_total) + rounding_adj = new_total-saleObj.grand_total + saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) + + end + end + end + # end rounding adjustment + + sale_payment = SalePayment.new + + sale_payment =sale_payment.process_payment(saleObj, current_user, cash, "cash") + if sale_payment[0] + @cash ={"change_amount"=>sale_payment[3],"balance_amount"=>sale_payment[4] ,"receipt_url"=>''} + end + @out = true,@cash + + else + @out =false,"Something wrong!" + sale_payment = SalePayment.new + sale_payment = sale_payment.process_payment(saleObj, current_user, cash, "cash") + if sale_payment[0] + @cash = {"change_amount"=>sale_payment[3],"balance_amount"=>sale_payment[4] ,"receipt_url"=>''} + end + end + + end + +end diff --git a/app/controllers/api/payments_controller.rb b/app/controllers/api/payments_controller.rb index 2f67a484..521f58a3 100755 --- a/app/controllers/api/payments_controller.rb +++ b/app/controllers/api/payments_controller.rb @@ -31,7 +31,7 @@ class Api::PaymentsController < Api::ApiController if @status sale_payment = SalePayment.new status, @sale, @membership_data = sale_payment.process_payment(sale, current_login_employee, sale.grand_total, "paymal",params[:card_no]) - + if status == true && @membership_data["status"] == true sale_payment = SalePayment.new status = sale_payment.process_payment(sale, current_login_employee, 0, "cash") @@ -95,7 +95,7 @@ class Api::PaymentsController < Api::ApiController @message = membership_data["message"] end else - @status = false + @status = false @message = "No gateway url!" end diff --git a/app/controllers/api/sync_controller.rb b/app/controllers/api/sync_controller.rb new file mode 100644 index 00000000..52db7245 --- /dev/null +++ b/app/controllers/api/sync_controller.rb @@ -0,0 +1,20 @@ +class Api::SyncController < Api::ApiController + + def sync_data + # Here comes to save the sync records. + Order.sync_order_records(params[:orders]) + OrderItem.sync_order_item_records(params[:order_items]) + SaleOrder.sync_sale_order_records(params[:sale_orders]) + Sale.sync_sale_records(params[:sales]) + SaleItem.sync_sale_item_records(params[:sale_items]) + SaleAudit.sync_sale_audit_records(params[:sale_audits]) + SalePayment.sync_sale_payment_records(params[:sale_payments]) + SaleTax.sync_sale_tax_records(params[:sale_taxes]) + ShiftSale.sync_shift_sale_records(params[:shift_sales]) + Booking.sync_booking_records(params[:bookings]) + AssignedOrderItem.sync_assigned_order_item_records(params[:assigned_order_items]) + SeedGenerator.sync_seed_generator_records(params[:seed_generators]) + + # render :json => { :status => true, :message => "Hello!" } + end +end \ No newline at end of file diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 0af08e5d..2f846601 100644 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -1,35 +1,77 @@ class Crm::CustomersController < BaseCrmController load_and_authorize_resource except: [:create] - before_action :set_crm_customer, only: [:show, :edit, :update, :destroy] + before_action :set_crm_customer, only: [:show, :edit, :update, :destroy,:sync] # GET /crm/customers # GET /crm/customers.json def index + @no_need_validation =false filter = params[:filter] + filter_card_no = params[:filter_card_no] type = params[:type] - if filter.nil? + @customer_update_phone_email_membertype =false + if filter_card_no=="" + @crm_customers = Customer.all + elsif !filter_card_no.nil? + @crm_customers=Customer.where("card_no=?",filter_card_no) + elsif filter.nil? || filter_card_no=="" @crm_customers = Customer.all else @crm_customers = Customer.search(filter) + # paymal_customer = Customer.search_paypar_account_no(filter) # search account no from paypar - if !@crm_customers.present? && type == "card" - response = Customer.search_paypar_account_no(filter) - if response["status"] == true - @crm_customers = Customer.new - @crm_customers.name = response["customer_data"]["name"] - @crm_customers.contact_no = response["customer_data"]["phone"] - @crm_customers.email = response["customer_data"]["email"] - @crm_customers.date_of_birth = response["customer_data"]["DOB"] - @crm_customers.nrc_no = response["customer_data"]["NRC"] - @crm_customers.address = response["customer_data"]["address"] - @crm_customers.card_no = response["customer_data"]["customer_card_no"] - @crm_customers.paypar_account_no = filter - @crm_customers.membership_id = response["customer_data"]["id"] - @crm_customers.membership_type = response["customer_data"]["member_group_id"] - @crm_customers.customer_type = "Dinein" - @crm_customers.tax_profiles = ["1", "2"] - @crm_customers.save - @crm_customers = Customer.search(filter) + if type == "card" + + response = Customer.search_paypar_account_no(filter) + if !@crm_customers.present? + if response["status"] == true + @crm_customers = Customer.new + @crm_customers.name = response["customer_data"]["name"] + @crm_customers.contact_no = response["customer_data"]["phone"] + @crm_customers.email = response["customer_data"]["email"] + @crm_customers.date_of_birth = response["customer_data"]["DOB"] + @crm_customers.nrc_no = response["customer_data"]["NRC"] + @crm_customers.address = response["customer_data"]["address"] + @crm_customers.card_no = response["customer_data"]["customer_card_no"] + @crm_customers.paypar_account_no = filter + @crm_customers.membership_id = response["customer_data"]["id"] + @crm_customers.membership_type = response["customer_data"]["member_group_id"] + @crm_customers.customer_type = "Dinein" + @crm_customers.tax_profiles = ["1", "2"] + @crm_customers.save + @crm_customers = Customer.search(filter) + flash[:member_notice]='Customer was successfully created.' + else + flash[:member_error]=response["message"] + end + else + if response["status"] ==true + @crm_customers.each do |customer| + if !response["customer_data"].nil? + if customer.contact_no != response["customer_data"]["phone"] + @customer_update_phone_email_membertype =true + end + if customer.email != response["customer_data"]["email"] + @customer_update_phone_email_membertype =true + end + if customer.name != response["customer_data"]["name"] + @customer_update_phone_email_membertype =true + end + if customer.membership_type.to_i != response["customer_data"]["member_group_id"] + @customer_update_phone_email_membertype =true + end + else + flash[:member_error]=response["message"] + end + end + else + if response["message"] =='No internet connection ' + flash[:member_error]=response["message"] + else + flash[:member_error]="Need to press sync button " + end + + end end end end @@ -64,6 +106,7 @@ class Crm::CustomersController < BaseCrmController # if flash["errors"] # @crm_customer.valid? # end + # puts @crm_customers.to_json respond_to do |format| format.html # index.html.erb format.json { render json: @crm_customers } @@ -115,7 +158,98 @@ class Crm::CustomersController < BaseCrmController def edit @customer = Customer.find(params[:id]) end + def sync + @customer = Customer.find(params[:id]) + respond_to do |format| + name = @customer.name + phone = @customer.contact_no + email = @customer.email + dob = @customer.date_of_birth + address = @customer.address + nrc = @customer.nrc_no + card_no = @customer.card_no + paypar_account_no = @customer.paypar_account_no + id = @crm_customer.membership_id + member_group_id = @customer.membership_type + if !id.present? && !member_group_id.nil? + membership = MembershipSetting.find_by_membership_type("paypar_url") + memberaction = MembershipAction.find_by_membership_type("create_membership_customer") + merchant_uid = memberaction.merchant_account_id.to_s + auth_token = memberaction.auth_token.to_s + url = membership.gateway_url.to_s + memberaction.gateway_url.to_s + member_params = { name: name,phone: phone,email: email, + dob: dob,address: address,nrc:nrc,card_no:card_no, + member_group_id: member_group_id, + id:id, + merchant_uid:merchant_uid,auth_token:auth_token}.to_json + + # Check for paypar account exists + # if paypar_account_no != nil || paypar_account_no != '' + if paypar_account_no.present? + member_params = { name: name,phone: phone,email: email, + dob: dob,address: address,nrc:nrc,card_no:card_no, + paypar_account_no: paypar_account_no, + member_group_id: member_group_id, + id:id, + merchant_uid:merchant_uid,auth_token:auth_token}.to_json + end + + begin + response = HTTParty.post(url, + :body => member_params, + :headers => { + 'Content-Type' => 'application/json', + 'Accept' => 'application/json; version=3' + }, + :timeout => 10 + ) + + rescue HTTParty::Error + response = {"status" => false, "message" => "No internet connection "} + + rescue Net::OpenTimeout + response = {"status" => false, "message" => "No internet connection "} + + rescue OpenURI::HTTPError + response = {"status" => false, "message" => "No internet connection "} + + rescue SocketError + response = {"status" => false, "message" => "No internet connection "} + end + customer = Customer.find(@crm_customer.customer_id) + Rails.logger.debug "--------Sync Member response -------" + Rails.logger.debug response.to_json + if response["status"] == true + + status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) + + format.html { redirect_to crm_customers_path } + flash[:member_notice] ='Member was successfully synced' + else + # Check membership id and bind to user + if response["membership_id"] != nil + status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) + format.html { redirect_to crm_customers_path } + flash[:member_notice] ='Member was successfully synced' + else + status = customer.update_attributes(membership_type:member_group_id) + end + # When paypar account no not exist in paypar + if response["message"] == "Account does not exist." + customer.destroy + format.html { redirect_to crm_customers_path } + flash[:member_error] ='Member cannot created.Invalid Account.' + else + format.html { redirect_to crm_customers_path } + flash[:member_error] =response["message"] + end + format.html { redirect_to crm_customers_path } + flash[:member_error] =response["message"] + end + end + end + end # POST /crm/customers # POST /crm/customers.json def create @@ -160,7 +294,7 @@ class Crm::CustomersController < BaseCrmController paypar_account_no: paypar_account_no, member_group_id: member_group_id, merchant_uid:merchant_uid,auth_token:auth_token}.to_json - end + end begin response = HTTParty.post(url, @@ -173,16 +307,16 @@ class Crm::CustomersController < BaseCrmController ) rescue HTTParty::Error - response = {"status" => false, "message" => "Can't open membership server "} + response = {"status" => false, "message" => "No internet connection "} rescue Net::OpenTimeout - response = {"status" => false, "message" => "Can't open membership server "} + response = {"status" => false, "message" => "No internet connection "} rescue OpenURI::HTTPError - response = {"status" => false, "message" => "Can't open membership server "} + response = {"status" => false, "message" => "No internet connection "} rescue SocketError - response = {"status" => false, "message" => "Can't open membership server "} + response = {"status" => false, "message" => "No internet connection "} end Rails.logger.debug "--------------Create Member---------" Rails.logger.debug response.to_json @@ -191,9 +325,11 @@ class Crm::CustomersController < BaseCrmController status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' } + format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page] } + flash[:member_notice]='Member was successfully created.' else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'} + format.html { redirect_to crm_customers_path } + flash[:member_notice]='Member was successfully created.' end # format.json { render :index, status: :created, location: @crm_customers } else @@ -202,24 +338,31 @@ class Crm::CustomersController < BaseCrmController # Check membership id and bind to user if response["membership_id"] != nil status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) + format.html { redirect_to crm_customers_path } + flash[:member_notice]='Member was successfully created.' else status = customer.update_attributes(membership_type:member_group_id) end - # When paypar account no not exist in paypar - if response["message"] == "Account has not exist." + if response["message"] == "Account does not exist." customer.destroy if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer cannot created.' + response["message"]} + format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page] } + flash[:member_error]='Member cannot created.Invalid Account.' else - format.html { redirect_to crm_customers_path, notice: 'Customer cannot created.' + response["message"] } + format.html { redirect_to crm_customers_path } + flash[:member_error]='Member cannot created.Invalid Account.' end - end - - if params[:sale_id] - format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page], notice: 'Customer was successfully created.' + response["message"]} else - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' } + format.html { redirect_to crm_customers_path } + flash[:member_error]=response["message"] + end + if params[:sale_id] + format.html { redirect_to '/origami/'+params[:sale_id]+'/'+params[:type]+'/customers/'+params[:page] } + flash[:member_notice]='Member was successfully created.' + response["message"] + else + format.html { redirect_to crm_customers_path } + # flash[:member_notice]='Member was successfully created.' end end else @@ -312,14 +455,17 @@ class Crm::CustomersController < BaseCrmController }, :timeout => 10 ) + rescue HTTParty::Error + response = {"status" => false, "message" => "No internet connection "} + rescue Net::OpenTimeout - response = { status: false } + response = {"status" => false, "message" => "No internet connection "} rescue OpenURI::HTTPError - response = { status: false} + response = {"status" => false, "message" => "No internet connection "} rescue SocketError - response = { status: false} + response = {"status" => false, "message" => "No internet connection "} end customer = Customer.find(@crm_customer.customer_id) Rails.logger.debug "--------Update Member response -------" @@ -328,16 +474,19 @@ class Crm::CustomersController < BaseCrmController status = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id ) - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated'} + format.html { redirect_to crm_customers_path } + flash[:member_notice]='Member was successfully updated' else # Check membership id and bind to user if response["membership_id"] != nil status = customer.update_attributes(membership_id: response["membership_id"],membership_type:member_group_id ) + format.html { redirect_to crm_customers_path } + flash[:member_notice]='Member was successfully updated' else status = customer.update_attributes(membership_type:member_group_id) + format.html { redirect_to crm_customers_path } + flash[:member_error]=response["message"] end - - format.html { redirect_to crm_customers_path, notice: response["error"] } end else membership = MembershipSetting.find_by_membership_type("paypar_url") @@ -371,14 +520,17 @@ class Crm::CustomersController < BaseCrmController }, :timeout => 10 ) + rescue HTTParty::Error + response = {"status" => false, "message" => "No internet connection "} + rescue Net::OpenTimeout - response = { status: false } + response = {"status" => false, "message" => "No internet connection "} rescue OpenURI::HTTPError - response = { status: false} + response = {"status" => false, "message" => "No internet connection "} rescue SocketError - response = { status: false} + response = {"status" => false, "message" => "No internet connection "} end Rails.logger.debug "--------Update Member response -------" Rails.logger.debug response.to_json @@ -390,7 +542,8 @@ class Crm::CustomersController < BaseCrmController else status = customer.update_attributes(membership_type:member_group_id ) end - format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' } + format.html { redirect_to crm_customers_path } + flash[:member_notice] ='Member was successfully updated.' format.json { render :show, status: :ok, location: @crm_customer } else customer = Customer.find(@crm_customer.customer_id) @@ -400,7 +553,8 @@ class Crm::CustomersController < BaseCrmController else status = customer.update_attributes(membership_type:member_group_id ) end - format.html { redirect_to crm_customers_path, notice: response["message"] } + format.html { redirect_to crm_customers_path } + flash[:member_error] =response["message"] end end else @@ -433,6 +587,24 @@ class Crm::CustomersController < BaseCrmController end end + def customer_update_phone_email_member_type + @customer = Customer.find(params[:id]) + response = Customer.search_paypar_account_no(@customer.paypar_account_no) + if response["status"] == true + @customer.name =response["customer_data"]["name"] + @customer.contact_no =response["customer_data"]["phone"] + @customer.email =response["customer_data"]["email"] + @customer.membership_type =response["customer_data"]["member_group_id"] + @customer.save + respond_to do |format| + format.html { redirect_to crm_customers_path } + flash[:member_notice]='Membership was successfully updated' + end + end + + + end + private # Use callbacks to share common setup or constraints between actions. def set_crm_customer @@ -447,3 +619,4 @@ class Crm::CustomersController < BaseCrmController end end + diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb index 32344c77..49b4ff5d 100755 --- a/app/controllers/home_controller.rb +++ b/app/controllers/home_controller.rb @@ -1,11 +1,11 @@ -class HomeController < ApplicationController +class HomeController < ApplicationController # layout "application", except: [:index, :show] - # skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] + # skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy] before_action :check_user, only: :dashboard # Special check for only dashboard - def check_user + def check_user if current_user.nil? redirect_to root_path end @@ -42,8 +42,8 @@ class HomeController < ApplicationController route_by_role(@employee) else flash[:notice] ="Invalid PIN for Employee. Please try again!" - render :show - end + render :show + end end def create @@ -117,7 +117,8 @@ class HomeController < ApplicationController @hourly_sales = Sale.hourly_sales(today,current_user,@from,@to,@from_time,@to_time).sum(:grand_total) # .group_by_hour(:created_at, :time_zone => 'Asia/Rangoon',format: '%I:%p') # .sum(:grand_total) - + logger.debug 'hourly_sales<>><><><<<<<<>><<<><><><><><><><><><<>><' + logger.debug @hourly_sales.to_json employee_sales = Sale.employee_sales(today,current_user,@from,@to,@from_time,@to_time) # .sum("(CASE WHEN sp.payment_method='cash' THEN ((sp.payment_amount) - (sales.amount_changed)) ELSE (sp.payment_amount) END)") @employee_sales = [] @@ -145,7 +146,7 @@ class HomeController < ApplicationController if payment.payment_method == "mpu" || payment.payment_method == "visa" || payment.payment_method == "master" || payment.payment_method == "jcb" || payment.payment_method == "unionpay" || payment.payment_method == "alipay" pay = Sale.payment_sale('card', today, current_user,@from,@to,@from_time,@to_time) @sale_data.push({'card' => pay.payment_amount}) - else + else pay = Sale.payment_sale(payment.payment_method, today, current_user,@from,@to,@from_time,@to_time) @sale_data.push({payment.payment_method => pay.payment_amount}) end @@ -154,7 +155,7 @@ class HomeController < ApplicationController @summ_sale = Sale.summary_sale_receipt(today,current_user,@from,@to,@from_time,@to_time) @total_customer, @total_dinein, @total_takeaway, @total_membership = Sale.total_customer(today,current_user,@from,@to,@from_time,@to_time) # @total_other_customer = Sale.total_other_customer(today,current_user) - + @total_order = Sale.total_order(today,current_user,@from,@to,@from_time,@to_time) @total_accounts = Sale.total_account(today,current_user,@from,@to,@from_time,@to_time) @account_data = Array.new @@ -168,7 +169,7 @@ class HomeController < ApplicationController end @top_items = Sale.top_items(today,current_user,@from,@to,@from_time,@to_time) - @total_foc_items = Sale.total_foc_items(today,current_user,@from,@to,@from_time,@to_time) + @total_foc_items = Sale.total_foc_items(today,current_user,@from,@to,@from_time,@to_time) # get printer info @print_settings = PrintSetting.get_precision_delimiter() @@ -231,7 +232,7 @@ class HomeController < ApplicationController def get_date_range_from_params from = params[:from] - to = params[:to] + to = params[:to] from_time = params[:from_time] to_time = params[:to_time] @@ -243,8 +244,8 @@ class HomeController < ApplicationController # from = f_time.beginning_of_day.utc.getlocal # to = t_time.end_of_day.utc.getlocal - from = DateTime.parse(from).utc.getlocal.strftime('%Y-%m-%d') - to = DateTime.parse(to).utc.getlocal.strftime('%Y-%m-%d') + from = DateTime.parse(from).utc.getlocal.strftime('%Y-%m-%d') + to = DateTime.parse(to).utc.getlocal.strftime('%Y-%m-%d') end return from, to, from_time, to_time diff --git a/app/controllers/induties/assign_in_duties_controller.rb b/app/controllers/induties/assign_in_duties_controller.rb new file mode 100644 index 00000000..528c009f --- /dev/null +++ b/app/controllers/induties/assign_in_duties_controller.rb @@ -0,0 +1,71 @@ +class Induties::AssignInDutiesController < ApplicationController + def index + @commissioners =[] + @commiss=Commissioner.active.all.order(created_at: :desc) + @commiss.each do|commissioner| + check_in_count =InDuty.where('commissioner_ids =? and out_time is null', commissioner.id.to_json).count; + @commissioners.push({ "id"=>commissioner.id, + "name"=>commissioner.name, + "image_path"=>commissioner.image_path.url, + "check_in_count"=>check_in_count + }) + + end + @booking_id = params[:booking_id] + + end + + def get_all_occupied_dining + commissionerIds =params[:id] + @check_in_commissioner =InDuty.select("in_duties.*,dining_facilities.type as dinning_type") + .joins(" LEFT JOIN dining_facilities on dining_facilities.id = in_duties.dinning_id").where('commissioner_ids =? and out_time is null', commissionerIds).order(created_at: :asc); + respond_to do |format| + format.json { render json: @check_in_commissioner.to_json } + end + end + def induties_create + commissioner_ids =params[:commissionerId] + booking_id =params[:booking_id] + dinning_id = params[:dinning_id] + induty = InDuty.new + induty.dinning_id = dinning_id + induty.booking_id = booking_id + induty.commissioner_ids = commissioner_ids + induty.by_name = params[:by_name] + induty.in_time = Time.now.utc + if induty.save + dinning = DiningFacility.find(induty.dinning_id) + @induty= {"id"=>induty.id, + "dinning_id"=>induty.dinning_id, + "in_time"=>induty.in_time, + "out_time"=>induty.out_time, + "dinning_type"=>dinning.type } + respond_to do |format| + format.json { render json: @induty.to_json } + end + end + end + def induties_checkout + induty_id = params[:induty_id] + induty = InDuty.find(induty_id) + induty.out_time = Time.now.utc + induty.save + @induty =induty + respond_to do |format| + format.json { render json: @induty.to_json } + end + end + def induties_remove + induty_id = params[:induty_id] + induty = InDuty.find(induty_id) + induty.destroy + end + def get_current_booking + @current_booking =InDuty.select("in_duties.*,dining_facilities.type as dinning_type") + .joins(" LEFT JOIN dining_facilities on dining_facilities.id = in_duties.dinning_id").where('booking_id =? and out_time is null', params[:booking_id]).order(created_at: :asc); + respond_to do |format| + format.json { render json: @current_booking.to_json } + end + end + +end diff --git a/app/controllers/inventory/inventory_controller.rb b/app/controllers/inventory/inventory_controller.rb index d987a59d..a0324b15 100755 --- a/app/controllers/inventory/inventory_controller.rb +++ b/app/controllers/inventory/inventory_controller.rb @@ -7,20 +7,22 @@ class Inventory::InventoryController < BaseInventoryController @inventory_definitions = InventoryDefinition.get_by_category(filter) end - + def show inventory_definition_id = params[:inventory_definition_id] inventory = InventoryDefinition.find(inventory_definition_id) - @stock_journals = StockJournal.where(item_code: inventory.item_code) + @stock_journals = StockJournal.where(item_code: inventory.item_code).order("id DESC") @stock_journals = Kaminari.paginate_array(@stock_journals).page(params[:page]).per(20) - + respond_to do |format| format.html format.xls end end + + #Shop Name in Navbor helper_method :shop_detail def shop_detail diff --git a/app/controllers/inventory/inventory_definitions_controller.rb b/app/controllers/inventory/inventory_definitions_controller.rb index 4491669e..01ca52b3 100755 --- a/app/controllers/inventory/inventory_definitions_controller.rb +++ b/app/controllers/inventory/inventory_definitions_controller.rb @@ -14,7 +14,7 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController # GET /inventory_definitions/new def new - @menus = Menu.all + @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') @inventory_definition = InventoryDefinition.new end @@ -28,7 +28,7 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController def create inventory = InventoryDefinition.find_by_item_code(params[:item_code]) if inventory.nil? - + @inventory_definition = InventoryDefinition.new @inventory_definition.item_code = params[:item_code] @inventory_definition.min_order_level = params[:min_order_level] @@ -83,11 +83,24 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController # DELETE /inventory_definitions/1 # DELETE /inventory_definitions/1.json def destroy + inventory = InventoryDefinition.find_by_item_code(params[:item_code]) @inventory_definition.destroy respond_to do |format| format.html { redirect_to inventory_definitions_url, notice: 'Inventory definition was successfully destroyed.' } format.json { head :no_content } end + + inventory = InventoryDefinition.find(params[:id]) + StockJournal.delete_stock_journal(inventory.item_code) + StockCheckItem.delete_stock_check_item(inventory.item_code) + if !inventory.nil? + inventory.destroy + flash[:message] = 'Inventory was successfully destroyed.' + render :json => {:status=> "Success", :url => inventory_url }.to_json + else + flash[:error] = 'Inventory could not destroy! This record is using in somewhere.' + render :json => {:status=> "Error", :url => inventory_url }.to_json + end end #Shop Name in Navbor diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index acdef9f8..c6e130ec 100644 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -38,22 +38,21 @@ class Oqs::EditController < BaseOqsController if ENV["SERVER_MODE"] != "cloud" #&& order.source == 'cashier' #no print in cloud server # print - assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id) + assigned_item = AssignedOrderItem.find_by_instance_code_and_order_id(order_item.item_instance_code, order_item.order_id) assigned_items = nil if !assigned_item.nil? assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") - end + end if !assigned_items.nil? assigned_items.each do |assign_item| # order queue stations oqs = assign_item.order_queue_station - printer = PrintSetting.all - - unique_code="OrderItemPdf" + printer = PrintSetting.all + unique_code= "" if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderItemPdf' + if printer_setting.unique_code == 'OrderItemPdf' unique_code="OrderItemPdf" elsif printer_setting.unique_code == 'OrderItemSlimPdf' unique_code="OrderItemSlimPdf" @@ -62,12 +61,14 @@ class Oqs::EditController < BaseOqsController elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' - unique_code="OrderSetItemCustomisePdf" + unique_code="OrderSetItemCustomisePdf" elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf' unique_code="OrderItemSlimCustomisePdf" - end + elsif printer_setting.unique_code == 'OrderItemStarPdf' + unique_code="OrderItemStarPdf" + end end - end + end print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb index 6a59025e..751e1c01 100755 --- a/app/controllers/oqs/print_controller.rb +++ b/app/controllers/oqs/print_controller.rb @@ -5,12 +5,14 @@ class Oqs::PrintController < ApplicationController # 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" + unique_code="OrderItemStarPdf" if !order_slim_pdf.empty? if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderItemPdf' + if printer_setting.unique_code == 'OrderItemPdf' unique_code="OrderItemPdf" + elsif printer_setting.unique_code == 'OrderItemStarPdf' + unique_code="OrderItemStarPdf" elsif printer_setting.unique_code == 'OrderItemSlimPdf' unique_code="OrderItemSlimPdf" elsif printer_setting.unique_code == 'OrderSetItemPdf' @@ -18,17 +20,17 @@ class Oqs::PrintController < ApplicationController elsif printer_setting.unique_code == 'OrderItemCustomisePdf' unique_code="OrderItemCustomisePdf" elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' - unique_code="OrderSetItemCustomisePdf" + unique_code="OrderSetItemCustomisePdf" elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf' unique_code="OrderItemSlimCustomisePdf" - end + end end end end assigned_item_id = params[:id] options = params[:options] - assigned_item = AssignedOrderItem.find(assigned_item_id) + assigned_item = AssignedOrderItem.find(assigned_item_id) assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") # order queue stations @@ -38,28 +40,28 @@ class Oqs::PrintController < ApplicationController # Check Printed print_status = assigned_item.print_status == true ? " (Re-Print)" : "" - # print when complete click + # print when complete click print_settings = PrintSetting.find_by_unique_code(unique_code) order_queue_printer = Printer::OrderQueuePrinter.new(print_settings) filename, receipt_no, cashier_printer = order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, "", options ) - + # update print status for completed same order items assigned_items.each do |ai| ai.print_status=true - ai.save + ai.save end - # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) + # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) if ENV["SERVER_MODE"] == "cloud" - result = { - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + result = { + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } # Mobile Print - render :json => result.to_json + render :json => result.to_json end - # end + # end end # Print Order Details with booking id @@ -71,7 +73,7 @@ class Oqs::PrintController < ApplicationController if !order_slim_pdf.empty? if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderSummaryPdf' + if printer_setting.unique_code == 'OrderSummaryPdf' unique_code="OrderSummaryPdf" elsif printer_setting.unique_code == 'OrderSummarySlimPdf' unique_code="OrderSummarySlimPdf" @@ -80,17 +82,17 @@ 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 end end - + assigned_item_id = params[:id] table_name = params[:table_name] - assigned_item = AssignedOrderItem.find(assigned_item_id) + assigned_item = AssignedOrderItem.find(assigned_item_id) assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'"); # order queue stations @@ -105,8 +107,8 @@ class Oqs::PrintController < ApplicationController # Get Booking ID booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0] - - # print when complete click + + # print when complete click print_settings = PrintSetting.find_by_unique_code(unique_code) order_queue_printer = Printer::OrderQueuePrinter.new(print_settings) filename, receipt_no, cashier_printer = order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status) @@ -114,20 +116,20 @@ class Oqs::PrintController < ApplicationController # update print status for completed same order items assigned_items.each do |ai| ai.print_status = true - ai.save + ai.save end - # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) + # filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount) if ENV["SERVER_MODE"] == "cloud" - result = { - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + result = { + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } # Mobile Print - render :json => result.to_json + render :json => result.to_json end - # end + # end end -end \ No newline at end of file +end diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index d4486da5..ba302f88 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -1,10 +1,10 @@ class Origami::AddordersController < BaseOrigamiController # before_action :set_dining, only: [:detail] - + def index @webview = false if check_mobile - @webview = true + @webview = true end @tables = Table.all.active.order('zone_id asc').group("zone_id") @@ -17,7 +17,7 @@ class Origami::AddordersController < BaseOrigamiController @cashier_type = params[:type] @webview = false if check_mobile - @webview = true + @webview = true end display_type = Lookup.find_by_lookup_type("display_type") if !display_type.nil? && display_type.value.to_i ==2 @@ -29,7 +29,7 @@ class Origami::AddordersController < BaseOrigamiController @menus = [] @menu = [] # else - # @menus = Menu.all + # @menus = Menu.all # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') # end @@ -38,29 +38,19 @@ class Origami::AddordersController < BaseOrigamiController @booking = @table.get_booking if @booking @booking_id = @booking.booking_id - @order_items = Array.new - @booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if (order.status == "new") - @obj_order = order - @customer = order.customer - @date = order.created_at - order.order_items.each do |item| - @order_items.push(item) - end - end - end - else - @booking = nil + @obj_order = @booking.orders.first + @customer = @obj_order.customer + @date = @obj_order.created_at + @order_items = @booking.order_items end end def get_menu_category () if (params[:id]) - + #Pull this menu @menu = MenuCategory.find_by_id(params[:id]) - + # puts @menu.menu_items[1].item_attributes.to_json return @menu else @@ -96,19 +86,27 @@ class Origami::AddordersController < BaseOrigamiController return @sub_menu end end - + def get_all_product() - @product = Product.all + @product = Product.all end def create - # Rails.logger.debug "Order Source - " + params[:order_source].to_s - # Rails.logger.debug "Table ID - " + params[:table_id].to_s + if params[:booking_id].present? + booking = Booking.find(params[:booking_id]) + end + if params[:table_id].present? + if booking.nil? || booking.dining_facility_id.to_i != params[:table_id].to_i + table = DiningFacility.find(params[:table_id]) + booking = table.get_current_booking + end + end + is_extra_time = false extra_time = '' items_arr = [] - JSON.parse(params[:order_items]).each { |i| + JSON.parse(params[:order_items]).each { |i| i["item_instance_code"] = i["item_instance_code"].downcase.to_s if i["item_instance_code"].include? "ext" is_extra_time = true @@ -131,6 +129,7 @@ class Origami::AddordersController < BaseOrigamiController else customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile end + @order = Order.new @order.source = params[:order_source] @order.order_type = params[:order_type] @@ -144,83 +143,52 @@ class Origami::AddordersController < BaseOrigamiController @order.is_extra_time = is_extra_time @order.extra_time = extra_time - #Create Table Booking or Room Booking - if !params["booking_id"].nil? - # check booking id is already completed. - booking = Booking.find(params[:booking_id]) - if params[:table_id].to_i > 0 - table_status = booking.dining_facility_id.to_i == params[:table_id].to_i - else - table_status = true - end - if booking - if table_status && booking.booking_status != 'moved' - if !booking.sale_id.nil? - sale_status = check_order_with_booking(booking) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - else - @order.new_booking = false - @order.booking_id = params[:booking_id] - end - else - if params[:table_id].to_i > 0 - sale_status = check_order_with_table(params[:table_id]) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - end - end - end #booking exists - else - if params[:table_id].to_i > 0 - sale_status = check_order_with_table(params[:table_id]) - if sale_status - # return false , @message = "bill requested" - return return_json_status_with_code(400, "bill requested") - end - end + + if booking.nil? || booking.sale_id.present? || booking.booking_status == 'moved' + @order.new_booking = true + else + @order.new_booking = false + @order.booking_id = booking.booking_id + end + + @status, @booking = @order.generate + + if @status && @booking + #send order broadcast to order_channel + if @order.table_id.to_i > 0 + table = DiningFacility.find(@booking.dining_facility_id) + type = 'order' + from = getCloudDomain #get sub domain in cloud mode + ActionCable.server.broadcast "order_channel",table: table,type:type,from:from + end - @status, @booking = @order.generate - - if @status && @booking - #send order broadcast to order_channel - if @order.table_id.to_i > 0 - table = DiningFacility.find(@booking.dining_facility_id) - type = 'order' - from = getCloudDomain #get sub domain in cloud mode - ActionCable.server.broadcast "order_channel",table: table,type:type,from:from - - end - - if params[:order_source] != "quick_service" && params[:order_source] != "food_court" - process_order_queue(@order.order_id,@order.table_id,@order.source) - end - end + if params[:order_source] != "quick_service" && params[:order_source] != "food_court" + process_order_queue(@order.order_id,@order.table_id,@order.source) + end + end # Order.send_customer_view(@booking) - - if current_user.role != "waiter" && params[:create_type] == "create_pay" - if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court') - - @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) - - # for second display - if @order.source == 'quick_service' - from = getCloudDomain #get sub domain in cloud mode - ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale",from:from - end - #end - result = {:status=> @status, :data => @sale } - render :json => result.to_json + + if current_user.role != "waiter" && params[:create_type] == "create_pay" + if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court') + + @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) + + # for second display + if @order.source == 'quick_service' + from = getCloudDomain #get sub domain in cloud mode + ActionCable.server.broadcast "second_display_channel",data: @sale,status:"sale",from:from end - else - result = {:status=> @status, :data => 0 } + #end + result = {:status=> @status, :data => @sale } render :json => result.to_json end - + else + result = {:status=> @status, :data => 0 } + render :json => result.to_json + end + end # render json for http status code @@ -266,9 +234,9 @@ class Origami::AddordersController < BaseOrigamiController def process_order_queue(order_id,table_id,order_source) print_status = nil cup_status = nil - + #Send to background job for processing - order = Order.find(order_id) + order = Order.find(order_id) sidekiq = Lookup.find_by_lookup_type("sidekiq") if ENV["SERVER_MODE"] != 'cloud' cup_status = `#{"sudo service cups status"}` @@ -307,7 +275,7 @@ class Origami::AddordersController < BaseOrigamiController else if ENV["SERVER_MODE"] != 'cloud' from = "" - msg = ' Print Error ! Please contact to service' + msg = ' Print Error ! Please contact to service' ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error',from:from end if !sidekiq.nil? @@ -342,7 +310,7 @@ class Origami::AddordersController < BaseOrigamiController return from end - + private # def set_dining diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb index 22092a50..cd73d174 100755 --- a/app/controllers/origami/discounts_controller.rb +++ b/app/controllers/origami/discounts_controller.rb @@ -3,6 +3,8 @@ class Origami::DiscountsController < BaseOrigamiController #discount page show from origami index with selected order def index + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() @webview = false if check_mobile @webview = true diff --git a/app/controllers/origami/food_court_controller.rb b/app/controllers/origami/food_court_controller.rb index 857da01f..1157bb44 100644 --- a/app/controllers/origami/food_court_controller.rb +++ b/app/controllers/origami/food_court_controller.rb @@ -6,7 +6,7 @@ class Origami::FoodCourtController < ApplicationController redirect_to root_path end end - + def index today = DateTime.now day = Date.today.wday @@ -14,7 +14,7 @@ class Origami::FoodCourtController < ApplicationController @menus = [] @menu = [] # else - # @menus = Menu.all + # @menus = Menu.all # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') # end @zone = Zone.all @@ -27,14 +27,14 @@ class Origami::FoodCourtController < ApplicationController lookup_dine_in = Lookup.collection_of('dinein_cashier') if !lookup_dine_in.empty? lookup_dine_in.each do |dine_in| - if dine_in[0].downcase == "dineincashier" - if dine_in[1] == '1' + if dine_in[0].downcase == "dineincashier" + if dine_in[1] == '1' @quick_service_only = false end end end end - + render "origami/addorders/detail" end @@ -46,7 +46,7 @@ class Origami::FoodCourtController < ApplicationController @menus = [] @menu = [] # else - # @menus = Menu.all + # @menus = Menu.all # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') # end if(params[:id][0,3] == "BKI") @@ -58,38 +58,33 @@ class Origami::FoodCourtController < ApplicationController @table = DiningFacility.find(@table_id) @booking = @table.get_booking end - - @sale_id = params[:sale_id] + + @sale_id = @booking.sale_id if @booking @booking_id = @booking.booking_id - @order_items = Array.new - @booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if (order.status == "new") - @obj_order = order - @customer = order.customer - @date = order.created_at - order.order_items.each do |item| - @order_items.push(item) - end - end - end - else - @booking = nil + @obj_order = @booking.orders.first + @customer = @obj_order.customer + @date = @obj_order.created_at + @order_items = @booking.order_items end - render "origami/addorders/detail" + + render "origami/addorders/detail" end def update_modify_order - Rails.logger.debug "Order Source - " + params[:order_source].to_s - Rails.logger.debug "Table ID - " + params[:table_id].to_s + booking = Booking.find(params[:booking_id]) + sale = booking.sale + if sale && sale.sale_status != 'new' + render :json => { :status => false } + end + is_extra_time = false extra_time = '' - @cashier_type = "food_court" + cashier_type = "food_court" items_arr = [] - JSON.parse(params[:order_items]).each { |i| + JSON.parse(params[:order_items]).each { |i| i["item_instance_code"] = i["item_instance_code"].downcase.to_s if i["item_instance_code"].include? "ext" is_extra_time = true @@ -108,82 +103,32 @@ class Origami::FoodCourtController < ApplicationController } # begin - @order = Order.new - @order.source = params[:order_source] - @order.order_type = params[:order_type] - @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile - @order.items = items_arr - @order.guest = params[:guest_info] - @order.table_id = params[:table_id] # this is dining facilities's id - @order.new_booking = true - @order.waiters = current_login_employee.name - @order.employee_name = current_login_employee.name + order = Order.new + order.source = params[:order_source] + order.order_type = params[:order_type] + order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile + order.items = items_arr + order.guest = params[:guest_info] + order.table_id = params[:table_id] # this is dining facilities's id + order.waiters = current_login_employee.name + order.employee_name = current_login_employee.name - @order.is_extra_time = is_extra_time - @order.extra_time = extra_time + order.is_extra_time = is_extra_time + order.extra_time = extra_time - #Create Table Booking or Room Booking - if !params["booking_id"].nil? - # check booking id is already completed. - booking = Booking.find(params[:booking_id]) - if params[:table_id].to_i > 0 - table_status = booking.dining_facility_id.to_i == params[:table_id].to_i - else - table_status = true - end - if booking - if table_status && booking.booking_status != 'moved' - if !booking.sale_id.nil? - sale_status = check_order_with_booking(booking) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - else - @order.new_booking = false - @order.booking_id = params[:booking_id] - end - else - if params[:table_id].to_i > 0 - sale_status = check_order_with_table(params[:table_id]) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - end - end - end #booking exists + order.new_booking = false + order.booking_id = booking.booking_id + + if order.generate + if sale + Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking) + render :json => { :status => true, :data => sale } else - if params[:table_id].to_i > 0 - sale_status = check_order_with_table(params[:table_id]) - if sale_status - # return false , @message = "bill requested" - return return_json_status_with_code(400, "bill requested") - end - end + render :json => { :status => true, :data => 'OK' } end - - @status, @booking = @order.generate - if(params[:sale_id][0,3] == "SAL") - if @status && @booking && (@order.source == 'quick_service' || @order.source == 'food_court') - if params[:sale_id] - @sale = Sale.find(params[:sale_id]) - if @order.table_id.to_i > 0 - @table_id = @order.table_id - else - @table_id = nil - end - update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking) - end - - result = {:status=> true, :data => @sale } - render :json => result.to_json - end - elsif (params[:sale_id][0,3] == "BKI") - result = {:status=> true, :data => 'OK' } - render :json => result.to_json - else - result = {:status=> true, :data => nil } - render :json => result.to_json - end + else + render :json => { :status => false } + end end @@ -209,9 +154,9 @@ class Origami::FoodCourtController < ApplicationController return @sub_menu end end - + def get_all_product() - @product = Product.all + @product = Product.all end # render json for http status code diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 8b767fa2..fe074210 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -17,6 +17,8 @@ class Origami::HomeController < BaseOrigamiController # origami table detail def show + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() @webview = check_mobile @tables = Table.unscoped.all.active.order('status desc') @@ -35,7 +37,7 @@ class Origami::HomeController < BaseOrigamiController @payment_methods = PaymentMethodSetting.all @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ") #@dining_booking = @dining.bookings.active.where("created_at between '#{DateTime.now.utc - 12.hours}' and '#{DateTime.now.utc}'") - @order_items = Array.new + @order_items = Array.new @dining_booking.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' @order_items = Array.new @@ -144,6 +146,7 @@ class Origami::HomeController < BaseOrigamiController end end end + end def check_emp_access_code diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 11c91a2b..5de37662 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -5,28 +5,28 @@ class Origami::PaymentsController < BaseOrigamiController def first_bill sale_id = params[:sale_id] # sale_id - sale_data = Sale.find_by_sale_id(sale_id) + sale_data = Sale.find(sale_id) sale_items = SaleItem.get_all_sale_items(sale_id) member_info = nil - + # For Cashier by Zone - bookings = Booking.where("sale_id='#{sale_id}'") - # if bookings.count > 1 + booking = Booking.find_by_sale_id(sale_id) + # if bookings.count > 1 # # for Multiple Booking # table = DiningFacility.find(bookings[0].dining_facility_id) # else - # table = DiningFacility.find(bookings[0].dining_facility_id) + # table = DiningFacility.find(bookings[0].dining_facility_id) # end shift = ShiftSale.current_open_shift(current_user.id) if !shift.nil? cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) else - if bookings[0].dining_facility_id.to_i > 0 - table = DiningFacility.find(bookings[0].dining_facility_id) + if booking.dining_facility_id.to_i > 0 + table = DiningFacility.find(booking.dining_facility_id) cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) else - shift = ShiftSale.find(saleObj.shift_sale_id) + shift = ShiftSale.find(sale_data.shift_sale_id) cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) end end @@ -35,20 +35,31 @@ class Origami::PaymentsController < BaseOrigamiController receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf # Print for First Bill to Customer unique_code = "ReceiptBillPdf" + print_settings = PrintSetting.all + if !print_settings.nil? + print_settings.each do |setting| + if setting.unique_code == 'ReceiptBillPdf' + unique_code = "ReceiptBillPdf" + elsif setting.unique_code == 'ReceiptBillStarPdf' + unique_code = "ReceiptBillStarPdf" + end + end + end + if !receipt_bill_a5_pdf.empty? receipt_bill_a5_pdf.each do |receipt_bilA5| - if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + if receipt_bilA5[0] == 'ReceiptBillA5Pdf' if receipt_bilA5[1] == '1' unique_code = "ReceiptBillA5Pdf" else - unique_code = "ReceiptBillPdf" + unique_code = unique_code#{}"ReceiptBillPdf" end end end end #shop detail - ## shop_detail = Shop.first + ## shop_detail = Shop.first # customer= Customer.where('customer_id=' +.customer_id) customer = Customer.find(sale_data.customer_id) # rounding adjustment @@ -60,14 +71,14 @@ class Origami::PaymentsController < BaseOrigamiController if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) new_total = Sale.get_rounding_adjustment(sale_data.grand_total) rounding_adj = new_total-sale_data.grand_total - sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj) + sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj) end end #end rounding adjustment #record for sale audit action_by = current_user.name type = "FIRST_BILL" - + remark = "#{action_by} print out first bill for Receipt No #{sale_data.receipt_no}" sale_audit = SaleAudit.record_audit_sale(sale_id,remark,action_by,type ) # get member information @@ -91,14 +102,33 @@ class Origami::PaymentsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) - filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount,nil,nil,nil) + #TODO :: KBZPAY ( QR ) + # On/Off setting ( show or not qr ) + # qrCode = "00020101021202021110500346KBZ005ab0ed5c1ed09d1c4585ff1313170389160831435294600062000040732kp1e78f7efddca190042638341afb88d50200006KBZPay0106KBZPay5303MMK5802MM62170813PAY_BY_QRCODE64060002my6304FBBD" + kbz_pay_method = PaymentMethodSetting.where(:payment_method => KbzPay::KBZ_PAY).last - result = { - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + status = false + qr = nil + + if !kbz_pay_method.nil? + if kbz_pay_method.is_active == true + sale_payment = SalePayment.new + sale_payment.process_kbz_payment(sale_id, sale_data.grand_total, 0, 'pending') + + status, qr = KbzPay.pay(sale_data.grand_total.to_i, sale_payment.sale_payment_id, kbz_pay_method.gateway_url, kbz_pay_method.auth_token, kbz_pay_method.merchant_account_id, kbz_pay_method.additional_parameters) + end + end + + filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, status, qr, cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount,nil,nil,nil) + + result = { + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } + # status, qr = KbzPay.query(sale_payment.sale_payment_id) + # Mobile Print render :json => result.to_json # end @@ -112,11 +142,12 @@ class Origami::PaymentsController < BaseOrigamiController tax_type = params[:tax_type] path = request.fullpath latest_order_no = nil + is_kbz = params[:is_kbz] if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) sale_items = SaleItem.get_all_sale_items(sale_id) - #shop_detail = Shop.first + #shop_detail = Shop.first # rounding adjustment if !path.include? ("credit_payment") if shop_detail.is_rounding_adj @@ -127,19 +158,31 @@ class Origami::PaymentsController < BaseOrigamiController if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) new_total = Sale.get_rounding_adjustment(saleObj.grand_total) rounding_adj = new_total-saleObj.grand_total - saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) + saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) end end end #end rounding adjustment - - sale_payment = SalePayment.new - if path.include? ("credit_payment") - sale_payment.process_payment(saleObj, current_user, cash, "cash", nil, true) + + # if pay_from = 'kbzpay' + # salePayment = SalePayment.find(sale_payment_id) + # salePayment.process_kbz_payment(salePayment.sale_id, sale_data.grand_total, cash, 'paid') + # else + sp = SalePayment.where('sale_id=? and payment_method=? and payment_status=?', sale_id, 'kbzpay', 'paid').last + if is_kbz == 'false' + Rails.logger.info '################ CASH PAYMENT #################' + sale_payment = SalePayment.new + if path.include? ("credit_payment") + sale_payment.process_payment(saleObj, current_user, cash, "cash", nil, true) + else + sale_payment.process_payment(saleObj, current_user, cash, "cash") + end else - sale_payment.process_payment(saleObj, current_user, cash, "cash") + sp.kbz_edit_sale_payment(sp.received_amount.to_f, current_user) end + # end + if !path.include? ("credit_payment") rebate_amount = nil @@ -155,7 +198,7 @@ class Origami::PaymentsController < BaseOrigamiController table = DiningFacility.find(bookings.dining_facility_id) cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) - + type = 'payment' from = getCloudDomain #get sub domain in cloud mode ActionCable.server.broadcast "order_channel",table: table,type:type,from:from @@ -169,13 +212,24 @@ class Origami::PaymentsController < BaseOrigamiController # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf unique_code = "ReceiptBillPdf" + print_settings = PrintSetting.all + if !print_settings.nil? + print_settings.each do |setting| + if setting.unique_code == 'ReceiptBillPdf' + unique_code = "ReceiptBillPdf" + elsif setting.unique_code == 'ReceiptBillStarPdf' + unique_code = "ReceiptBillStarPdf" + end + end + end + if !receipt_bill_a5_pdf.empty? receipt_bill_a5_pdf.each do |receipt_bilA5| - if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + if receipt_bilA5[0] == 'ReceiptBillA5Pdf' if receipt_bilA5[1] == '1' unique_code = "ReceiptBillA5Pdf" - else - unique_code = "ReceiptBillPdf" + # else + end end end @@ -186,25 +240,25 @@ class Origami::PaymentsController < BaseOrigamiController # get member information rebate = MembershipSetting.find_by_rebate(1) credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote') - + if customer.membership_id != nil && rebate && credit_data.nil? member_info = Customer.get_member_account(customer) - + if member_info["status"] == true rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) current_balance = SaleAudit.paymal_search(sale_id) end end - + #orders print out - if params[:type] == "quick_service" + if type == "quick_service" booking = Booking.find_by_sale_id(sale_id) if booking.dining_facility_id.to_i>0 table_id = booking.dining_facility_id else table_id = 0 end - + latest_order = booking.booking_orders.order("order_id DESC").limit(1).first() if !latest_order.nil? latest_order_no = latest_order.order_id @@ -219,13 +273,13 @@ class Origami::PaymentsController < BaseOrigamiController from = getCloudDomain #get sub domain in cloud mode ActionCable.server.broadcast "order_queue_station_channel",order: assign_order,from:from end - + end #for card sale data card_data = Array.new card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) - if !card_sale_trans_ref_no.nil? + if !card_sale_trans_ref_no.nil? card_sale_trans_ref_no.each do |cash_sale_trans| card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s @@ -237,7 +291,7 @@ class Origami::PaymentsController < BaseOrigamiController #card_balance amount for Paymal payment card_balance_amount = SaleAudit.getCardBalanceAmount(sale_id) - + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) # Calculate Food and Beverage Total @@ -246,16 +300,37 @@ class Origami::PaymentsController < BaseOrigamiController other_amount = SaleItem.calculate_other_charges(sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Paid",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil) - - render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name}) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Paid",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil) #end end - end + logger.debug 'saleObj++++++++++++++++++++++++++' + logger.debug saleObj.to_json + if !saleObj.nil? + # InventoryJob.perform_now(self.id) + # InventoryDefinition.calculate_product_count(saleObj) + end + end + + # status, filename, sale_receipt_no, printer_name = Payment.pay(getCloudDomain, cash, sale_id, member_info, type, tax_type, path, latest_order_no, shop_detail, current_user, nil, nil) + render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name}) end + # def kbz_query + # sale_id = params[:sale_id] + # table_id = params[:table_id] + # sp = SalePayment.where('sale_id=?', sale_id).last + # status, table_id = KbzPay.query(sp.sale_payment_id) + # render json: JSON.generate({:status => status, :table_id => table_id, :message => @message}) + # end + def show + display_type = Lookup.find_by_lookup_type("display_type") + if !display_type.nil? && display_type.value.to_i ==2 + @display_type = display_type.value + else + @display_type = nil + end path = request.fullpath sale_id = params[:sale_id] @trans_flag = true @@ -265,16 +340,17 @@ class Origami::PaymentsController < BaseOrigamiController else @cashier_type = params[:type] end - + if path.include? ("credit_payment") @sale_payment = SalePayment.get_credit_amount_due_left(sale_id) end - + @member_discount = MembershipSetting.find_by_discount(1) @membership_rebate_balance=0 if Sale.exists?(sale_id) @cash = 0.0 + @kbz_pay_amount = 0.0 @other = 0.0 @ppamount = 0.0 @visacount= 0.0 @@ -299,20 +375,23 @@ class Origami::PaymentsController < BaseOrigamiController @pdf_view = @lookup_pdf.value end + amount = SalePayment.get_kbz_pay_amount(sale_id, current_user) + @kbz_pay_amount += amount.to_f + #for changable on/off @changable_tax = true lookup_changable_tax = Lookup.collection_of('changable_tax') if !lookup_changable_tax.empty? lookup_changable_tax.each do |changable_tax| - if changable_tax[0].downcase == "change" - if changable_tax[1] == '0' + if changable_tax[0].downcase == "change" + if changable_tax[1] == '0' @changable_tax = false end end end end - - @shop = shop_detail #show shop info + + @shop = shop_detail #show shop info @customer_lists = Customer.where("customer_id = 'CUS-000000000001' or customer_id = 'CUS-000000000002'") @@ -351,7 +430,7 @@ class Origami::PaymentsController < BaseOrigamiController if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) new_total = Sale.get_rounding_adjustment(saleObj.grand_total) @rounding_adj = new_total-saleObj.grand_total - saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj) + saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj) @sale_data.grand_total = new_total @sale_data.old_grand_total = saleObj.grand_total @sale_data.rounding_adjustment = @rounding_adj @@ -396,11 +475,11 @@ class Origami::PaymentsController < BaseOrigamiController end end end - end + end #end customer amount - #paymal payment + #paymal payment @sale_data.bookings.each do |sbk| if sbk.dining_facility_id.to_i >0 @@ -421,39 +500,40 @@ class Origami::PaymentsController < BaseOrigamiController else @sale_payment_data = SalePayment.get_sale_payments(@sale_data) end - @sale_payment_data.each do |spay| - if spay.payment_method == "cash" - @cash += spay.payment_amount - end - if spay.payment_method !="creditnote" - @other_payment += spay.payment_amount - end - - if spay.payment_method == "mpu" - @other += spay.payment_amount - elsif spay.payment_method == "paypar" - @ppamount += spay.payment_amount - elsif spay.payment_method == "visa" - @visacount += spay.payment_amount - elsif spay.payment_method == "jcb" - @jcbcount += spay.payment_amount - elsif spay.payment_method == "master" - @mastercount += spay.payment_amount - elsif spay.payment_method == "unionpay" - @unionpaycount += spay.payment_amount - elsif spay.payment_method == "JunctionPay" - @junctionpaycount += spay.payment_amount - elsif spay.payment_method == "creditnote" - @credit += spay.payment_amount - elsif spay.payment_method == "paymal" - @paymalcount += spay.payment_amount - elsif spay.payment_method == "alipay" - @alipaycount += spay.payment_amount - elsif spay.payment_method == "dinga" - @dingacount += spay.payment_amount - elsif spay.payment_method == "giftvoucher" - @giftvouchercount += spay.payment_amount - end + @sale_payment_data.each do |spay| + if spay.payment_method == "cash" + @cash += spay.payment_amount + end + if spay.payment_method !="creditnote" + @other_payment += spay.payment_amount + end + + if spay.payment_method == "mpu" + @other += spay.payment_amount + elsif spay.payment_method == "paypar" + @ppamount += spay.payment_amount + elsif spay.payment_method == "visa" + @visacount += spay.payment_amount + elsif spay.payment_method == "jcb" + @jcbcount += spay.payment_amount + elsif spay.payment_method == "master" + @mastercount += spay.payment_amount + elsif spay.payment_method == "unionpay" + @unionpaycount += spay.payment_amount + elsif spay.payment_method == "JunctionPay" + @junctionpaycount += spay.payment_amount + elsif spay.payment_method == "creditnote" + @credit += spay.payment_amount + elsif spay.payment_method == "paymal" + @paymalcount += spay.payment_amount + elsif spay.payment_method == "alipay" + @alipaycount += spay.payment_amount + elsif spay.payment_method == "dinga" + @dingacount += spay.payment_amount + elsif spay.payment_method == "giftvoucher" + @giftvouchercount += spay.payment_amount + end + end end end @@ -463,7 +543,7 @@ class Origami::PaymentsController < BaseOrigamiController member_info = nil latest_order_no = nil saleObj = Sale.find(sale_id) - + # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") @@ -472,11 +552,11 @@ class Origami::PaymentsController < BaseOrigamiController if !latest_order.nil? latest_order_no = latest_order.order_id end - # if bookings.count > 1 + # if bookings.count > 1 # # for Multiple Booking # table = DiningFacility.find(bookings[0].dining_facility_id) # else - # table = DiningFacility.find(bookings[0].dining_facility_id) + # table = DiningFacility.find(bookings[0].dining_facility_id) # end shift = ShiftSale.current_open_shift(current_user.id) if !shift.nil? @@ -490,14 +570,14 @@ class Origami::PaymentsController < BaseOrigamiController shift = ShiftSale.find(saleObj.shift_sale_id) cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) end - end + end # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf unique_code = "ReceiptBillPdf" if !receipt_bill_a5_pdf.empty? receipt_bill_a5_pdf.each do |receipt_bilA5| - if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + if receipt_bilA5[0] == 'ReceiptBillA5Pdf' if receipt_bilA5[1] == '1' unique_code = "ReceiptBillA5Pdf" else @@ -509,7 +589,7 @@ class Origami::PaymentsController < BaseOrigamiController customer= Customer.find(saleObj.customer_id) #shop detail - #shop_detail = Shop.first + #shop_detail = Shop.first # get member information rebate = MembershipSetting.find_by_rebate(1) if customer.membership_id != nil && rebate @@ -521,7 +601,7 @@ class Origami::PaymentsController < BaseOrigamiController #for card sale data card_data = Array.new card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) - if !card_sale_trans_ref_no.nil? + if !card_sale_trans_ref_no.nil? card_sale_trans_ref_no.each do |cash_sale_trans| card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s @@ -543,21 +623,22 @@ class Origami::PaymentsController < BaseOrigamiController other_amount = SaleItem.calculate_other_charges(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Re-print",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil) - - result = { + + filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Re-print",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil) + + result = { :status => true, - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } - + # Mobile Print render :json => result.to_json # end end - def foc + def foc cash = params[:cash] sale_id = params[:sale_id] sub_total = params[:sub_total] @@ -576,7 +657,7 @@ class Origami::PaymentsController < BaseOrigamiController saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0) saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0,order_source) end - + saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0) sale_payment = SalePayment.new @@ -590,7 +671,7 @@ class Origami::PaymentsController < BaseOrigamiController ActionCable.server.broadcast "order_channel",table: table,type:type,from:from end - + # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") @@ -607,18 +688,31 @@ class Origami::PaymentsController < BaseOrigamiController shift = ShiftSale.find(saleObj.shift_sale_id) cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) end - end - + end + # Re-call Sale Data saleObj = Sale.find(sale_id) # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server - unique_code = "ReceiptBillPdf" + # unique_code = "ReceiptBillPdf" customer= Customer.find(saleObj.customer_id) - - #shop detail - #shop_detail = Shop.first + #shop detail + #shop_detail = Shop.first + printer = PrintSetting.all + + unique_code="ReceiptBillPdf" + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'ReceiptBillPdf' + unique_code="ReceiptBillPdf" + elsif printer_setting.unique_code == 'ReceiptBillA5Pdf' + unique_code="ReceiptBillA5Pdf" + elsif printer_setting.unique_code == 'ReceiptBillStarPdf' + unique_code="ReceiptBillStarPdf" + end + end + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) # Calculate Food and Beverage Total @@ -629,12 +723,12 @@ class Origami::PaymentsController < BaseOrigamiController printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "FOC",nil,nil,other_amount,nil,nil,nil) - result = { + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "FOC",nil,nil,other_amount,nil,nil,nil) + result = { :status => true, - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } # Mobile Print @@ -647,26 +741,30 @@ class Origami::PaymentsController < BaseOrigamiController else table_id = 0 end - + booking.booking_orders.each do |order| Order.pay_process_order_queue(order.order_id,table_id) end end # end - end + if !saleObj.nil? + #InventoryJob.perform_now(self.id) + # InventoryDefinition.calculate_product_count(saleObj) + end + end end def rounding_adj saleObj = Sale.find(params[:sale_id]) @shop = shop_detail - + if @shop.is_rounding_adj a = saleObj.grand_total % 25 # Modulus - b = saleObj.grand_total / 25 # Division + b = saleObj.grand_total / 25 # Division #not calculate rounding if modulus is 0 and division is even #calculate rounding if modulus is zero or not zero and division are not even - if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) + if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) new_total = Sale.get_rounding_adjustment(saleObj.grand_total) rounding_adj = new_total-saleObj.grand_total saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) @@ -675,24 +773,34 @@ class Origami::PaymentsController < BaseOrigamiController end #print function for receipt - def print + def print filename = params[:filename] receipt_no = params[:receipt_no] printer_name = params[:printer_name] cashier_type = params[:type] - + if cashier_type.strip.downcase == "doemal_order" unique_code = "ReceiptBillOrderPdf" else receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf unique_code = "ReceiptBillPdf" + print_settings = PrintSetting.all + if !print_settings.nil? + print_settings.each do |setting| + if setting.unique_code == 'ReceiptBillPdf' + unique_code = "ReceiptBillPdf" + elsif setting.unique_code == 'ReceiptBillStarPdf' + unique_code = "ReceiptBillStarPdf" + end + end + end if !receipt_bill_a5_pdf.empty? receipt_bill_a5_pdf.each do |receipt_bilA5| - if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + if receipt_bilA5[0] == 'ReceiptBillA5Pdf' if receipt_bilA5[1] == '1' unique_code = "ReceiptBillA5Pdf" - else - unique_code = "ReceiptBillPdf" + # else + # unique_code = "ReceiptBillPdf" end end end @@ -702,12 +810,12 @@ class Origami::PaymentsController < BaseOrigamiController print_settings=PrintSetting.find_by_unique_code(unique_code) printer = Printer::ReceiptPrinter.new(print_settings) printer.print_receipt_pdf(filename,receipt_no,print_settings.print_copies,printer_name) - - result = { + + result = { :status => true, - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } Rails.logger.debug "$$$$$$$$$ result ::" Rails.logger.debug result @@ -723,7 +831,7 @@ class Origami::PaymentsController < BaseOrigamiController tax_type = params[:tax_type] sale = Sale.find(sale_id) sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount,nil,order_source,tax_type) - + render json: JSON.generate({:status => true}) end @@ -736,4 +844,4 @@ class Origami::PaymentsController < BaseOrigamiController return from end -end \ No newline at end of file +end diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index 20b3f6f7..4b412c17 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -7,12 +7,32 @@ class Origami::PendingOrderController < BaseOrigamiController @order = Sale.pending_order(@cashier_type) @completed = Sale.completed_sale(@cashier_type) @customers = Customer.pluck("customer_id, name") - + @occupied_table = @sale.count.length + @order.count.length - + end def show + id = params[:sale_id] + if id.start_with?("SAL") + @sale = Sale.find(id) + if @sale.sale_status == "new" + @bookings = @sale.bookings.first + @status = "sale" + else + redirect_to "/origami/#{params[:type]}" and return + end + elsif id.start_with?("BKI") + @bookings = Booking.find(id) + @order = @bookings.orders.where(status: "new").first + @order_items = @bookings.order_items + @status = "order" + end + + if @dining = @bookings.dining_facility + @table_id = @dining.id + end + @cashier_type = params[:type] @sales = Sale.pending_sale(@cashier_type) @orders = Sale.pending_order(@cashier_type) @@ -20,38 +40,6 @@ class Origami::PendingOrderController < BaseOrigamiController @customers = Customer.pluck("customer_id, name") @occupied_table = @sales.count.length + @orders.count.length - - @id = params[:sale_id] - if(@id[0,3] == "SAL") - @sale = Sale.find(@id) - @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id - @booking = BookingOrder.find_by_order_id(@order).booking_id - @bookings = Booking.find(@booking) - @status = "sale" - else - # @booking = BookingOrder.find_by_order_id(@order).booking_id - @bookings = Booking.find(@id) - @status = "order" - - @order_items = Array.new - @bookings.booking_orders.each do |booking_order| - @order = Order.find(booking_order.order_id) - if (@order.status == "new") - @order.order_items.each do |item| - @order_items.push(item) - end - end - end - end - # puts @status - if @bookings.dining_facility_id.to_i > 0 - @table_id = Booking.find(@bookings.booking_id).dining_facility_id - @dining = DiningFacility.find(@table_id) - else - @table_id = nil - @dining = nil - end - @customers = Customer.pluck("customer_id, name") end def completed_sale @@ -64,13 +52,13 @@ class Origami::PendingOrderController < BaseOrigamiController @occupied_table = @sales.count.length + @orders.count.length @id = params[:sale_id] - + @sale = Sale.find(@id) @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id @booking = BookingOrder.find_by_order_id(@order).booking_id @bookings = Booking.find(@booking) @status = "sale" - + if @bookings.dining_facility_id.to_i > 0 @table_id = Booking.find(@bookings.booking_id).dining_facility_id @dining = DiningFacility.find(@table_id) @@ -96,7 +84,7 @@ class Origami::PendingOrderController < BaseOrigamiController @completed = Sale.completed_sale(@cashier_type) @occupied_table = @sales.count.length + @orders.count.length - + @id = params[:sale_id] @customers = Customer.pluck("customer_id, name") @@ -105,7 +93,7 @@ class Origami::PendingOrderController < BaseOrigamiController @booking = BookingOrder.find_by_order_id(@order).booking_id @bookings = Booking.find(@booking) @status = "sale" - + if @bookings.dining_facility_id.to_i > 0 @table_id = Booking.find(@bookings.booking_id).dining_facility_id @dining = DiningFacility.find(@table_id) @@ -116,7 +104,7 @@ class Origami::PendingOrderController < BaseOrigamiController @sale_payment = SalePayment.select("SUM(payment_amount) as payment_amount") .where("sale_id = ? and payment_method=?", @sale.sale_id, "creditnote") - + @sale_taxes = [] sale_taxes = SaleTax.where("sale_id = ?", @sale.sale_id) if !sale_taxes.empty? diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index 98e61545..3e69485a 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -6,17 +6,17 @@ class Origami::QuickServiceController < ApplicationController redirect_to root_path end end - + def index today = DateTime.now day = Date.today.wday - # if params[:menu] == "true" - @menus = [] - @menu = [] - # else - # @menus = Menu.all - # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - # end + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end @zone = Zone.all @customer = Customer.all @tables = Table.all.active.order('status desc') @@ -28,20 +28,22 @@ class Origami::QuickServiceController < ApplicationController else @display_type = nil end - + #checked quick_service only - @quick_service_only = true - lookup_dine_in = Lookup.collection_of('dinein_cashier') + @quick_service_only = false + lookup_dine_in = Lookup.collection_of('quickservice_add_order') + puts 'lookup_dine_in!!!!' + puts lookup_dine_in if !lookup_dine_in.empty? lookup_dine_in.each do |dine_in| - if dine_in[0].downcase == "dineincashier" - if dine_in[1] == '1' - @quick_service_only = false + if dine_in[0].downcase == "quickserviceaddorder" + if dine_in[1] == '1' + @quick_service_only = true end end end end - + render "origami/addorders/detail" end @@ -49,13 +51,13 @@ class Origami::QuickServiceController < ApplicationController @cashier_type = "quick_service" today = DateTime.now day = Date.today.wday - # if params[:menu] == "true" - @menus = [] - @menu = [] - # else - # @menus = Menu.all - # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - # end + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end if(params[:id][0,3] == "BKI") @table_id = nil @table = nil @@ -65,38 +67,33 @@ class Origami::QuickServiceController < ApplicationController @table = DiningFacility.find(@table_id) @booking = @table.get_booking end - - @sale_id = params[:sale_id] + + @sale_id = @booking.sale_id if @booking @booking_id = @booking.booking_id - @order_items = Array.new - @booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) - if (order.status == "new") - @obj_order = order - @customer = order.customer - @date = order.created_at - order.order_items.each do |item| - @order_items.push(item) - end - end - end - else - @booking = nil + @obj_order = @booking.orders.first + @customer = @obj_order.customer + @date = @obj_order.created_at + @order_items = @booking.order_items end - render "origami/addorders/detail" + + render "origami/addorders/detail" end def update_modify_order - Rails.logger.debug "Order Source - " + params[:order_source].to_s - Rails.logger.debug "Table ID - " + params[:table_id].to_s + booking = Booking.find(params[:booking_id]) + sale = booking.sale + if sale && sale.sale_status != 'new' + render :json => { :status => false } + end + is_extra_time = false extra_time = '' - @cashier_type = "quick_service" + cashier_type = "quick_service" items_arr = [] - JSON.parse(params[:order_items]).each { |i| + JSON.parse(params[:order_items]).each { |i| i["item_instance_code"] = i["item_instance_code"].downcase.to_s if i["item_instance_code"].include? "ext" is_extra_time = true @@ -115,82 +112,32 @@ class Origami::QuickServiceController < ApplicationController } # begin - @order = Order.new - @order.source = params[:order_source] - @order.order_type = params[:order_type] - @order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile - @order.items = items_arr - @order.guest = params[:guest_info] - @order.table_id = params[:table_id] # this is dining facilities's id - @order.new_booking = true - @order.waiters = current_login_employee.name - @order.employee_name = current_login_employee.name + order = Order.new + order.source = params[:order_source] + order.order_type = params[:order_type] + order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile + order.items = items_arr + order.guest = params[:guest_info] + order.table_id = params[:table_id] # this is dining facilities's id + order.waiters = current_login_employee.name + order.employee_name = current_login_employee.name + + order.is_extra_time = is_extra_time + order.extra_time = extra_time - @order.is_extra_time = is_extra_time - @order.extra_time = extra_time + order.new_booking = false + order.booking_id = booking.booking_id - #Create Table Booking or Room Booking - if !params["booking_id"].nil? - # check booking id is already completed. - booking = Booking.find(params[:booking_id]) - if params[:table_id].to_i > 0 - table_status = booking.dining_facility_id.to_i == params[:table_id].to_i - else - table_status = true - end - if booking - if table_status && booking.booking_status != 'moved' - if !booking.sale_id.nil? - sale_status = check_order_with_booking(booking) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - else - @order.new_booking = false - @order.booking_id = params[:booking_id] - end - else - if params[:table_id].to_i > 0 - sale_status = check_order_with_table(params[:table_id]) - if sale_status - return return_json_status_with_code(400, "bill requested") - end - end - end - end #booking exists + if order.generate + if sale + Sale.add_to_existing_pending_invoice(nil, sale.sale_id, booking) + render :json => { :status => true, :data => sale } else - if params[:table_id].to_i > 0 - sale_status = check_order_with_table(params[:table_id]) - if sale_status - # return false , @message = "bill requested" - return return_json_status_with_code(400, "bill requested") - end - end + render :json => { :status => true, :data => 'OK' } end - - @status, @booking = @order.generate - if(params[:sale_id][0,3] == "SAL") - if @status && @booking && @order.source == 'quick_service' - if params[:sale_id] - @sale = Sale.find(params[:sale_id]) - if @order.table_id.to_i > 0 - @table_id = @order.table_id - else - @table_id = nil - end - update = Sale.add_to_existing_pending_invoice(@table_id,params[:sale_id],@booking) - end - - result = {:status=> true, :data => @sale } - render :json => result.to_json - end - elsif (params[:sale_id][0,3] == "BKI") - result = {:status=> true, :data => 'OK' } - render :json => result.to_json - else - result = {:status=> true, :data => nil } - render :json => result.to_json - end + else + render :json => { :status => false } + end end @@ -216,9 +163,9 @@ class Origami::QuickServiceController < ApplicationController return @sub_menu end end - + def get_all_product() - @product = Product.all + @product = Product.all end # render json for http status code @@ -232,20 +179,20 @@ class Origami::QuickServiceController < ApplicationController def check_order_with_table(table_id) table = DiningFacility.find(table_id) if table - booking = table.get_current_booking - # puts booking - if booking + booking = table.get_current_booking + # puts booking + if booking if !booking.sale_id.nil? if booking.sale.sale_status == "completed" || booking.sale.sale_status == "new" - @order.new_booking = true - return false + @order.new_booking = true + return false end else - @order.new_booking = false - @order.booking_id = booking.booking_id - return false - end - end + @order.new_booking = false + @order.booking_id = booking.booking_id + return false + end + end end end diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb index e1cec136..6d36f319 100755 --- a/app/controllers/origami/request_bills_controller.rb +++ b/app/controllers/origami/request_bills_controller.rb @@ -1,6 +1,6 @@ class Origami::RequestBillsController < ApplicationController before_action :check_user - + def check_user if current_user.nil? redirect_to root_path @@ -8,42 +8,30 @@ class Origami::RequestBillsController < ApplicationController end # Print Request Bill and add to sale tables def print - @sale = Sale.new - sale_order=SaleOrder.new - if !ShiftSale.current_shift.nil? order_id = params[:id] # order_id - bk_order = BookingOrder.find_by_order_id(order_id) order = Order.find(order_id) - check_booking = Booking.find_by_booking_id(bk_order.booking_id) - if check_booking.checkin_at.utc.strftime("%Y-%m-%d %H:%M") > Time.now.utc.strftime("%Y-%m-%d %H:%M") && check_booking.checkout_at.nil? + booking = order.booking + if booking.checkin_at.utc > Time.now.utc && booking.checkout_at.nil? @status = false @error_message = "Operation failed, Could not request bill!" else - if check_booking.dining_facility_id.to_i > 0 - table = DiningFacility.find(check_booking.dining_facility_id) - else - table = nil - end - - if check_booking.sale_id.nil? - # Create Sale if it doesn't exist - @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, current_user, order.source) - @sale_data = Sale.find_by_sale_id(@sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_id) + table = DiningFacility.find_by(id: booking.dining_facility_id) + if sale_data = booking.sale + @status = true + elsif sale_data = Sale.generate_invoice_from_booking(booking, current_login_employee, current_user, order.source, params[:current_checkin_induties_count]) + @status = true # in-duty update - in_duties = InDuty.where("booking_id=?",bk_order.booking_id) + in_duties = InDuty.where("booking_id=?", booking.id) if !in_duties.empty? in_duties.each do |in_duty| induty = InDuty.find(in_duty.id) - induty.sale_id = @sale_id + induty.sale_id = sale_data.sale_id + induty.out_time = Time.now.utc induty.save end end - else - @sale_data = Sale.find_by_sale_id(check_booking.sale_id) - @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) end # Bind shift sale id to sale @@ -52,17 +40,17 @@ class Origami::RequestBillsController < ApplicationController action_by = current_user.name type = "REQUEST_BILL" - - remark = "Request bill Receipt No #{@sale_data.receipt_no}" - sale_audit = SaleAudit.record_audit_sale(@sale_data.sale_id,remark,action_by,type ) + + remark = "Request bill Receipt No #{sale_data.receipt_no}" + sale_audit = SaleAudit.record_audit_sale(sale_data.sale_id,remark,action_by,type ) # Promotion Activation - Promotion.promo_activate(@sale) + Promotion.promo_activate(sale_data) - #bill channel + #bill channel if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end @@ -70,30 +58,30 @@ class Origami::RequestBillsController < ApplicationController ActionCable.server.broadcast "bill_channel",table: table, from: from end if order.source == "quick_service" || order.source == "food_court" - result = {:status=> @status, :data => @sale.sale_id } + result = {:status=> @status, :data => sale_data.sale_id } render :json => result.to_json else #check checkInOut pdf print - check_booking = Booking.find_by_sale_id(@sale_id) checkout_time = Lookup.collection_of('checkout_time') - if !check_booking.dining_facility_id.nil? - terminal = DiningFacility.find_by_id(check_booking.dining_facility_id) + if !booking.dining_facility_id.nil? + terminal = DiningFacility.find_by_id(booking.dining_facility_id) cashier_terminal = CashierTerminal.find_by_id(terminal.zone_id) if (!checkout_time.empty?) && (ENV["SERVER_MODE"] != "cloud") #no print in cloud server - unique_code = "CheckInOutPdf" + unique_code = "CheckInOutPdf" printer = PrintSetting.find_by_unique_code(unique_code) - # print when complete click + # print when complete click order_queue_printer = Printer::OrderQueuePrinter.new(printer) if !printer.nil? - order_queue_printer.print_check_in_out(printer, cashier_terminal, check_booking, table) + order_queue_printer.print_check_in_out(printer, cashier_terminal, booking, table) end - end - end + end + end end end + @status = true else @status = false @error_message = "No Current Open Shift for This Employee" @@ -119,7 +107,7 @@ class Origami::RequestBillsController < ApplicationController # printer = Printer::ReceiptPrinter.new(print_settings) - # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) + # printer.print_receipt_bill(print_settings, false, nil,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details) end end diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index b14ccc05..40f79afd 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -10,7 +10,7 @@ class Origami::SaleEditController < BaseOrigamiController @table_id = nil @table_type = nil end - + @cashier_type = params[:type] @saleobj = Sale.find(sale_id) end @@ -27,7 +27,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemObj.save @newsaleitem = SaleItem.new @newsaleitem = saleitemObj.dup - @newsaleitem.save + # @newsaleitem.save @newsaleitem.qty = saleitemObj.qty * -1 @newsaleitem.price = saleitemObj.price * -1 @newsaleitem.is_taxable = 1 @@ -39,19 +39,19 @@ class Origami::SaleEditController < BaseOrigamiController # re-calc tax saleObj = Sale.find(saleitemObj.sale_id) - - booking = Booking.find_by_sale_id(saleitemObj.sale_id) - booking.booking_orders.each do |bo| - order = Order.find(bo.order_id) - order.order_items.each do |o| - if saleitemObj.product_code == o.item_code - o.qty = saleitemObj.qty * -1 - o.price = saleitemObj.price * -1 - o.save - end - end - end - # FOr Sale Audit + + # booking = Booking.find_by_sale_id(saleitemObj.sale_id) + # booking.booking_orders.each do |bo| + # order = Order.find(bo.order_id) + # order.order_items.each do |o| + # if saleitemObj.product_code == o.item_code + # o.qty = saleitemObj.qty * -1 + # o.price = saleitemObj.price * -1 + # o.save + # end + # end + # end + # FOr Sale Audit action_by = current_user.name if access_code != "null" && current_user.role == "cashier" action_by = Employee.find_by_emp_id(access_code).name @@ -74,8 +74,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemObj.save @newsaleitem = SaleItem.new @newsaleitem = saleitemObj.dup - @newsaleitem.save - @newsaleitem.qty = saleitemObj.qty * -1 + @newsaleitem.qty = saleitemObj.qty * -1 @newsaleitem.unit_price = saleitemObj.unit_price * 1 @newsaleitem.taxable_price = saleitemObj.taxable_price * -1 @newsaleitem.price = saleitemObj.price * -1 @@ -147,7 +146,7 @@ class Origami::SaleEditController < BaseOrigamiController unless saleitemObj.product_name.include? 'updated' saleitemObj.product_name = saleitemObj.product_name + ' (UPDATED)' end - + saleitemObj.save # re-calc tax @@ -156,13 +155,13 @@ class Origami::SaleEditController < BaseOrigamiController order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id order = Order.find(order_id) - order.order_items.each do |o| - if saleitemObj.product_code == o.item_code - o.qty = update_qty - o.price = update_price - o.save - end - end + # order.order_items.each do |o| + # if saleitemObj.product_code == o.item_code + # o.qty = update_qty + # o.price = update_price + # o.save + # end + # end saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order_source) @@ -174,18 +173,18 @@ class Origami::SaleEditController < BaseOrigamiController saleitemId = params[:sale_item_id] access_code = params[:access_code] order_source = params[:type] - saleitemObj = SaleItem.find(saleitemId) - both = SaleItem.where('product_code=?', saleitemObj.product_code) - both.each do |item| - if item.qty.to_i > 0 - item.status = nil - item.save - end - end - saleitemObj.destroy + saleitemObj = SaleItem.find(saleitemId) + + saleObj = saleitemObj.sale + + saleObj.sale_items.where(product_code: saleitemObj.product_code) + .where(qty: saleitemObj.qty.abs) + .where(unit_price: saleitemObj.unit_price) + .where(status: saleitemObj.status).first.update(status: nil, remark: nil) + + saleitemObj.destroy # re-calc tax - saleObj = Sale.find(saleitemObj.sale_id) order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id order = Order.find(order_id) @@ -229,5 +228,5 @@ class Origami::SaleEditController < BaseOrigamiController ProductCommission.remove_product_commission(item) end end - + end diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index 4898dd4f..d2af3258 100755 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -2,9 +2,9 @@ class Origami::SalesController < BaseOrigamiController def show @webview = false if check_mobile - @webview = true + @webview = true end - + @tables = Table.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc') @complete = Sale.completed_sale("cashier") @@ -29,14 +29,11 @@ class Origami::SalesController < BaseOrigamiController sale_data = [] table = DiningFacility.find(dining) existing_booking = Booking.find_by_sale_id(sale_id) - table.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ").each do |booking| - # if !booking.checkout_at.nil? - # existing_booking.update_attributes(checkout_at: checkout_at) - # end - if booking.sale_id.nil? + table.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ").each do |booking| + if booking.sale_id.nil? order_array = [] booking.booking_orders.each do |booking_order| - + booking.booking_status = 'moved' order = Order.find(booking_order.order_id) order.status = 'billed' @@ -60,16 +57,15 @@ class Origami::SalesController < BaseOrigamiController booking.save order_array.push(order.order_id) - - end + end receipt_no = Sale.find(sale_id).receipt_no action_by = current_user.name type = "ADD_TO_EXISTING" - + remark = "#{action_by} add to existing order #{order_array} to Receipt No=>#{receipt_no} in #{table.name}" sale_audit = SaleAudit.record_audit_sale(sale_id,remark,action_by,type ) - + booking_order = BookingOrder.where('booking_id=?',booking) booking_order.each do |bo| bo.booking_id = existing_booking.booking_id @@ -77,10 +73,6 @@ class Origami::SalesController < BaseOrigamiController end end end - if !sale_data.empty? - # InventoryJob.perform_now(self.id) - InventoryDefinition.calculate_product_count(nil,sale_data) - end end end diff --git a/app/controllers/origami/second_display_controller.rb b/app/controllers/origami/second_display_controller.rb index d28d7b06..21c0674d 100644 --- a/app/controllers/origami/second_display_controller.rb +++ b/app/controllers/origami/second_display_controller.rb @@ -9,7 +9,7 @@ class Origami::SecondDisplayController < BaseOrigamiController def customer_view display_type = Lookup.find_by_lookup_type("display_type") - if !display_type.nil? && display_type.value.to_i == 2 + if !display_type.nil? && display_type.value.to_i == 2 if params[:status]!= "billed" tax_profiles = TaxProfile.all.order("order_by asc") else @@ -17,7 +17,7 @@ class Origami::SecondDisplayController < BaseOrigamiController end if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end ActionCable.server.broadcast "second_display_view_channel",data: params[:data],tax_profiles: tax_profiles,status:params[:status],from:from diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb index 52ac1571..f28c1428 100755 --- a/app/controllers/origami/shifts_controller.rb +++ b/app/controllers/origami/shifts_controller.rb @@ -11,6 +11,7 @@ class Origami::ShiftsController < BaseOrigamiController if !bank_integration[0].nil? @bank_integration = bank_integration[0][1] end + end def new @@ -26,7 +27,7 @@ class Origami::ShiftsController < BaseOrigamiController cashier_terminal = CashierTerminal.find(cashier_terminal_param) if cashier_terminal.is_currently_login respond_to do |format| - format.html { redirect_to settings_order_queue_stations_url, notice: 'Cashier Terminal already signin!' } + format.html { redirect_to settings_order_queue_stations_url, notice: 'Cashier Terminal already signin!' } end end @@ -38,17 +39,19 @@ class Origami::ShiftsController < BaseOrigamiController @shift_sale.create(opening_balance,cashier_terminal_param, current_user) end + + def update_shift closing_balance = params[:closing_balance] shift_id = params[:shift_id] @shift = ShiftSale.find_by_id(shift_id) if @shift @shift.shift_closed_at = DateTime.now.utc - @shift.closing_balance = closing_balance.to_f + @shift.closing_balance = closing_balance.to_f @shift.save # Multiple Cashier - cashier_terminal = @shift.cashier_terminal + cashier_terminal = @shift.cashier_terminal cashier_terminal.is_currently_login = 0 cashier_terminal.save @@ -56,7 +59,7 @@ class Origami::ShiftsController < BaseOrigamiController bank_integration = Lookup.find_by_lookup_type('bank_integration') if !bank_integration.nil? card_settle_trans = CardSettleTran.select('id').where(['shift_sale_id IS NULL and status IS NOT NULL']) - + card_settle_trans.each do |data| card_sett_trans = CardSettleTran.find(data.id) card_sett_trans.shift_sale_id = @shift.id @@ -66,12 +69,17 @@ class Origami::ShiftsController < BaseOrigamiController if ENV["SERVER_MODE"] != "cloud" #no print in cloud server + + + # if !close_cashier_print[0].nil? + # @close_cashier_print = close_cashier_print[0][1] + # end close_cashier_pdf = Lookup.collection_of("print_settings") unique_code = "CloseCashierPdf" if !close_cashier_pdf.empty? close_cashier_pdf.each do |close_cashier| - if close_cashier[0] == 'CloseCashierCustomisePdf' + if close_cashier[0] == 'CloseCashierCustomisePdf' if close_cashier[1] == '1' unique_code="CloseCashierCustomisePdf" else @@ -83,6 +91,13 @@ class Origami::ShiftsController < BaseOrigamiController shop_details = shop_detail #get tax shift_obj = ShiftSale.where('id =?',@shift.id) + sale_items = '' + @lookup = Lookup.shift_sale_items_lookup_value + if @lookup.to_i == 1 + @sale_items = Sale.get_shift_sale_items(@shift.id) + other_charges = Sale.get_other_charges() + @total_other_charges_info = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",@shift) + end @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') @total_waste = Sale.get_total_waste(shift_id).sum(:grand_total) @total_spoile = Sale.get_total_spoile(shift_id).sum(:grand_total) @@ -101,12 +116,21 @@ class Origami::ShiftsController < BaseOrigamiController # get printer info print_settings = PrintSetting.find_by_unique_code(unique_code) printer = Printer::CashierStationPrinter.new(print_settings) - - printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments) + + # print close cashier setting + close_cashier_print = Lookup.collection_of('close_cashier_print') + if close_cashier_print.empty? + @settings_lookup = Lookup.new(lookup_type: "close_cashier_print", name: "CloseCashierPrint", value: "1") + @settings_lookup.save + end + find_close_cashier_print = Lookup.collection_of('close_cashier_print') + if find_close_cashier_print[0][1].to_i > 0 + printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items, @total_other_charges_info, shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments) + end end end Employee.logout(session[:session_token]) - session[:session_token] = nil + session[:session_token] = nil end def edit @@ -128,7 +152,7 @@ class Origami::ShiftsController < BaseOrigamiController @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') @total_member_discount = ShiftSale.get_total_member_discount(@shift) end - + end end diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb index c7311fd6..fb6db35f 100755 --- a/app/controllers/origami/split_bill_controller.rb +++ b/app/controllers/origami/split_bill_controller.rb @@ -4,12 +4,12 @@ class Origami::SplitBillController < BaseOrigamiController def index @webview = false if check_mobile - @webview = true + @webview = true end - + dining_id = params[:dining_id] @cashier_type = params[:type] - @table = DiningFacility.find(dining_id) + @table = DiningFacility.find(dining_id) @booking = @table.get_booking @orders = Array.new @order_items = Array.new @@ -47,10 +47,10 @@ class Origami::SplitBillController < BaseOrigamiController arr_item = Hash.new if item.qty.to_i > 1 i = 1 - while i <= item.qty.to_i do - arr_item = {'order_items_id' => item.order_items_id, - 'order_id' => item.order_id, - 'order_item_status' => item.order_item_status, + while i <= item.qty.to_i do + arr_item = {'order_items_id' => item.order_items_id, + 'order_id' => item.order_id, + 'order_item_status' => item.order_item_status, 'item_order_by' => item.item_order_by, 'item_code' => item.item_code, 'item_instance_code' => item.item_instance_code, @@ -91,7 +91,7 @@ class Origami::SplitBillController < BaseOrigamiController arr_order_ids = JSON.parse(params[:arr_order_ids]) end orders = nil - if !params[:orders].empty? + if !params[:orders].empty? orders = JSON.parse(params[:orders]) end order_items = nil @@ -102,31 +102,27 @@ class Origami::SplitBillController < BaseOrigamiController status = false if !ShiftSale.current_shift.nil? #create Bill by Booking ID - table = 0 - if !params[:booking_id].empty? - booking = Booking.find(params[:booking_id]) - # for Multiple Cashier by Zone - if booking.dining_facility_id.to_i>0 - table = DiningFacility.find(booking.dining_facility_id) - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - else - table = nil - cashier_zone = nil - end + table = 0 + if !params[:booking_id].empty? + booking = Booking.find(params[:booking_id]) + # for Multiple Cashier by Zone + if booking.dining_facility_id.to_i>0 + table = DiningFacility.find(booking.dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + else + table = nil + cashier_zone = nil + end # shift_by_terminal = ShiftSale.find_by_cashier_terminal_id_and_shift_closed_at(cashier_zone.cashier_terminal_id,nil) # get_cashier_by_terminal = Employee.find(shift_by_terminal.employee_id) - if booking - if booking.sale_id.nil? - sale = Sale.new - status, sale_id = sale.generate_invoice_from_booking(params[:booking_id], current_user, current_user, cashier_type) - sale_data = Sale.find_by_sale_id(sale_id) - else - status = true - sale_id = booking.sale_id - sale_data = Sale.find_by_sale_id(sale_id) - end + if sale_data = booking.sale + status = true + elsif sale_data = Sale.generate_invoice_from_booking(booking, current_user, current_user, cashier_type,params[:current_checkin_induties_count]) + status = true + else + status = false end else if params[:type] == "Table" @@ -283,7 +279,7 @@ class Origami::SplitBillController < BaseOrigamiController end else if order_ids.count == 1 && order_item_count == 1 - if order_id_count == 0 + if order_id_count == 0 customer = Customer.find(params[:customer_id]) order_type = "dine_in" if !customer.nil? @@ -332,18 +328,19 @@ class Origami::SplitBillController < BaseOrigamiController end end - sale = Sale.new - status, sale_id = sale.generate_invoice_from_booking(booking.booking_id, current_user, current_user, cashier_type) - end + if sale_data = Sale.generate_invoice_from_booking(booking, current_user, current_user, cashier_type ,params[:current_checkin_induties_count]) + status = true + end + end - Promotion.promo_activate(sale) + Promotion.promo_activate(sale_data) if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end ActionCable.server.broadcast "bill_channel",table: table,from:from - + render :json => { status: status } else render :json => { status: false, error_message: 'No Current Open Shift!'} @@ -381,17 +378,17 @@ class Origami::SplitBillController < BaseOrigamiController same_order = OrderItem.find_by_order_id(order_id) if same_order.nil? - OrderItem.processs_item(orderItem.item_code, - orderItem.item_instance_code, - orderItem.item_name, - orderItem.alt_name, + OrderItem.processs_item(orderItem.item_code, + orderItem.item_instance_code, + orderItem.item_name, + orderItem.alt_name, orderItem.account_id, order_item['qty'], - orderItem.price, - orderItem.options, - set_menu_items_obj.to_json, + orderItem.price, + orderItem.options, + set_menu_items_obj.to_json, order_id, - orderItem.item_order_by, + orderItem.item_order_by, orderItem.taxable) else same_order.qty = same_order.qty.to_f + order_item['qty'].to_f diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb index 0e94c7c4..7082e44c 100755 --- a/app/controllers/origami/table_invoices_controller.rb +++ b/app/controllers/origami/table_invoices_controller.rb @@ -30,7 +30,7 @@ class Origami::TableInvoicesController < BaseOrigamiController end def show - puts 'Catch me if you can.......................' + # puts 'Catch me if you can.......................' @table = DiningFacility.find(params[:table_id]) @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index e2c3250e..6af6c275 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -8,7 +8,6 @@ class Origami::VoidController < BaseOrigamiController access_code = params[:access_code] if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) - if sale.discount_type == "member_discount" sale.update_attributes(total_discount: 0) sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source) @@ -28,7 +27,7 @@ class Origami::VoidController < BaseOrigamiController shift.save end end - + sale.rounding_adjustment = 0.0 sale.payment_status = 'void' sale.sale_status = 'void' @@ -71,16 +70,16 @@ class Origami::VoidController < BaseOrigamiController table = nil end - # FOr Sale Audit + # FOr Sale Audit action_by = current_user.name if access_code != "null" && current_user.role == "cashier" action_by = Employee.find_by_emp_id(access_code).name end - + # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" sale_audit = SaleAudit.record_audit_for_edit(sale_id,current_user.name, action_by,remark,"SALEVOID" ) - # For Print + # For Print member_info = nil rebate_amount = nil @@ -88,7 +87,7 @@ class Origami::VoidController < BaseOrigamiController # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") - if bookings.count > 1 + if bookings.count > 1 # for Multiple Booking if bookings[0].dining_facility_id.to_i>0 table = DiningFacility.find(bookings[0].dining_facility_id) @@ -102,12 +101,20 @@ class Origami::VoidController < BaseOrigamiController shift = ShiftSale.find(sale.shift_sale_id) cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) end - + # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server - unique_code = "ReceiptBillPdf" + # get printer info + # print_settings = PrintSetting.find_by_unique_code('ReceiptBillPdf') # SaleItemsPdf + # + # if !print_settings.nil? + # unique_code = 'ReceiptBillPdf' + # elsif + # unique_code = 'ReceiptBillStarPdf' + # end + customer= Customer.find(sale.customer_id) - + #shop detail shop_details = current_shop # get member information @@ -119,34 +126,48 @@ class Origami::VoidController < BaseOrigamiController current_balance = 0 end + printer = PrintSetting.all + + unique_code="ReceiptBillPdf" + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'ReceiptBillPdf' + unique_code="ReceiptBillPdf" + elsif printer_setting.unique_code == 'ReceiptBillA5Pdf' + unique_code="ReceiptBillA5Pdf" + elsif printer_setting.unique_code == 'ReceiptBillStarPdf' + unique_code="ReceiptBillStarPdf" + end + end + end # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) # Calculate Food and Beverage Total item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items) discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items) other_amount = SaleItem.calculate_other_charges(sale.sale_items) - printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,other_amount,nil,nil,nil) - result = { - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + printer = Printer::ReceiptPrinter.new(print_settings) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,other_amount,nil,nil,nil) + result = { + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } # Mobile Print render :json => result.to_json # end - + #end print # update complete order items in oqs - SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr| + SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr| AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi| aoi.delivery_status = 1 aoi.save end end end - end - -end \ No newline at end of file + end + +end diff --git a/app/controllers/origami/waste_spoile_controller.rb b/app/controllers/origami/waste_spoile_controller.rb index 82c62a7e..2d4c9367 100755 --- a/app/controllers/origami/waste_spoile_controller.rb +++ b/app/controllers/origami/waste_spoile_controller.rb @@ -18,7 +18,7 @@ class Origami::WasteSpoileController < BaseOrigamiController # sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source) # add to sale item with foc # sale_items = SaleItem.where("sale_id='#{ sale_id }' and status is null") - + sale.sale_items.each do|item| # SaleItem.update_existing_item(item.qty, item, sale_id, remark, item.unit_price, item.price) item.status = remark @@ -53,7 +53,7 @@ class Origami::WasteSpoileController < BaseOrigamiController table = nil end - # FOr Sale Audit + # FOr Sale Audit action_by = current_user.name if access_code != "null" && current_user.role == "cashier" action_by = Employee.find_by_emp_id(access_code).name @@ -61,7 +61,7 @@ class Origami::WasteSpoileController < BaseOrigamiController # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" sale_audit = SaleAudit.record_audit_for_edit(sale_id,current_user.name, action_by,remark,remark ) - # For Print + # For Print member_info = nil rebate_amount = nil @@ -69,7 +69,7 @@ class Origami::WasteSpoileController < BaseOrigamiController # For Cashier by Zone bookings = Booking.where("sale_id='#{sale_id}'") - if bookings.count > 1 + if bookings.count > 1 # for Multiple Booking if bookings[0].dining_facility_id.to_i>0 table = DiningFacility.find(bookings[0].dining_facility_id) @@ -83,12 +83,12 @@ class Origami::WasteSpoileController < BaseOrigamiController shift = ShiftSale.find(sale.shift_sale_id) cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) end - + # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server - unique_code = "ReceiptBillPdf" + # unique_code = "ReceiptBillPdf" customer= Customer.find(sale.customer_id) - + #shop detail shop_details = current_shop # get member information @@ -100,34 +100,49 @@ class Origami::WasteSpoileController < BaseOrigamiController current_balance = 0 end + printer = PrintSetting.all + + unique_code="ReceiptBillPdf" + if !printer.empty? + printer.each do |printer_setting| + if printer_setting.unique_code == 'ReceiptBillPdf' + unique_code="ReceiptBillPdf" + elsif printer_setting.unique_code == 'ReceiptBillA5Pdf' + unique_code="ReceiptBillA5Pdf" + elsif printer_setting.unique_code == 'ReceiptBillStarPdf' + unique_code="ReceiptBillStarPdf" + end + end + end + # get printer info print_settings=PrintSetting.find_by_unique_code(unique_code) # Calculate Food and Beverage Total item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale.sale_items) discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale.sale_items) other_amount = SaleItem.calculate_other_charges(sale.sale_items) - printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil,other_amount,nil,nil,nil) - result = { - :filepath => filename, - :printer_model => print_settings.brand_name, - :printer_url => print_settings.api_settings + printer = Printer::ReceiptPrinter.new(print_settings) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, remark,current_balance,nil,other_amount,nil,nil,nil) + result = { + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings } # Mobile Print render :json => result.to_json # end - + #end print # update complete order items in oqs - SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr| + SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr| AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi| aoi.delivery_status = 1 aoi.save end end end - end - -end \ No newline at end of file + end + +end diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index db6c8848..c1e13727 100755 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -11,6 +11,7 @@ class PrintSettingsController < ApplicationController # GET /print_settings/1 # GET /print_settings/1.json def show + @lookup = Lookup.shift_sale_items_lookup_value end # GET /print_settings/new @@ -21,6 +22,7 @@ class PrintSettingsController < ApplicationController # GET /print_settings/1/edit def edit + @lookup = Lookup.shift_sale_items_lookup_value @server_mode = ENV["SERVER_MODE"] end @@ -45,6 +47,10 @@ class PrintSettingsController < ApplicationController def update respond_to do |format| if @print_setting.update(print_setting_params) + if @print_setting.unique_code == 'CloseCashierPdf' + Lookup.save_shift_sale_items_settings(params[:shift_sale_items]) + end + format.html { redirect_to @print_setting, notice: 'Print setting was successfully updated.' } format.json { render :show, status: :ok, location: @print_setting } else diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb index 838536a7..2603fce4 100755 --- a/app/controllers/reports/dailysale_controller.rb +++ b/app/controllers/reports/dailysale_controller.rb @@ -1,6 +1,6 @@ class Reports::DailysaleController < BaseReportController authorize_resource :class => false - + def index from, to = get_date_range_from_params @sale_data = Sale.daily_sales_list(from,to) @@ -9,6 +9,7 @@ class Reports::DailysaleController < BaseReportController @to = to @payment_methods = PaymentMethodSetting.where("is_active='1'").pluck("payment_method") + # get printer info @print_settings = PrintSetting.get_precision_delimiter() respond_to do |format| @@ -16,9 +17,9 @@ class Reports::DailysaleController < BaseReportController format.xls end end - + def show - + end - + end diff --git a/app/controllers/reports/hourly_saleitem_controller.bk.rb b/app/controllers/reports/hourly_saleitem_controller.bk.rb new file mode 100644 index 00000000..88a61335 --- /dev/null +++ b/app/controllers/reports/hourly_saleitem_controller.bk.rb @@ -0,0 +1,200 @@ +class Reports::HourlySaleitemController < BaseReportController + authorize_resource :class => false + def index + + @account = Account.all + from, to = get_date_range_from_params + + shift_sale_range = '' + + shift = '' + if params[:shift_name].to_i != 0 + + shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + if shift_sale.shift_closed_at.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at) + else + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + end + + account_type = params[:account_type] + @type = params[:sale_type] + @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + logger.debug 'product>>>>>>>>>>>>>>>>>>>>>>>>>>' + # logger.debug @sale_data.group_by {|s| s.date_format }.collect{|key,qty| {"Date" =>key , "total_qty" => qty.sum{|d| d.qty.to_i}}} + + @hourly_total_qty = @sale_data.group_by {|s| s.date_format }.collect{|key,qty| {"date" => key , "total_qty" => qty.sum{|d| d.qty.to_i}}} + logger.debug @hourly_total_qty + + @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil) + + @account_cate_count = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1} + + + @menu_cate_count = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1} + + + @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + + @from = from + @to = to + + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() + + if shift.present? + shift.each do |sh| + @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = sh + end + end + + respond_to do |format| + format.html + format.xls + end + end + + def show + from, to, report_type = get_date_range_from_params + @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + sale_data = @sale_data + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + shift_id = sale.id.nil? ? '-' : sale.id + str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + logger.debug 'show date arr####################' + logger.debug date_arr + end + + # @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end + end + + def print_sale_items + from, to = get_date_range_from_params + + shift_sale_range = '' + + shift = '' + shift_name = 'All Shift' + if params[:shift_name].to_i != 0 + + shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + if shift_sale.shift_closed_at.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at) + else + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + + sh_name = "#{shift_sale.shift_started_at.utc.getlocal.strftime('%d %B %l:%M%p')} - #{shift_sale.shift_closed_at.utc.getlocal.strftime('%d %B %l:%M%p')}" + employee = Employee.find(shift_sale.employee_id) + shift_name = employee.nil? ? sh_name : "#{sh_name} (#{employee.name})" + end + + shop_details = shop_detail + account_type = params[:account_type] + @type = params[:period_type] + period_name = get_period_name(params[:period]) + + @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + other_charges = Sale.get_other_charges() + if shift.present? + @total_other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + else + @total_other_charges = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) + end + + # get printer info + print_settings = PrintSetting.find_by_unique_code('SaleItemsPdf') # SaleItemsPdf + print_settings_star = PrintSetting.find_by_unique_code('SaleItemsStarPdf') + + # if print_settings.nil? && print_settings_star.nil? + # @print_setting = PrintSetting.new(name: "SaleItemsPdf", unique_code: "SaleItemsPdf", template: "",font: "Zawgyi-One", header_font_size: "10", item_font_size: "8", printer_name: "", api_settings: "", brand_name: nil, printer_type: nil, page_width: "210", page_height: "1450", print_copies: "1", precision: "0", delimiter: "0", heading_space: "5" ) + # @print_setting.save + # end + + if print_settings.nil? + if !print_settings_star.nil? + printer = Printer::CashierStationPrinter.new(print_settings_star) + printer.print_sale_items_report(print_settings_star, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) + end + else + printer = Printer::CashierStationPrinter.new(print_settings) + printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) + end + + respond_to do |format| + format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'} + format + end + end + + def get_period_name(period) + period_name = '-' + unless period.nil? or period.blank? + case period.to_i + when PERIOD["today"] + period_name = "Today" + + when PERIOD["yesterday"] + period_name = "Yesterday" + + when PERIOD["this_week"] + period_name = "This Week" + + when PERIOD["last_week"] + period_name = "Last Week" + + when PERIOD["last_7"] + period_name = "Last 7 days" + + when PERIOD["this_month"] + period_name = "This Month" + + when PERIOD["last_month"] + period_name = "Last Month" + + when PERIOD["last_30"] + period_name = "Last 30 Days" + + when PERIOD["this_year"] + period_name = "This Year" + + when PERIOD["last_year"] + period_name = "Last Year" + + end + end + return period_name + end + +end diff --git a/app/controllers/reports/hourly_saleitem_controller.rb b/app/controllers/reports/hourly_saleitem_controller.rb new file mode 100644 index 00000000..a08c24e4 --- /dev/null +++ b/app/controllers/reports/hourly_saleitem_controller.rb @@ -0,0 +1,196 @@ +class Reports::HourlySaleitemController < BaseReportController + authorize_resource :class => false + def index + + @account = Account.all + from, to = get_date_range_from_params + + shift_sale_range = '' + + shift = '' + if params[:shift_name].to_i != 0 + + shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + if shift_sale.shift_closed_at.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at) + else + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + end + + account_type = params[:account_type] + @type = params[:sale_type] + @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_hourly_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + + @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil) + + @account_cate_count = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1} + + + @menu_cate_count = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1} + + + @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + + @from = from + @to = to + + # get printer info + @print_settings = PrintSetting.get_precision_delimiter() + + if shift.present? + shift.each do |sh| + @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_to = sh.shift_closed_at.nil? ? '-' : sh.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p") + @shift_data = sh + end + end + # @hourly_total_qty = @sale_data.group_by {|s| s.date_format }.collect{|key,qty| {"date" => key , "total_qty" => qty.sum{|d| d.qty.to_i}}} + @hourly_total_qty = @sale_data.group_by(&:date_format).map { |k,v|{"date" => k , "total_qty" => v.count }} + + + respond_to do |format| + format.html + format.xls + end + end + + def show + from, to, report_type = get_date_range_from_params + @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + sale_data = @sale_data + date_arr = Array.new + @sale_data.each do |sale| + local_opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc.getlocal.strftime("%e %b %I:%M%p") + local_closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc.getlocal.strftime("%e %b %I:%M%p") + opening_date = sale.opening_date.nil? ? '-' : sale.opening_date.utc + closing_date = sale.closing_date.nil? ? '-' : sale.closing_date.utc + shift_id = sale.id.nil? ? '-' : sale.id + str = {:shift_id => shift_id, :local_opening_date => local_opening_date, :local_closing_date => local_closing_date, :opening_date => opening_date, :closing_date => closing_date} + date_arr.push(str) + end + + # @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + + out = {:status => 'ok', :message => date_arr} + + respond_to do |format| + format.json { render json: out } + end + end + + def print_sale_items + from, to = get_date_range_from_params + + shift_sale_range = '' + + shift = '' + shift_name = 'All Shift' + if params[:shift_name].to_i != 0 + + shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + if shift_sale.shift_closed_at.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at) + else + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + + sh_name = "#{shift_sale.shift_started_at.utc.getlocal.strftime('%d %B %l:%M%p')} - #{shift_sale.shift_closed_at.utc.getlocal.strftime('%d %B %l:%M%p')}" + employee = Employee.find(shift_sale.employee_id) + shift_name = employee.nil? ? sh_name : "#{sh_name} (#{employee.name})" + end + + shop_details = shop_detail + account_type = params[:account_type] + @type = params[:period_type] + period_name = get_period_name(params[:period]) + + @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_hourly_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + other_charges = Sale.get_other_charges() + if shift.present? + @total_other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + else + @total_other_charges = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) + end + + # get printer info + print_settings = PrintSetting.find_by_unique_code('SaleItemsPdf') # SaleItemsPdf + print_settings_star = PrintSetting.find_by_unique_code('SaleItemsStarPdf') + + # if print_settings.nil? && print_settings_star.nil? + # @print_setting = PrintSetting.new(name: "SaleItemsPdf", unique_code: "SaleItemsPdf", template: "",font: "Zawgyi-One", header_font_size: "10", item_font_size: "8", printer_name: "", api_settings: "", brand_name: nil, printer_type: nil, page_width: "210", page_height: "1450", print_copies: "1", precision: "0", delimiter: "0", heading_space: "5" ) + # @print_setting.save + # end + + if print_settings.nil? + if !print_settings_star.nil? + printer = Printer::CashierStationPrinter.new(print_settings_star) + printer.print_sale_items_report(print_settings_star, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) + end + else + printer = Printer::CashierStationPrinter.new(print_settings) + printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) + end + + respond_to do |format| + format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'} + format + end + end + + def get_period_name(period) + period_name = '-' + unless period.nil? or period.blank? + case period.to_i + when PERIOD["today"] + period_name = "Today" + + when PERIOD["yesterday"] + period_name = "Yesterday" + + when PERIOD["this_week"] + period_name = "This Week" + + when PERIOD["last_week"] + period_name = "Last Week" + + when PERIOD["last_7"] + period_name = "Last 7 days" + + when PERIOD["this_month"] + period_name = "This Month" + + when PERIOD["last_month"] + period_name = "Last Month" + + when PERIOD["last_30"] + period_name = "Last 30 Days" + + when PERIOD["this_year"] + period_name = "This Year" + + when PERIOD["last_year"] + period_name = "Last Year" + + end + end + return period_name + end + +end diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb index 659b51e4..414c4e07 100644 --- a/app/controllers/reports/payment_method_controller.rb +++ b/app/controllers/reports/payment_method_controller.rb @@ -2,7 +2,7 @@ class Reports::PaymentMethodController < BaseReportController # authorize_resource :class => false def index - @payments = [["All Payment",''],["Cash Payment","cash"], ["Credit Payment","creditnote"], + @payments = [["All Payment",''],["Cash Payment","cash"], ["KBZ Payment", KbzPay::KBZ_PAY], ["Credit Payment","creditnote"], ["FOC Payment","foc"], ["MPU Payment","mpu"], ["Visa Payment","visa"], ["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"], ["Alipay Payment","alipay"],["Paymal Payment", "paymal"],["Dinga Payment","dinga"], diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index d966a00f..eeff4bf0 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -1,4 +1,4 @@ -class Reports::ReceiptNoController < BaseReportController +class Reports::ReceiptNoController < BaseReportController authorize_resource :class => false def index @payments = [["All Payment",''], ["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"]] @@ -13,7 +13,7 @@ authorize_resource :class => false @shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) @shift_sale = ShiftSale.find(params[:shift_name]) - if to.blank? + if to.blank? @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',@shift_sale.shift_started_at) else if @shift_sale.shift_closed_at.blank? @@ -24,8 +24,13 @@ authorize_resource :class => false end end + @lookup = Lookup.find_by_lookup_type('reprint_receipt') + if @lookup.nil? + @lookup = Lookup.create_reprint_receipt_lookup + end + payment_type = params[:payment_type] - @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) + @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) @tax_profiles = TaxProfile.group('name').order('order_by asc') #.limit(2) @@ -64,10 +69,171 @@ authorize_resource :class => false end out = {:status => 'ok', :message => date_arr} - + respond_to do |format| format.json { render json: out } end end - -end \ No newline at end of file + + def sync_data + @orders, @order_items, @sales, @sale_items, @sale_taxes, @sale_payments, @sale_orders, @sale_audits, @bookings, @assigned_order_items, @shift_sales = Booking.get_sync_data(params[:sale_id]) + + # Here comes to call the sync api + # url = "http://192.168.1.176:3000/en/api/sync_data" + url = Lookup.sync_url + token = Lookup.get_sync_token + @message = '' + # token = Lookup.token + + unless url.nil? and token.nil? + begin + @result = HTTParty.post(url.to_str, + :body => { :orders => @orders, + :order_items => @order_items, + :sale_orders => @sale_orders, + :sales => @sales, + :sale_items => @sale_items, + :sale_audits => @sale_audits, + :sale_payments => @sale_payments, + :sale_taxes => @sale_taxes, + :bookings => @bookings, + :assigned_order_items => @assigned_order_items, + :shift_sales => @shift_sales + }.to_json, + :headers => { + 'Content-Type' => 'application/json', + 'Authorization' => "Bearer #{token}" + }, :timeout => 10, + :verify_ssl => OpenSSL::SSL::VERIFY_NONE, + :verify => false ) + + rescue HTTParty::Error + response = { status: false, message: "Can't open membership server "} + rescue Net::OpenTimeout + response = { status: false, message: "Can't open membership server "} + rescue OpenURI::HTTPError + puts "Fire in here" + response = { status: false, message: "Can't open membership server "} + rescue SocketError + response = { status: false, message: "Can't open server "} + rescue Errno::EHOSTDOWN + response = { status: false, message: "Can't open server "} + rescue Errno::ECONNREFUSED, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError + response = { status: false, message: "Can't open membership server"} + end + + puts url + puts response + @message = @result.parsed_response['message'] + end + + respond_to do |format| + format.html { redirect_to '/en/reports/receipt_no/', notice: @message} + end + end + + def reprint + sale_id = params[:sale_id] + member_info = nil + latest_order_no = nil + saleObj = Sale.find(sale_id) + + # For Cashier by Zone + bookings = Booking.where("sale_id='#{sale_id}'") + + booking = Booking.find_by_sale_id(sale_id) + latest_order = booking.booking_orders.joins(" JOIN orders ON orders.order_id = booking_orders.order_id").where("orders.source = 'quick_service'").order("order_id DESC").limit(1).first() + if !latest_order.nil? + latest_order_no = latest_order.order_id + end + # if bookings.count > 1 + # # for Multiple Booking + # table = DiningFacility.find(bookings[0].dining_facility_id) + # else + # table = DiningFacility.find(bookings[0].dining_facility_id) + # end + shift = ShiftSale.current_open_shift(current_user.id) + if !shift.nil? + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + else + if bookings[0].dining_facility_id.to_i > 0 + table = DiningFacility.find(bookings[0].dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + else + shift = ShiftSale.find(saleObj.shift_sale_id) + cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + end + end + + # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server + receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf + unique_code = "ReceiptBillPdf" + if !receipt_bill_a5_pdf.empty? + receipt_bill_a5_pdf.each do |receipt_bilA5| + if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + if receipt_bilA5[1] == '1' + unique_code = "ReceiptBillA5Pdf" + else + unique_code = "ReceiptBillPdf" + end + end + end + end + customer= Customer.find(saleObj.customer_id) + + #shop detail + #shop_detail = Shop.first + # get member information + rebate = MembershipSetting.find_by_rebate(1) + if customer.membership_id != nil && rebate + member_info = Customer.get_member_account(customer) + rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + current_balance = SaleAudit.paymal_search(sale_id) + end + + #for card sale data + card_data = Array.new + card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) + if !card_sale_trans_ref_no.nil? + card_sale_trans_ref_no.each do |cash_sale_trans| + card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s + card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s + card_no = cash_sale_trans.pan.last(4) + card_no = card_no.rjust(19,"**** **** **** ") + card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id}) + end + end + + #card_balance amount for Paymal payment + card_balance_amount = SaleAudit.getCardBalanceAmount(sale_id) + + # get printer info + print_settings=PrintSetting.find_by_unique_code(unique_code) + + # Calculate price_by_accounts + item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) + discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) + other_amount = SaleItem.calculate_other_charges(saleObj.sale_items) + + printer = Printer::ReceiptPrinter.new(print_settings) + + filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings, false, nil, cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_detail, "Re-print",current_balance,card_data,other_amount,latest_order_no,card_balance_amount,nil) + + result = { + :status => true, + :filepath => filename, + :printer_model => print_settings.brand_name, + :printer_url => print_settings.api_settings + } + + # Mobile Print + # render :json => result.to_json + respond_to do |format| + format.html { redirect_to '/en/reports/receipt_no/', notice: "Printing Completed."} + format.json { render json: result } + end + # end + end + +end diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb index aff7f3c2..0d339fd6 100755 --- a/app/controllers/reports/saleitem_controller.rb +++ b/app/controllers/reports/saleitem_controller.rb @@ -1,7 +1,7 @@ class Reports::SaleitemController < BaseReportController authorize_resource :class => false def index - + @account = Account.all from, to = get_date_range_from_params @@ -13,7 +13,7 @@ class Reports::SaleitemController < BaseReportController shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) shift_sale = ShiftSale.find(params[:shift_name]) - if to.blank? + if to.blank? shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) else if shift_sale.shift_closed_at.blank? @@ -31,10 +31,9 @@ class Reports::SaleitemController < BaseReportController @sale_taxes = Sale.get_separate_tax(shift_sale_range,shift,from,to,nil) @account_cate_count = Hash.new {|hash, key| hash[key] = 0} - - @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1} + @menu_cate_count = Hash.new {|hash, key| hash[key] = 0} @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1} @@ -44,7 +43,7 @@ class Reports::SaleitemController < BaseReportController @from = from @to = to - + # get printer info @print_settings = PrintSetting.get_precision_delimiter() @@ -55,8 +54,7 @@ class Reports::SaleitemController < BaseReportController @shift_data = sh end end - - respond_to do |format| + respond_to do |format| format.html format.xls end @@ -81,10 +79,114 @@ class Reports::SaleitemController < BaseReportController # @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} out = {:status => 'ok', :message => date_arr} - + respond_to do |format| format.json { render json: out } end end - + + def print_sale_items + from, to = get_date_range_from_params + + shift_sale_range = '' + + shift = '' + shift_name = 'All Shift' + if params[:shift_name].to_i != 0 + + shift_sale_range = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) + + shift_sale = ShiftSale.find(params[:shift_name]) + if to.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL ',shift_sale.shift_started_at) + else + if shift_sale.shift_closed_at.blank? + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at is NULL',shift_sale.shift_started_at) + else + shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) + end + end + + sh_name = "#{shift_sale.shift_started_at.utc.getlocal.strftime('%d %B %l:%M%p')} - #{shift_sale.shift_closed_at.utc.getlocal.strftime('%d %B %l:%M%p')}" + employee = Employee.find(shift_sale.employee_id) + shift_name = employee.nil? ? sh_name : "#{sh_name} (#{employee.name})" + end + + shop_details = shop_detail + account_type = params[:account_type] + @type = params[:period_type] + period_name = get_period_name(params[:period]) + + @sale_data, @other_charges,@product, @discount_data , @cash_data , @card_data , @credit_data , @foc_data , @grand_total , @change_amount = Sale.get_by_shift_items(shift_sale_range,shift, from, to, Sale::SALE_STATUS_COMPLETED,@type,account_type) + other_charges = Sale.get_other_charges() + if shift.present? + @total_other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + else + @total_other_charges = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) + end + + # get printer info + print_settings = PrintSetting.find_by_unique_code('SaleItemsPdf') # SaleItemsPdf + print_settings_star = PrintSetting.find_by_unique_code('SaleItemsStarPdf') + + # if print_settings.nil? && print_settings_star.nil? + # @print_setting = PrintSetting.new(name: "SaleItemsPdf", unique_code: "SaleItemsPdf", template: "",font: "Zawgyi-One", header_font_size: "10", item_font_size: "8", printer_name: "", api_settings: "", brand_name: nil, printer_type: nil, page_width: "210", page_height: "1450", print_copies: "1", precision: "0", delimiter: "0", heading_space: "5" ) + # @print_setting.save + # end + + if print_settings.nil? + if !print_settings_star.nil? + printer = Printer::CashierStationPrinter.new(print_settings_star) + printer.print_sale_items_report(print_settings_star, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) + end + else + printer = Printer::CashierStationPrinter.new(print_settings) + printer.print_sale_items_report(print_settings, shop_details, period_name, @type, account_type, from, to, shift_name, @sale_data, @total_other_charges) + end + + respond_to do |format| + format.html { redirect_to '/en/reports/saleitem/', notice: 'Printing Completed.'} + format + end + end + + def get_period_name(period) + period_name = '-' + unless period.nil? or period.blank? + case period.to_i + when PERIOD["today"] + period_name = "Today" + + when PERIOD["yesterday"] + period_name = "Yesterday" + + when PERIOD["this_week"] + period_name = "This Week" + + when PERIOD["last_week"] + period_name = "Last Week" + + when PERIOD["last_7"] + period_name = "Last 7 days" + + when PERIOD["this_month"] + period_name = "This Month" + + when PERIOD["last_month"] + period_name = "Last Month" + + when PERIOD["last_30"] + period_name = "Last 30 Days" + + when PERIOD["this_year"] + period_name = "This Year" + + when PERIOD["last_year"] + period_name = "Last Year" + + end + end + return period_name + end + end diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb index 300e1079..0c42a05f 100755 --- a/app/controllers/reports/shiftsale_controller.rb +++ b/app/controllers/reports/shiftsale_controller.rb @@ -1,6 +1,6 @@ class Reports::ShiftsaleController < BaseReportController authorize_resource :class => false - + def index from, to = get_date_range_from_params @@ -8,7 +8,7 @@ class Reports::ShiftsaleController < BaseReportController if params[:shift_name].to_i != 0 @shift = ShiftSale.find(params[:shift_name]) end - @sale_data = Sale.get_by_shiftsales(from,to,@shift) + @sale_data = Sale.get_by_shiftsales(from,to,@shift) @from = from @to = to if @shift.present? @@ -24,7 +24,7 @@ class Reports::ShiftsaleController < BaseReportController format.xls end end - + def show from, to = get_date_range_from_params @@ -42,11 +42,67 @@ class Reports::ShiftsaleController < BaseReportController end out = {:status => 'ok', :message => date_arr} - + respond_to do |format| format.json { render json: out } end end -end + def print_close_receipt + shift_id = params[:id] + @shift = ShiftSale.find_by_id(shift_id) + shift_obj = ShiftSale.where('id =?',shift_id) + + if ENV["SERVER_MODE"] != "cloud" #no print in cloud server + + close_cashier_pdf = Lookup.collection_of("print_settings") + + unique_code = "CloseCashierPdf" + + if !close_cashier_pdf.empty? + close_cashier_pdf.each do |close_cashier| + if close_cashier[0] == 'CloseCashierCustomisePdf' + if close_cashier[1] == '1' + unique_code="CloseCashierCustomisePdf" + else + unique_code="CloseCashierPdf" + end + end + end + end + + + shop_details = shop_detail + cashier_terminal = @shift.cashier_terminal + @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='') + @total_waste = Sale.get_total_waste(shift_id).sum(:grand_total) + @total_spoile = Sale.get_total_spoile(shift_id).sum(:grand_total) + #other payment details for mpu or visa like card + @other_payment = ShiftSale.get_by_shift_other_payment(@shift) + + # Calculate price_by_accounts + @total_amount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'amount') + @total_discount_by_account = ShiftSale.calculate_total_price_by_accounts(@shift,'discount') + @total_member_discount = ShiftSale.get_total_member_discount(@shift) + @total_dinein = ShiftSale.get_total_dinein(@shift).total_dinein_amount + @total_takeway = ShiftSale.get_total_takeway(@shift).total_takeway_amount + @total_other_charges = ShiftSale.get_total_other_charges(@shift).total_other_charges_amount + @total_credit_payments = ShiftSale.get_shift_sales_with_credit_payment(shift_id).total_credit_payments + + # get printer info + print_settings = PrintSetting.find_by_unique_code(unique_code) + printer = Printer::CashierStationPrinter.new(print_settings) + + # printer.print_close_cashier(print_settings,cashier_terminal,@shift, nil, shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments) + printer.print_close_cashier(print_settings,cashier_terminal,@shift, @sale_items, @total_other_charges_info, shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount,@total_dinein,@total_takeway,@total_other_charges,@total_waste,@total_spoile,@total_credit_payments) + + respond_to do |format| + format.html { redirect_to '/en/reports/shiftsale/', notice: 'Printing Completed.'} + format + end + end + end + + +end diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb index c2f2cf0d..71fc389e 100755 --- a/app/controllers/reports/stock_check_controller.rb +++ b/app/controllers/reports/stock_check_controller.rb @@ -46,6 +46,5 @@ class Reports::StockCheckController < BaseReportController format.json { render json: out } end end - -end +end diff --git a/app/controllers/settings/commissioners_controller.rb b/app/controllers/settings/commissioners_controller.rb index fb8c1993..bbaa1ca8 100755 --- a/app/controllers/settings/commissioners_controller.rb +++ b/app/controllers/settings/commissioners_controller.rb @@ -18,6 +18,7 @@ class Settings::CommissionersController < ApplicationController def new @commissioner = Commissioner.new @employee = Employee.all.order('name asc') + end # GET /commissioners/1/edit @@ -35,14 +36,21 @@ class Settings::CommissionersController < ApplicationController unless @commissioner.resigned_date.nil? @commissioner.resigned_date = @commissioner.resigned_date.utc.getlocal.strftime('%Y-%b-%d') end - respond_to do |format| - if @commissioner.save - format.html {redirect_to settings_commissioners_path, notice: 'Commissioner was successfully created.'} - format.json {render :show, status: :created, location: @commissioner} - else - format.html {render :new} - format.json {render json: @commissioner.errors, status: :unprocessable_entity} + # puts params[:from_induty].length + if (params[:from_induty] != "true") + respond_to do |format| + if @commissioner.save + format.html {redirect_to settings_commissioners_path, notice: 'Commissioner was successfully created.'} + format.json {render :show, status: :created, location: @commissioner} + else + format.html {render :new} + format.json {render json: @commissioner.errors, status: :unprocessable_entity} + end end + else + @commissioner.save + flash[:notice] = 'Commissioner was successfully created.' + redirect_to induties_assign_in_duties_path(params[:booking_id]) end end diff --git a/app/controllers/settings/employees_controller.rb b/app/controllers/settings/employees_controller.rb index baefd752..c416cc87 100755 --- a/app/controllers/settings/employees_controller.rb +++ b/app/controllers/settings/employees_controller.rb @@ -30,9 +30,6 @@ class Settings::EmployeesController < ApplicationController # POST /employees # POST /employees.json def create - puts "puts ssssssssssssssssssssssssss" - puts employee_params.to_json - @employee = Employee.new(employee_params) respond_to do |format| diff --git a/app/controllers/settings/menu_item_attributes_controller.rb b/app/controllers/settings/menu_item_attributes_controller.rb index 8187d2a9..4ac48542 100755 --- a/app/controllers/settings/menu_item_attributes_controller.rb +++ b/app/controllers/settings/menu_item_attributes_controller.rb @@ -55,7 +55,26 @@ class Settings::MenuItemAttributesController < ApplicationController # DELETE /settings/menu_item_attributes/1 # DELETE /settings/menu_item_attributes/1.json def destroy - @settings_menu_item_attribute.destroy + item_attribute_id =@settings_menu_item_attribute.id + item_attribute_id_string=""+item_attribute_id.to_s+"" + if @settings_menu_item_attribute.destroy + menu_items =MenuItem.all + menu_items.each do |item| + if item.item_attributes.include?(item_attribute_id) + item_update =item.item_attributes.reject { |i| i == item_attribute_id } + item.item_code =item.item_code + item.item_attributes =item_update + item.save + end + if item.item_attributes.include?(item_attribute_id_string) + item_update =item.item_attributes.reject { |i| i == item_attribute_id_string } + item.item_code =item.item_code + item.item_attributes =item_update + item.save + end + end + end + # @settings_menu_item_attribute.destroy flash[:notice] = 'Menu item attribute was successfully destroyed.' render :json => {:status=> "Success", :url => settings_menu_item_attributes_path }.to_json # respond_to do |format| diff --git a/app/controllers/settings/menu_item_options_controller.rb b/app/controllers/settings/menu_item_options_controller.rb index 00791e5d..339039bf 100755 --- a/app/controllers/settings/menu_item_options_controller.rb +++ b/app/controllers/settings/menu_item_options_controller.rb @@ -55,7 +55,25 @@ class Settings::MenuItemOptionsController < ApplicationController # DELETE /settings/menu_item_options/1 # DELETE /settings/menu_item_options/1.json def destroy - @settings_menu_item_option.destroy + item_option_id =@settings_menu_item_option.id + item_option_id_string=""+item_option_id.to_s+"" + if @settings_menu_item_option.destroy + menu_items =MenuItem.all + menu_items.each do |item| + if item.item_options.include?(item_option_id) + item_update =item.item_options.reject { |i| i == item_option_id } + item.item_code =item.item_code + item.item_options =item_update + item.save + end + if item.item_options.include?(item_option_id_string) + item_update =item.item_options.reject { |i| i == item_option_id_string } + item.item_code =item.item_code + item.item_options =item_update + item.save + end + end + end flash[:notice] = 'Menu item option was successfully destroyed.' render :json => {:status=> "Success", :url => settings_menu_item_options_path }.to_json # respond_to do |format| diff --git a/app/controllers/settings/simple_menu_items_controller.rb b/app/controllers/settings/simple_menu_items_controller.rb index df70f61e..cd1c4507 100755 --- a/app/controllers/settings/simple_menu_items_controller.rb +++ b/app/controllers/settings/simple_menu_items_controller.rb @@ -109,7 +109,6 @@ class Settings::SimpleMenuItemsController < ApplicationController @settings_menu_item.item_sets = sets end end - @settings_menu_item.menu_category_id = params[:menu_category_id] respond_to do |format| diff --git a/app/controllers/transactions/sales_controller.rb b/app/controllers/transactions/sales_controller.rb index 24c76b1d..e8a2d9e4 100755 --- a/app/controllers/transactions/sales_controller.rb +++ b/app/controllers/transactions/sales_controller.rb @@ -364,7 +364,7 @@ class Transactions::SalesController < ApplicationController other_amount = SaleItem.calculate_other_charges(sale.sale_items) #other charges printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,other_amount,nil,nil,nil) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,sale.sale_items,sale,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "VOID",current_balance,nil,other_amount,nil,nil,nil) result = { :filepath => filename, :printer_model => print_settings.brand_name, diff --git a/app/helpers/induties/assign_in_duties_helper.rb b/app/helpers/induties/assign_in_duties_helper.rb new file mode 100644 index 00000000..bb55d3b4 --- /dev/null +++ b/app/helpers/induties/assign_in_duties_helper.rb @@ -0,0 +1,2 @@ +module Induties::AssignInDutiesHelper +end diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index 64570f7d..c1b0162e 100755 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -7,6 +7,27 @@ class AssignedOrderItem < ApplicationRecord belongs_to :order belongs_to :order_queue_station + def self.sync_assigned_order_item_records(assigned_order_items) + if !assigned_order_items.nil? + assigned_order_items.each do |item| + order_item = AssignedOrderItem.find_by_assigned_order_item_id(item['assigned_order_item_id']) + # unless AssignedOrderItem.exists?(item['assigned_order_item_id']) + if order_item.nil? + order_item = AssignedOrderItem.new + end + order_item.assigned_order_item_id = item['assigned_order_item_id'] + order_item.item_code = item['item_code'] + order_item.instance_code = item['instance_code'] + order_item.order_queue_station_id = item['order_queue_station_id'] + order_item.order_id = item['order_id'] + order_item.print_status = item['print_status'] + order_item.delivery_status = item['delivery_status'] + order_item.save + end + Rails.logger.debug '....... Assigned Order Item sync completed .......' + end + end + def self.assigned_order_item (order, item_code, instance_code, order_queue_station ) assigned_order_item = AssignedOrderItem.new() assigned_order_item.order = order @@ -43,6 +64,8 @@ class AssignedOrderItem < ApplicationRecord private def generate_custom_id - self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") + if self.assigned_order_item_id.nil? + self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") + end end end diff --git a/app/models/booking.rb b/app/models/booking.rb index 46c098b7..9ca45ec4 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -8,9 +8,36 @@ class Booking < ApplicationRecord belongs_to :sale, :optional => true has_many :booking_orders has_many :orders, :through => :booking_orders + has_many :order_items, :through => :orders scope :active, -> {where("booking_status != 'moved'")} scope :today, -> {where("created_at >= #{Time.now.utc}")} + def self.sync_booking_records(bookings) + if !bookings.nil? + bookings.each do |b| + booking = TableBooking.find_by_booking_id(b['booking_id']) + # unless TableBooking.exists?(b['booking_id']) + if booking.nil? + booking = TableBooking.new + end + booking.booking_id = b['booking_id'] + booking.dining_facility_id = b['dining_facility_id'] + # booking.type = b['type'] + booking.checkin_at = b['checkin_at'] + booking.checkin_by = b['checkin_by'] + booking.checkout_at = b['checkout_at'] + booking.checkout_by = b['checkout_by'] + booking.reserved_at = b['reserved_at'] + booking.reserved_by = b['reserved_by'] + booking.booking_status = b['booking_status'] + booking.sale_id = b['sale_id'] + booking.customer_id = b['customer_id'] + booking.save + end + puts '....... Booking sync completed ......' + end + end + def self.update_dining_facility(booking_arr, newd, old) table = DiningFacility.find(newd) exist = table.get_booking @@ -60,8 +87,44 @@ class Booking < ApplicationRecord .order("sale_id DESC") end + def self.get_sync_data(sale_id) + @orders = Order.select('orders.*') + .joins('left join sale_orders on sale_orders.order_id = orders.order_id') + .where('sale_orders.sale_id=?', sale_id) + + @order_items = OrderItem.select('order_items.*') + .joins('left join sale_orders on sale_orders.order_id = order_items.order_id') + .where('sale_orders.sale_id=?', sale_id) + + @assigned_order_items = AssignedOrderItem.select('assigned_order_items.*') + .joins('left join sale_orders on sale_orders.order_id=assigned_order_items.order_id') + .where('sale_orders.sale_id=?', sale_id) + + @bookings = TableBooking.where('sale_id=?', sale_id) + + @sales = Sale.where("sale_id=?", sale_id) + + @sale_items = SaleItem.where("sale_id=?", sale_id) + + @sale_taxes = SaleTax.where("sale_id=?", sale_id) + + @sale_orders = SaleOrder.where("sale_id=?", sale_id) + + @sale_audits = SaleAudit.where("sale_id=?", sale_id) + + @sale_payments = SalePayment.where("sale_id=?", sale_id) + + @shift_sales = ShiftSale.select('shift_sales.*') + .joins('left join sales on sales.shift_sale_id = shift_sales.id') + .where('sales.sale_id=?', sale_id) + + return @orders, @order_items, @sales, @sale_items, @sale_taxes, @sale_payments, @sale_orders, @sale_audits, @bookings, @assigned_order_items, @shift_sales + end + private def generate_custom_id - self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") + if self.booking_id.nil? + self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") + end end end diff --git a/app/models/cashier_login_log.rb b/app/models/cashier_login_log.rb index 353e9c90..d8af4095 100755 --- a/app/models/cashier_login_log.rb +++ b/app/models/cashier_login_log.rb @@ -8,4 +8,4 @@ class CashierLoginLog < ApplicationRecord def generate_custom_id self.cashier_login_log_id = SeedGenerator.generate_id(self.class.name, "CLO") end -end +end \ No newline at end of file diff --git a/app/models/commission.rb b/app/models/commission.rb index 32aa8a04..74a830a9 100755 --- a/app/models/commission.rb +++ b/app/models/commission.rb @@ -13,6 +13,6 @@ class Commission < ApplicationRecord scope :active, -> {where(is_active: true)} private def generate_custom_id - self.commission_id = SeedGenerator.generate_id(self.class.name, 'COM') + self.commission_id = SeedGenerator.generate_id(self.class.name, "COM") end end diff --git a/app/models/commissioner.rb b/app/models/commissioner.rb index 68573460..eb32f0bb 100755 --- a/app/models/commissioner.rb +++ b/app/models/commissioner.rb @@ -1,7 +1,7 @@ class Commissioner < ApplicationRecord belongs_to :employee, foreign_key: 'emp_id' belongs_to :commission, foreign_key: 'commission_id' - has_many :in_juties + has_many :in_duties has_many :product_commissions scope :active, -> { where(is_active: true) } diff --git a/app/models/customer.rb b/app/models/customer.rb index d69220f3..04d4449c 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -325,16 +325,16 @@ class Customer < ApplicationRecord :timeout => 10 ) rescue HTTParty::Error - response = {status: false, message: "Server Error"} + response = {"status" => false, "message" => "No internet connection "} rescue Net::OpenTimeout - response = { status: false , message: "Server Time out"} + response = {"status" => false, "message" => "No internet connection "} rescue OpenURI::HTTPError - response = { status: false, message: "Can't connect server"} + response = {"status" => false, "message" => "No internet connection "} rescue SocketError - response = { status: false, message: "Can't connect server"} + response = {"status" => false, "message" => "No internet connection "} end Rails.logger.debug "--------Search Paypar Account No response -------" Rails.logger.debug response.to_json diff --git a/app/models/dining_charge.rb b/app/models/dining_charge.rb index 2a351778..6f931bcf 100755 --- a/app/models/dining_charge.rb +++ b/app/models/dining_charge.rb @@ -20,7 +20,7 @@ class DiningCharge < ApplicationRecord block_count, price = DiningCharge.charges(dining_charges_obj, dining_minutes, 'day') end end - return block_count, price + return block_count, price else puts "<<<<<<<< NO" end @@ -34,7 +34,6 @@ class DiningCharge < ApplicationRecord charge_block = DiningCharge.convert_to_minutes(chargesObj.charge_block.utc.strftime('%H:%M')) result = dining_minutes / charge_block - rounding_time = DiningCharge.convert_to_minutes(chargesObj.time_rounding_block.utc.strftime('%H:%M')) if result.to_i < 1 # for dining minute is under charge_block diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb index 260333e7..e5f35e03 100755 --- a/app/models/dining_facility.rb +++ b/app/models/dining_facility.rb @@ -32,7 +32,8 @@ class DiningFacility < ApplicationRecord end def get_current_booking - booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and (CASE WHEN checkin_at > '#{DateTime.now.utc}' THEN checkin_at >= '#{DateTime.now.utc}' ELSE checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' END) and checkout_by is null").limit(1) #and checkout_at is null + checkin_time_lookup = Lookup.get_checkin_time_limit + booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and (CASE WHEN checkin_at > '#{DateTime.now.utc}' THEN checkin_at >= '#{DateTime.now.utc}' ELSE checkin_at between '#{DateTime.now.utc - checkin_time_lookup.hours}' and '#{DateTime.now.utc}' END) and checkout_by is null").limit(1) #and checkout_at is null # booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_by is null").limit(1) #and checkout_at is null if booking.count > 0 then return booking[0] @@ -42,7 +43,8 @@ class DiningFacility < ApplicationRecord end def get_moved_booking - booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='moved' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) + checkin_time_lookup = Lookup.get_checkin_time_limit + booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='moved' and checkin_at between '#{DateTime.now.utc - checkin_time_lookup.hours}' and '#{DateTime.now.utc}' and checkout_at is null").limit(1) if booking.count > 0 then return booking[0] @@ -68,7 +70,8 @@ class DiningFacility < ApplicationRecord end def get_current_checkout_booking - booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null").limit(1) + checkin_time_lookup = Lookup.get_checkin_time_limit + booking = Booking.where("dining_facility_id = #{self.id} and booking_status ='assign' and checkin_at between '#{DateTime.now.utc - checkin_time_lookup.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null").limit(1) if booking.count > 0 then return booking[0] else @@ -105,17 +108,18 @@ class DiningFacility < ApplicationRecord return booking elsif (checkout_at_hr == hr && checkout_at_min <= free_time_min) return booking - else + else return nil end - else + else return nil end end end def self.get_checkin_booking - bookings = Booking.where("booking_status ='assign' and checkin_at between '#{DateTime.now.utc - 5.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null") + checkin_time_lookup = Lookup.get_checkin_time_limit + bookings = Booking.where("booking_status ='assign' and checkin_at between '#{DateTime.now.utc - checkin_time_lookup.hours}' and '#{DateTime.now.utc}' and reserved_by is not null and checkout_by is null") arr_booking = Array.new if bookings lookup_checkout_time = Lookup.collection_of("checkout_alert_time") @@ -131,7 +135,7 @@ class DiningFacility < ApplicationRecord end end end - + bookings.each do |booking| now = Time.now.utc hr = (now.strftime("%H").to_i).to_int @@ -160,7 +164,7 @@ class DiningFacility < ApplicationRecord #if ENV["SERVER_MODE"] != 'cloud' if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end ActionCable.server.broadcast "check_in_booking_channel",table: table,from:from @@ -172,7 +176,7 @@ class DiningFacility < ApplicationRecord if table.length > 0 if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end if ENV["SERVER_MODE"] != 'cloud' @@ -199,5 +203,5 @@ class DiningFacility < ApplicationRecord end return status end - + end diff --git a/app/models/induties.rb b/app/models/induties.rb new file mode 100644 index 00000000..a283db36 --- /dev/null +++ b/app/models/induties.rb @@ -0,0 +1,5 @@ +module Induties + def self.table_name_prefix + 'induties_' + end +end diff --git a/app/models/induties/assign_in_duty.rb b/app/models/induties/assign_in_duty.rb new file mode 100644 index 00000000..3d63dd05 --- /dev/null +++ b/app/models/induties/assign_in_duty.rb @@ -0,0 +1,2 @@ +class Induties::AssignInDuty < ApplicationRecord +end diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb index 1a9dec8f..4ff649e0 100755 --- a/app/models/inventory_definition.rb +++ b/app/models/inventory_definition.rb @@ -3,6 +3,9 @@ class InventoryDefinition < ApplicationRecord scope :active, -> {where(:is_active => true)} def self.calculate_product_count(saleObj=nil,saleobj_after_req_bill=nil) + # check_sj = StockJournal.where('item_code=?', item.item_instance_code).order("id DESC").first + logger.debug 'saleObj<<<<<<<<<<<<<<<<<<<<<<<<<<<' + logger.debug saleObj.sale_items.to_json if !saleObj.nil? saleObj.sale_items.each do |item| found, inventory_definition = find_product_in_inventory(item) @@ -21,45 +24,48 @@ class InventoryDefinition < ApplicationRecord end def self.find_product_in_inventory(item) - product = InventoryDefinition.find_by_item_code(item.item_instance_code) - if product.nil? - return false, nil - else - stock_check_item = StockCheckItem.find_by_item_code(item.item_instance_code) - if stock_check_item.nil? - return false, nil - else + if product = InventoryDefinition.find_by_item_code(item.item_instance_code) + if stock_check_item = StockCheckItem.find_by_item_code(item.item_instance_code) return true, product end end end - def self.check_balance(item,inventory_definition) # item => saleItemOBj - stock = StockJournal.where('item_code=?', item.item_instance_code).order('created_at desc').take + def self.check_balance(item, inventory_definition) # item => saleItemOBj + stock = StockJournal.where('item_code=?', item.item_instance_code).order("id DESC").first unless stock.nil? modify_balance(item, stock, inventory_definition) else - StockJournal.add_to_journal(item, 0, "out of stock", inventory_definition) + puts "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< OUT OF STOCK >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" + StockJournal.add_to_journal(item.item_instance_code, item.qty, 0, "out of stock", inventory_definition, item.id, StockJournal::SALES_TRANS) end end def self.modify_balance(item, stock, inventory_definition) #saleitemObj - if stock.balance.to_i >= item.qty - puts ">> stock is greater than order qty" - StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition) - else - puts " << stock is less than order qty" - data = item - extra_qty = item.qty.to_i - stock.balance.to_i - if stock.balance.to_i > 0 - item.qty = stock.balance.to_i - StockJournal.add_to_journal(item, stock.balance, "ok", inventory_definition) - data.qty = extra_qty - StockJournal.add_to_journal(data, 0, "out of stock", inventory_definition) - else - StockJournal.add_to_journal(item, stock.balance, "out of stock", inventory_definition) - end - end + check_item = StockCheckItem.where('item_code=?', item.item_instance_code).order("id DESC").first + if item.qty.to_i >= 0 + qty = item.qty - item.qty_was + if !item.id_was.nil? + remark = "edit" + elsif stock.balance.to_i >= qty + puts ">> stock is greater than order qty" + remark = "ok" + else + puts " << stock is less than order qty" + remark = "out of stock" + end + else # item.qty < 0 + qty = item.qty + remark = "void" + end + if item.is_a? OrderItem + trans_type = StockJournal::ORDER_TRANS + elsif item.is_a? SaleItem + trans_type = StockJournal::SALES_TRANS + end + StockJournal.add_to_journal(item.item_instance_code, qty, stock.balance, remark, inventory_definition, item.id, trans_type) + check_item.different = check_item.different - qty + check_item.save end def self.search_by_category(cat_id) @@ -72,17 +78,24 @@ class InventoryDefinition < ApplicationRecord " JOIN menu_categories mc ON mc.id = mi.menu_category_id ") .where("mc.id=#{cat_id}") .group("mi.menu_category_id,inventory_definitions.item_code") - .order("mi.menu_category_id desc") + .order("mi.menu_category_id desc") end def self.get_by_category(filter) - least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock' - THEN (SELECT balance FROM stock_journals - WHERE item_code = inventory_definitions.item_code AND remark != 'out of stock' - ORDER BY created_at DESC LIMIT 1) ELSE 0 END) - FROM stock_journals - WHERE stock_journals.item_code = inventory_definitions.item_code - ORDER BY stock_journals.created_at DESC LIMIT 1" + # THEN (SELECT min(balance) FROM stock_journals + # least_stock = "SELECT (CASE WHEN stock_journals.remark != 'out of stock' + # THEN (SELECT balance FROM stock_journals + # WHERE item_code = inventory_definitions.item_code AND remark != 'out of stock' + # ORDER BY created_at DESC LIMIT 1) ELSE 0 END) + # FROM stock_journals + # WHERE stock_journals.item_code = inventory_definitions.item_code + # ORDER BY stock_journals.created_at DESC LIMIT 1" + least_stock = "(SELECT + (SELECT balance FROM stock_journals WHERE item_code = inventory_definitions.item_code + ORDER BY id DESC LIMIT 1) + FROM stock_journals + WHERE stock_journals.item_code = inventory_definitions.item_code + ORDER BY stock_journals.created_at DESC LIMIT 1)" @inventory_definitions = InventoryDefinition.select("inventory_definitions.*, (CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit, @@ -92,17 +105,17 @@ class InventoryDefinition < ApplicationRecord mii.item_instance_name as instance_name," + "mc.name as menu_category_name,mc.id as menu_category_id " ) - .joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id") + .joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id") .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" + " JOIN menu_items mi ON mi.id = mii.menu_item_id" + " JOIN menu_categories mc ON mc.id = mi.menu_category_id ") .joins(" JOIN accounts acc ON acc.id = mi.account_id") - .where("inventory_definitions.item_code LIKE ? OR inventory_definitions.min_order_level LIKE ? - OR inventory_definitions.max_stock_level LIKE ? OR sj.balance LIKE ? OR mi.name LIKE ? + .where("inventory_definitions.item_code LIKE ? OR inventory_definitions.min_order_level LIKE ? + OR inventory_definitions.max_stock_level LIKE ? OR sj.balance LIKE ? OR mi.name LIKE ? OR mii.item_instance_name LIKE ? OR mc.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%", "%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%") .group("mi.menu_category_id,inventory_definitions.item_code") - .order("acc.title desc,mi.menu_category_id desc,balance ASC") + .order("balance asc, mi.name asc,acc.title desc,mi.menu_category_id desc") end end diff --git a/app/models/kbz_pay.rb b/app/models/kbz_pay.rb new file mode 100644 index 00000000..5893e048 --- /dev/null +++ b/app/models/kbz_pay.rb @@ -0,0 +1,138 @@ +class KbzPay + + KBZ_PAY = 'KBZPay' + + def self.pay(amount, receipt_no, url, key, app_id, code) + shop = Shop.first + prefix = shop.shop_code + receipt_no = "#{prefix}#{receipt_no}" + + datetime = DateTime.now.strftime("%d%m%Y%H%M") + kbz_app_id = app_id + kbz_merch_code = code + kbz_api_key = key + kbz_provider_url = "#{url}/precreate" + + kbz_method = 'kbz.payment.precreate' + kbz_trade_type = "PAY_BY_QRCODE" + kbz_version = "1.0" + kbz_currency = "MMK" + kbz_callback_url = "https://staging-v2.doemal.com/api/v3/ordering/kbz_callback" + + nounce_str = SecureRandom.base64(32).first(32).upcase + + params = "appid="+kbz_app_id+"&merch_code="+kbz_merch_code+"&merch_order_id="+receipt_no.to_s+"&method="+kbz_method+"&nonce_str="+nounce_str.to_s+"¬ify_url="+ kbz_callback_url + "&timeout_express=20m×tamp="+datetime+"&total_amount="+amount.to_s+"&trade_type="+kbz_trade_type+"&trans_currency="+ kbz_currency+"&version="+kbz_version+"&key="+kbz_api_key + + Rails.logger.info params + sign = Digest::SHA256.hexdigest(params) + str = { + "timestamp": datetime, + "method": kbz_method, + "notify_url": kbz_callback_url, + "nonce_str": nounce_str.to_s, + "sign_type": "SHA256", + "sign": sign, + "version": kbz_version, + "biz_content": { + "merch_order_id": receipt_no, + "merch_code": kbz_merch_code, + "appid": kbz_app_id, + "trade_type": kbz_trade_type, + "total_amount": amount.to_s, + "timeout_express": "20m", + "trans_currency": kbz_currency + } + } + + result = HTTParty.post(kbz_provider_url, + :body => { :Request => str}.to_json, + :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' } + ) + Rails.logger.info result + Rails.logger.info '====================================' + if result['Response']['result'] == "SUCCESS" + #TODO QR return + qr = result['Response']['qrCode'] + return true, qr + else + # Rails.logger.debug result['Response'] + return false, result['Response'] + end + + end + + def self.query(receipt_no, current_user, url, key, app_id, code) + shop = Shop.first + prefix = shop.shop_code + receipt_no = "#{prefix}#{receipt_no}" + amount = 0 + datetime = DateTime.now.strftime("%d%m%Y%H%M") + kbz_app_id = app_id + kbz_merch_code = code + kbz_api_key = key + kbz_provider_url = "#{url}/queryorder" + + kbz_method = 'kbz.payment.queryorder' + kbz_trade_type = "PAY_BY_QRCODE" + kbz_version = "1.0" + kbz_currency = "MMK" + kbz_callback_url = "https://staging-v2.doemal.com/api/v3/ordering/kbz_callback" + + nounce_str = SecureRandom.base64(32).first(32).upcase + + params = "appid="+kbz_app_id+"&merch_code="+kbz_merch_code+"&merch_order_id="+receipt_no.to_s+"&method="+kbz_method+"&nonce_str="+nounce_str.to_s+"×tamp="+datetime+"&version="+kbz_version+"&key="+kbz_api_key + + Rails.logger.info params + sign = Digest::SHA256.hexdigest(params) + str = {"timestamp": datetime, + "method": kbz_method, + "nonce_str": nounce_str.to_s, + "sign_type": "SHA256", + "sign": sign, + "version": kbz_version, + "biz_content": { + "merch_order_id": receipt_no, + "merch_code": kbz_merch_code, + "appid": kbz_app_id + } + } + + result = HTTParty.post(kbz_provider_url, + :body => { :Request => str}.to_json, + :headers => { 'Content-Type' => 'application/json', 'Accept' => 'application/json' } + ) + Rails.logger.info result + Rails.logger.info "........................." + if result['Response']['result'] == "SUCCESS" + if result['Response']['trade_status'] == "PAY_SUCCESS" + merch_order_id = result['Response']['merch_order_id'] + cash = result['Response']['total_amount'] + + merch_order_id.slice! "#{prefix}" + + sp = SalePayment.find(merch_order_id) + if !sp.nil? + if sp.payment_status == 'pending' + saleObj = Sale.find(sp.sale_id) + if sp.process_payment(saleObj, current_user, cash, KbzPay::KBZ_PAY) + amount = cash + end + end + end + + # return true, "successfully paid by KBZ PAY" + elsif result['Response']['trade_status'] == "PAY_FAILED" + + # return false, "pay failed by KBZ PAY" + elsif result['Response']['trade_status'] == "WAIT_PAY" + # return false , "Waiting to pay by KBZ PAY" + end + else + #FAIL result + # return false, "pay by KBZ PAY has failed" + end + + return amount + end + +end \ No newline at end of file diff --git a/app/models/lookup.rb b/app/models/lookup.rb index 5434cedd..b446d4e8 100755 --- a/app/models/lookup.rb +++ b/app/models/lookup.rb @@ -1,5 +1,5 @@ class Lookup < ApplicationRecord - + has_many :accounts def available_types @@ -18,11 +18,81 @@ class Lookup < ApplicationRecord end # def self.get_by_type( lookup_type) - # Lookup.select("value, name").where("lookup_type = ?", lookup_type ).order("name asc").map { |r| [r.name, r.value] } + # Lookup.select("value, name").where("lookup_type = ?", lookup_type ).order("name asc").map { |r| [r.name, r.value] } # end + def self.get_checkin_time_limit + time_limit = 5 + + lookup = Lookup.find_by_lookup_type('checkin_time_limit') + if !lookup.nil? + time_limit = lookup.value.to_i + end + + return time_limit + end + + def self.sync_url + url = "" + + lookup = Lookup.find_by_lookup_type('sync_data') + if !lookup.nil? + url = lookup.value + end + + return url + end + + def self.get_sync_token + token = "" + + lookup = Lookup.find_by_lookup_type('sync_token') + if !lookup.nil? + token = lookup.value + end + + return token + end + def self.collection_of(type) Lookup.select("name, value").where("lookup_type" => type ).map { |l| [l.name, l.value] } end + + def self.create_shift_sale_lookup + @lookup = Lookup.new + @lookup.lookup_type = 'shift_sale_items' + @lookup.name = 'Shift Sale Items' + @lookup.value = 0 + @lookup.save + + return @lookup + end + + def self.create_reprint_receipt_lookup + @lookup = Lookup.new + @lookup.lookup_type = 'reprint_receipt' + @lookup.name = 'Reprint Receipt in Report' + @lookup.value = 0 + @lookup.save + + return @lookup + end + + def self.save_shift_sale_items_settings(val) + @lookup = Lookup.where('lookup_type=?', 'shift_sale_items').last + if @lookup.nil? + @lookup = Lookup.create_shift_sale_lookup + end + @lookup.value = val + @lookup.save + end + + def self.shift_sale_items_lookup_value + @lookup = Lookup.where('lookup_type=?', 'shift_sale_items').last + if @lookup.nil? + @lookup = Lookup.create_shift_sale_lookup + end + return @lookup.value + end end diff --git a/app/models/order.rb b/app/models/order.rb index af5887e6..cd350e34 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -8,6 +8,8 @@ class Order < ApplicationRecord belongs_to :customer has_many :order_items, autosave: true , inverse_of: :order has_many :assigned_order_items + has_one :booking_order + has_one :booking, through: :booking_order #internal references attributes for business logic control attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time, :is_extra_time @@ -41,27 +43,26 @@ class Order < ApplicationRecord :booking_status => "assign" }) end #end extra time - + if self.table_id.to_i > 0 table = DiningFacility.find(self.table_id) table.update_attributes(status:"occupied") # table.status = "occupied" # table.save end - + else booking = Booking.find(self.booking_id) #add extra time if self.is_extra_time if !booking.checkout_at.nil? new_time = booking.checkout_at + self.extra_time.to_i - booking.update_attributes(checkout_at: new_time) - end + booking.update(checkout_at: new_time) + end end #end extra time end - booking.save! self.default_values # cashier already opened? @@ -74,7 +75,7 @@ class Order < ApplicationRecord #Send order to queue one it done! # if self.source != "quick_service" # process_order_queue - # end + # end #send order to broadcast job # send_order_broadcast(booking) @@ -138,7 +139,7 @@ class Order < ApplicationRecord ordered_list.each do |item| menu_item = MenuItem.search_by_item_code(item[:item_instance_code]) - + # For Product while item code not in menu item if menu_item.nil? menu_item = Product.search_by_product_code(item[:item_instance_code]) @@ -148,7 +149,7 @@ class Order < ApplicationRecord # Rails.logger.debug menu_item set_order_items = Array.new ##If menu Item set item - must add child items to order as well, where price is only take from menu_item - if (menu_item[:type] == "SetMenuItem") + if (menu_item[:type] == "SetMenuItem") if (item.include? 'sub_items') || (item.include? :sub_items) item[:sub_items].each do |si| # Retrive instance's Price @@ -209,7 +210,6 @@ class Order < ApplicationRecord self.customer = Customer.find(1) if self.customer_id.nil? self.source = "emenu" if self.source.nil? self.order_type = "dine-in" if self.order_type.nil? - end protected @@ -286,7 +286,7 @@ class Order < ApplicationRecord # Counter number of quantityf end - + #Process order items and send to order queue def self.pay_process_order_queue(id,table_id) # if ENV["SERVER_MODE"] != 'cloud' @@ -294,7 +294,7 @@ class Order < ApplicationRecord if !sidekiq.nil? OrderQueueProcessorJob.perform_later(id, table_id) else - order = Order.find(id) + order = Order.find(id) if order oqs = OrderQueueStation.new oqs.process_order(order, table_id) @@ -314,11 +314,11 @@ class Order < ApplicationRecord # OrderBroadcastJob.perform_later(table,type) if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end ActionCable.server.broadcast "order_channel",table: table,type:type,from:from - + end end @@ -434,7 +434,7 @@ class Order < ApplicationRecord if from.present? && to.present? order = Order.where("DATE_FORMAT(date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(date,'%d-%m-%Y') <= ?", from,to) query = order.where(keyword) - else + else where("order_id LIKE ? OR status LIKE ? OR order_type LIKE ? OR source='#{filter}'","%#{filter}%","%#{filter}%","%#{filter}%") end end @@ -442,12 +442,12 @@ class Order < ApplicationRecord def self.send_customer_view(booking) @status = "" @data_array = Array.new - if(!booking.sale_id.nil?) + if(!booking.sale_id.nil?) sale = Sale.find(booking.sale_id) if sale.sale_status != "completed" && sale.sale_status != 'void' @data_array.push(sale) @status = "sale" - @data_obj = sale + @data_obj = sale end else @@ -474,7 +474,7 @@ class Order < ApplicationRecord end if ENV["SERVER_MODE"] == 'cloud' from = request.subdomain + "." + request.domain - else + else from = "" end ActionCable.server.broadcast "second_display_channel",data: @data_array,status:@status,from:from @@ -484,11 +484,11 @@ class Order < ApplicationRecord def self.process_order_queue(order_id,table_id,source) print_status = nil cup_status = nil - + #Send to background job for processing - order = Order.find(order_id) + order = Order.find(order_id) sidekiq = Lookup.find_by_lookup_type("sidekiq") - + if ENV["SERVER_MODE"] != 'cloud' cup_status = `#{"sudo service cups status"}` print_status = check_cup_status(cup_status) @@ -526,7 +526,7 @@ class Order < ApplicationRecord else if ENV["SERVER_MODE"] != 'cloud' - msg = ' Print Error ! Please contact to service' + msg = ' Print Error ! Please contact to service' ActionCable.server.broadcast "call_waiter_channel",table: msg,time:'print_error' end if !sidekiq.nil? @@ -550,14 +550,44 @@ class Order < ApplicationRecord return false end + def self.env + return ENV["SERVER_MODE"] + end + private def generate_custom_id - self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") + if self.order_id.nil? + self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") + end end def set_order_date self.date = Time.now.utc end + def self.sync_order_records(orders) + if !orders.nil? + orders.each do |o| + order = Order.find_by_order_id(o['order_id']) + # unless Order.exists?(o['order_id']) + if order.nil? + order = Order.new + end + order.order_id = o['order_id'] + order.date = o['date'] + order.source = o['source'] + order.order_type = o['order_type'] + order.customer_id = o['customer_id'] + order.item_count = o['item_count'] + order.quantity_count = o['quantity_count'] + order.status = o['status'] + order.waiters = o['waiters'] + order.guest_info = o['guest_info'] + order.save + end + Rails.logger.debug '...... order sync completed .....' + end + end + end diff --git a/app/models/order_item.rb b/app/models/order_item.rb index 87d60e63..f265be2b 100755 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -13,6 +13,13 @@ class OrderItem < ApplicationRecord # validates :qty, numericality: { :greater_than => 0 } validates_associated :order + after_save :update_stock_journal + + # after_save :add_to_journal, if: Proc.new { !self.id_changed? } + # after_save :update_stock_journal, if: Proc.new { self.id_changed? } + + + #This Method - handle how items is added into order # order_item : { # order_item_code : "", @@ -65,8 +72,85 @@ class OrderItem < ApplicationRecord return order_details end + def self.sync_order_item_records(order_items) + if !order_items.nil? + order_items.each do |item| + order_item = OrderItem.find_by_order_items_id(item['order_items_id']) + # unless OrderItem.exists?(item['order_items_id']) + if order_item.nil? + order_item = OrderItem.new + end + order_item.order_items_id = item['order_items_id'] + order_item.order_id = item['order_id'] + order_item.order_item_status = item['order_item_status'] + order_item.item_order_by = item['item_order_by'] + order_item.item_code = item['item_code'] + order_item.item_instance_code = item['item_instance_code'] + order_item.item_name = item['item_name'] + order_item.alt_name = item['alt_name'] + order_item.account_id = item['account_id'] + order_item.qty = item['qty'] + order_item.price = item['price'] + order_item.remark = item['remark'] + order_item.options = item['options'] + order_item.set_menu_items = item['set_menu_items'] + order_item.taxable = item['taxable'] + order_item.completed_by = item['completed_by'] + order_item.save + end + Rails.logger.debug '...... order item sync completed. .....' + end + end + private def generate_custom_id - self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") + if self.order_items_id.nil? + self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") + end + end + + def add_to_journal + defination = InventoryDefinition.find_by_item_code(self.item_instance_code) + stock = StockJournal.where('item_code = ?', self.item_instance_code).order("id DESC").first + journal = StockJournal.create( + item_code: self.item_instance_code, + credit: 0, + debit: self.qty, + balance: stock.balance - self.qty, + inventory_definition_id: defination.id, + remark: 'ok', + trans_ref: self.order.id, + trans_type: StockJournal::SALES_TRANS + ) + end + + def update_stock_journal + if self.qty != self.qty_before_last_save + found, inventory_definition = InventoryDefinition.find_product_in_inventory(self) + if found + InventoryDefinition.check_balance(self, inventory_definition) + end + end + # if self.qty > self.qty_was + # credit = 0 + # debit = self.qty.to_i - self.qty_was.to_i + # else + # credit = self.qty_was.to_i - self.qty.to_i + # debit = 0 + # end + # if credit != debit + # defination = InventoryDefinition.find_by_item_code(self.item_instance_code) + # stock = StockJournal.where('item_code = ?', self.item_instance_code).order("id DESC").first + # journal = StockJournal.create( + # item_code: self.item_instance_code, + # credit: credit, + # debit: debit, + # balance: stock.balance - debit + credit, + # inventory_definition_id: defination.id, + # remark: 'ok', + # trans_ref: self.order.id, + # trans_type: StockJournal::SALES_TRANS + # ) + # end end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 42891015..147ebdc4 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -256,6 +256,8 @@ class OrderQueueStation < ApplicationRecord printer.each do |printer_setting| if printer_setting.unique_code == 'OrderItemPdf' unique_code="OrderItemPdf" + elsif printer_setting.unique_code == 'OrderItemStarPdf' + unique_code="OrderItemStarPdf" elsif printer_setting.unique_code == 'OrderItemSlimPdf' unique_code="OrderItemSlimPdf" elsif printer_setting.unique_code == 'OrderSetItemPdf' diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index c75ad748..8de88ee2 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -75,7 +75,7 @@ class OrderReservation < ApplicationRecord order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount] order_reservation.convenience_charge = order_reserve[:payment_info][:convenience_charge] order_reservation.grand_total = order_reserve[:payment_info][:grand_total] - order_reservation.transaction_fee = order_reserve[:payment_info][:transaction_fee] + # order_reservation.transaction_fee = order_reserve[:payment_info][:transaction_fee] order_reservation.order_remark = order_reserve[:order_info][:order_remark] end if order_reserve[:reservation_info] @@ -203,7 +203,7 @@ class OrderReservation < ApplicationRecord other_amount = SaleItem.calculate_other_charges(saleObj.sale_items) printer = Printer::ReceiptPrinter.new(print_settings) - filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,saleObj.customer.name, item_price_by_accounts, discount_price_by_accounts, nil,nil,shop_detail, "Paid",nil,nil,other_amount,nil,nil, order_reservation) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings, false, nil,cashier_terminal,saleObj.sale_items,saleObj,saleObj.customer.name, item_price_by_accounts, discount_price_by_accounts, nil,nil,shop_detail, "Paid",nil,nil,other_amount,nil,nil, order_reservation) #receipt bill pdf setting result = {:status=> true, diff --git a/app/models/payment.rb b/app/models/payment.rb new file mode 100644 index 00000000..8635cbdb --- /dev/null +++ b/app/models/payment.rb @@ -0,0 +1,6 @@ +class Payment + + # def self.pay(getCloudDomain, cash, sale_id, member_info, type, tax_type, path, latest_order_no, shop_detail, current_user, pay_from, sale_payment_id) + + # end +end \ No newline at end of file diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb index c1a17c5a..5af8994a 100755 --- a/app/models/print_setting.rb +++ b/app/models/print_setting.rb @@ -5,9 +5,14 @@ class PrintSetting < ApplicationRecord def self.get_precision_delimiter setting = PrintSetting.find_by_unique_code("CloseCashierPdf") if setting.nil? - setting = PrintSetting.find_by_unique_code("CloseCashierCustomisePdf") + star_setting = PrintSetting.find_by_unique_code("CloseCashierStarPdf") + if star_setting.nil? + setting = PrintSetting.find_by_unique_code("CloseCashierCustomisePdf") + else + return star_setting + end end return setting end - + end diff --git a/app/models/printer/cashier_station_printer.rb b/app/models/printer/cashier_station_printer.rb index c83a161e..5e37164f 100755 --- a/app/models/printer/cashier_station_printer.rb +++ b/app/models/printer/cashier_station_printer.rb @@ -9,7 +9,7 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker pdf = CashierStationOpening.new pdf.render_file "tmp/cashier_station_#{order_id}_closing_#{time}.pdf" #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print("tmp/cashier_station_#{order_id}_closing_#{time}.pdf") end end @@ -33,12 +33,25 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker # shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") # pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges) - # filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" + # filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" # pdf.render_file filename # self.print(filename, cashier_terminal.printer_name) # end - - def print_close_cashier(printer_settings,cashier_terminal,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) + + def print_close_cashier(printer_settings,cashier_terminal,shift_sale, sale_items, total_other_charges_info,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) + + if !sale_items.blank? or !sale_items.nil? + @account_cate_count = Hash.new {|hash, key| hash[key] = 0} + sale_items.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1} + + + @menu_cate_count = Hash.new {|hash, key| hash[key] = 0} + sale_items.each {|cate| @menu_cate_count[cate.menu_category_id] += 1} + + + @totalByAccount = Hash.new {|hash, key| hash[key] = 0} + sale_items.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total} + end #Use CUPS service #Generate PDF @@ -46,16 +59,16 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker cashier = shift_sale.employee.name shift_name = shift_sale.shift_started_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") + "_" + shift_sale.shift_closed_at.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") filename = "tmp/close_cashier_#{cashier}_#{shift_name}.pdf" - pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) + pdf = CloseCashierPdf.new(printer_settings,shift_sale, sale_items, total_other_charges_info, @account_cate_count, @menu_cate_count, @totalByAccount, shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) close_cashier_pdf = Lookup.collection_of("print_settings") #print_settings with name:CloseCashierPdf - + if !close_cashier_pdf.empty? close_cashier_pdf.each do |close_cashier| if close_cashier[0] == 'CloseCashierCustomisePdf' if close_cashier[1] == '1' pdf = CloseCashierCustomisePdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) else - pdf = CloseCashierPdf.new(printer_settings,shift_sale,shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) + pdf = CloseCashierPdf.new(printer_settings,shift_sale, sale_items, total_other_charges_info, @account_cate_count, @menu_cate_count, @totalByAccount, shop_details,sale_taxes,other_payment,amount,discount,member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) end end end @@ -63,9 +76,29 @@ class Printer::CashierStationPrinter < Printer::PrinterWorker pdf.render_file filename #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, cashier_terminal.printer_name) end end + + def print_sale_items_report(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges) + filename = "tmp/reports_sale_items.pdf" + + if print_settings.unique_code == "SaleItemsPdf" + pdf = SaleItemsPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges) + puts 'Printing!!!!' + end + if print_settings.unique_code == "SaleItemsStarPdf" + pdf = SaleItemsStarPdf.new(print_settings, shop_details, period_name, type, account, from_date, to_date, shift_name, sale_items, total_other_charges) + puts 'PrintingStar!!!!' + end + + pdf.render_file filename + + #no print in cloud server + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, print_settings.printer_name) + end + end #sqa end diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb index e9e76a86..ed14d884 100755 --- a/app/models/printer/order_queue_printer.rb +++ b/app/models/printer/order_queue_printer.rb @@ -1,33 +1,35 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker def print_order_item(print_settings,oqs, order_id, order_item_id, print_status, before_updated_qty="", options="") - # Must be one print + # Must be one print if print_settings.print_copies == 0 print_settings.print_copies = 1 print_settings.save! end - order_item = print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code) + order_item = print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code) options = order_item[0].options - # filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" + # filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" - pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) + # pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) print_setting = PrintSetting.all - # check for item not to show - - # if order_item[0].price != 0 + # check for item not to show + pdf = '' + # if order_item[0].price != 0 if !print_setting.empty? print_setting.each do |print_settings| if print_settings.unique_code == 'OrderItemPdf' pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) + elsif print_settings.unique_code == 'OrderItemStarPdf' + pdf = OrderItemStarPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderItemSlimPdf' pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderSetItemPdf' pdf = OrderSetItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderItemCustomisePdf' pdf = OrderItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) - elsif print_settings.unique_code == 'OrderSetItemCustomisePdf' + elsif print_settings.unique_code == 'OrderSetItemCustomisePdf' pdf = OrderSetItemCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderItemSlimCustomisePdf' pdf = OrderItemSlimCustomisePdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) @@ -40,15 +42,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker directory_name = 'public/orders_'+shop.shop_code Dir.mkdir(directory_name) unless File.exists?(directory_name) - filename = directory_name + "/order_item_#{order_id}_#{order_item_id}" + ".pdf" + filename = directory_name + "/order_item_#{order_id}_#{order_item_id}" + ".pdf" + + pdf.render_file filename - pdf.render_file filename - if oqs.print_copy #no print in cloud server if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) - end + end #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) @@ -59,24 +61,24 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) end - end + end - return filename, order_id, oqs.printer_name + return filename, order_id, oqs.printer_name end # Query for per order def print_order_summary(print_settings,oqs, order_id, order_items, print_status, before_updated_qty="", options="") #Use CUPS service #Generate PDF - #Print - # Must be one print + #Print + # Must be one print if print_settings.print_copies == 0 print_settings.print_copies = 1 print_settings.save! - end + end print_setting = PrintSetting.all.order("id ASC") - order=print_query('order_summary', order_id) + order=print_query('order_summary', order_id) shop = Shop.first directory_name = 'public/orders_'+shop.shop_code @@ -88,18 +90,20 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker order_items.each do|odi| odi_item=print_query('order_item', odi.order_items_id) - filename = directory_name + "/order_item_#{order_id}" + ".pdf" - # filename = "tmp/order_item_#{order_id}" + ".pdf" + filename = directory_name + "/order_item_#{order_id}" + ".pdf" + # filename = "tmp/order_item_#{order_id}" + ".pdf" # For Item Options options = odi.options == "[]"? "" : odi.options - # check for item not to show + # check for item not to show #if odi.price != 0 pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) if !print_setting.empty? print_setting.each do |print_settings| if print_settings.unique_code == 'OrderItemPdf' pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderItemStarPdf' + pdf = OrderItemStarPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name, before_updated_qty) elsif print_settings.unique_code == 'OrderItemSlimPdf' pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderSetItemPdf' @@ -112,13 +116,13 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderItemSlimCustomisePdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name,before_updated_qty) end end - end + end # pdf.render_file "tmp/order_item.pdf" pdf.render_file filename - if oqs.print_copy + if oqs.print_copy #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) # self.print(filename.gsub(".","-copy."), oqs.printer_name) end @@ -130,11 +134,11 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker self.print(filename, oqs.printer_name) end end - #end + #end end # For Print Order Summary - else - filename = directory_name + "/order_summary_#{order_id}" + ".pdf" + else + filename = directory_name + "/order_summary_#{order_id}" + ".pdf" # filename = "tmp/order_summary_#{order_id}" + ".pdf" pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) if !print_setting.empty? @@ -153,14 +157,14 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name,before_updated_qty) end end - end + end pdf.render_file filename if oqs.print_copy #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" - self.print(filename, oqs.printer_name) - end + if ENV["SERVER_MODE"] != "cloud" + self.print(filename, oqs.printer_name) + end #For print copy # pdf.render_file filename.gsub(".","-copy.") # self.print(filename.gsub(".","-copy."), oqs.printer_name) @@ -168,7 +172,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker print_settings.print_copies = 1 print_settings.save! #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) end end @@ -178,11 +182,11 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # Print for orders in booking def print_booking_summary(print_settings,oqs, booking_id, print_status,before_updated_qty="") - # Must be one print + # Must be one print if print_settings.print_copies == 0 print_settings.print_copies = 1 print_settings.save! - end + end print_setting = PrintSetting.all.order("id ASC") @@ -200,13 +204,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # For Item Options options = odi.options == "[]"? "" : odi.options - # check for item not to show + # check for item not to show #if odi.price != 0 - pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) + pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) if !print_setting.empty? print_setting.each do |print_settings| if print_settings.unique_code == 'OrderItemPdf' pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) + elsif print_settings.unique_code == 'OrderItemStarPdf' + pdf = OrderItemStarPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderItemSlimPdf' pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) elsif print_settings.unique_code == 'OrderSetItemPdf' @@ -219,12 +225,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderItemSlimCustomisePdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name,before_updated_qty) end end - end - pdf.render_file filename + end + pdf.render_file filename if oqs.print_copy #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) end #For print copy @@ -234,16 +240,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker print_settings.print_copies = 1 print_settings.save! #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) end - end + end #end end # For Print Order Summary - else - # filename = "tmp/booking_summary_#{booking_id}" + ".pdf" - filename = directory_name + "/booking_summary_#{booking_id}" + ".pdf" + else + # filename = "tmp/booking_summary_#{booking_id}" + ".pdf" + filename = directory_name + "/booking_summary_#{booking_id}" + ".pdf" pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) if !print_setting.empty? @@ -262,12 +268,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker pdf = OrderSummarySlimCustomisePdf.new(print_settings,order, print_status,oqs.use_alternate_name,before_updated_qty) end end - end + end pdf.render_file filename if oqs.print_copy #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) end #For print copy @@ -277,7 +283,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker print_settings.print_copies = 1 print_settings.save! #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, oqs.printer_name) end end @@ -289,7 +295,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker def print_query(type, id) if type == "order_item" OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name") - .joins("left join orders ON orders.order_id = order_items.order_id + .joins("left join orders ON orders.order_id = order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id left join bookings AS b ON b.booking_id = bo.booking_id left join dining_facilities AS df ON df.id = b.dining_facility_id @@ -297,7 +303,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker left join menu_items as item ON item.item_code = order_items.item_code") .where("order_items.order_items_id = '#{ id }'") .group("order_items.item_code") - elsif type == "order_summary" + elsif type == "order_summary" OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name") .joins("left join orders ON orders.order_id = order_items.order_id left join booking_orders AS bo ON bo.order_id=order_items.order_id @@ -307,7 +313,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker left join menu_items as item ON item.item_code = order_items.item_code") .where("orders.order_id = '#{ id }'") .group("order_items.order_items_id") - else + else # order summary for booking OrderItem.select("order_items.order_id, order_items.item_code, order_items.item_name, order_items.qty, order_items.price, order_items.options, order_items.item_order_by as order_by, order_items.created_at as order_at, order_items.set_menu_items, cus.name as customer, df.type, df.name as dining,item.alt_name as alt_name") .joins("left join orders ON orders.order_id = order_items.order_id @@ -316,7 +322,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker left join dining_facilities AS df ON df.id = b.dining_facility_id left join customers as cus ON cus.customer_id = orders.customer_id left join menu_items as item ON item.item_code = order_items.item_code") - .where("b.booking_id = '#{ id }'") + .where("b.booking_id = '#{ id }'") end end @@ -326,12 +332,12 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker #Generate PDF #Print sale_id = booking.sale_id - filename = "tmp/check_in_out_#{sale_id}" + ".pdf" + filename = "tmp/check_in_out_#{sale_id}" + ".pdf" pdf = CheckInOutPdf.new(print_settings,booking, table) print_setting = PrintSetting.all - # if order_item[0].price != 0 + # if order_item[0].price != 0 if !print_setting.empty? print_setting.each do |print_settings| if print_settings.unique_code == 'CheckInOutPdf' @@ -340,9 +346,9 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker end end - pdf.render_file filename + pdf.render_file filename - # Must be one print + # Must be one print if print_settings.print_copies == 0 print_settings.print_copies = 1 print_settings.save! @@ -351,8 +357,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker # print_settings.save! #no print in cloud server - if ENV["SERVER_MODE"] != "cloud" + if ENV["SERVER_MODE"] != "cloud" self.print(filename, print_settings.printer_name) - end + end end end diff --git a/app/models/printer/printing_data.rb b/app/models/printer/printing_data.rb new file mode 100644 index 00000000..e69de29b diff --git a/app/models/printer/printservice.rb b/app/models/printer/printservice.rb new file mode 100644 index 00000000..e69de29b diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 2b01c174..b45c722b 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -9,7 +9,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderItemPdf' + if printer_setting.unique_code == 'OrderItemPdf' pdf = OrderItemPdf.new elsif printer_setting.unique_code == 'OrderItemSlimPdf' pdf = OrderItemSlimPdf.new @@ -18,12 +18,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker elsif printer_setting.unique_code == 'OrderItemCustomisePdf' pdf = OrderItemCustomisePdf.new elsif printer_setting.unique_code == 'OrderSetItemCustomisePdf' - pdf = OrderSetItemCustomisePdf.new + pdf = OrderSetItemCustomisePdf.new elsif printer_setting.unique_code == 'OrderItemSlimCustomisePdf' pdf = OrderItemSlimCustomisePdf.new - end + end end - end + end pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf" #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -41,7 +41,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderSummaryPdf' + if printer_setting.unique_code == 'OrderSummaryPdf' pdf = OrderSummaryPdf.new elsif printer_setting.unique_code == 'OrderSummarySlimPdf' pdf = OrderSummarySlimPdf.new @@ -50,12 +50,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' - pdf = OrderSummarySetCustomisePdf.new + pdf = OrderSummarySetCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf' pdf = OrderSummarySlimCustomisePdf.new - end + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -72,7 +72,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummaryPdf.new if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderSummaryPdf' + if printer_setting.unique_code == 'OrderSummaryPdf' pdf = OrderSummaryPdf.new elsif printer_setting.unique_code == 'OrderSummarySlimPdf' pdf = OrderSummarySlimPdf.new @@ -81,12 +81,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' - pdf = OrderSummarySetCustomisePdf.new + pdf = OrderSummarySetCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf' pdf = OrderSummarySlimCustomisePdf.new - end + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -103,7 +103,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummaryPdf.new if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderSummaryPdf' + if printer_setting.unique_code == 'OrderSummaryPdf' pdf = OrderSummaryPdf.new elsif printer_setting.unique_code == 'OrderSummarySlimPdf' pdf = OrderSummarySlimPdf.new @@ -112,12 +112,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' - pdf = OrderSummarySetCustomisePdf.new + pdf = OrderSummarySetCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf' pdf = OrderSummarySlimCustomisePdf.new - end + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -134,7 +134,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummaryPdf.new if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderSummaryPdf' + if printer_setting.unique_code == 'OrderSummaryPdf' pdf = OrderSummaryPdf.new elsif printer_setting.unique_code == 'OrderSummarySlimPdf' pdf = OrderSummarySlimPdf.new @@ -143,12 +143,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' - pdf = OrderSummarySetCustomisePdf.new + pdf = OrderSummarySetCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf' pdf = OrderSummarySlimCustomisePdf.new - end + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -165,7 +165,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker pdf = OrderSummaryPdf.new if !printer.empty? printer.each do |printer_setting| - if printer_setting.unique_code == 'OrderSummaryPdf' + if printer_setting.unique_code == 'OrderSummaryPdf' pdf = OrderSummaryPdf.new elsif printer_setting.unique_code == 'OrderSummarySlimPdf' pdf = OrderSummarySlimPdf.new @@ -174,12 +174,12 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker elsif printer_setting.unique_code == 'OrderSummaryCustomisePdf' pdf = OrderSummaryCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySetCustomisePdf' - pdf = OrderSummarySetCustomisePdf.new + pdf = OrderSummarySetCustomisePdf.new elsif printer_setting.unique_code == 'OrderSummarySlimCustomisePdf' pdf = OrderSummarySlimCustomisePdf.new - end + end end - end + end pdf.render_file filename #no print in cloud server if ENV["SERVER_MODE"] != "cloud" @@ -188,21 +188,32 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Bill Receipt Print - def print_receipt_bill(printer_settings,cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount,order_reservation) + def print_receipt_bill(printer_settings, kbz_pay_status, qr_code, cashier_terminal,sale_items,sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount=nil,shop_details, printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount,order_reservation) #Use CUPS service #Generate PDF - #Print + #Print if !printer_settings.nil? if !printer_settings.unique_code.strip.downcase.include? ("receiptbillorder") - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) + pdf = ReceiptBillPdf.new(printer_settings, kbz_pay_status, qr_code, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) + settings = PrintSetting.all + if !settings.nil? + settings.each do |setting| + if setting.unique_code == 'ReceiptBillPdf' + pdf = ReceiptBillPdf.new(printer_settings, kbz_pay_status, qr_code, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) + elsif setting.unique_code == 'ReceiptBillStarPdf' + pdf = ReceiptBillStarPdf.new(printer_settings, kbz_pay_status, qr_code, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) + end + end + end + receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf if !receipt_bill_a5_pdf.empty? receipt_bill_a5_pdf.each do |receipt_bilA5| - if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + if receipt_bilA5[0] == 'ReceiptBillA5Pdf' if receipt_bilA5[1] == '1' pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) - else - pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) + # else + # pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount) end end end @@ -211,7 +222,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker #doemal online order pdf template pdf = ReceiptBillOrderPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance,card_data,other_amount,latest_order_no,card_balance_amount,order_reservation) end - + # print as print copies in printer setting count = printer_settings.print_copies diff --git a/app/models/promotion.rb b/app/models/promotion.rb index 034ae8ac..b636a097 100755 --- a/app/models/promotion.rb +++ b/app/models/promotion.rb @@ -1,3 +1,4 @@ +#new_promotion class Promotion < ApplicationRecord validates_presence_of :promo_code,:promo_start_date,:promo_end_date,:promo_start_hour,:promo_end_hour,:promo_type,:original_product,:min_qty @@ -11,6 +12,7 @@ class Promotion < ApplicationRecord PROMO_TYPE4 = "Percentage" def self.promo_activate(saleObj) + array_same =[] current_day = Time.now.strftime("%Y-%m-%d") current_time = Time.now.strftime('%H:%M:%S') day = Date.today.wday @@ -18,9 +20,28 @@ class Promotion < ApplicationRecord puts "promoList - " + promoList.size.to_s if promoList.size > 0 itemList = combine_item(saleObj) - puts itemList.to_json - is_promo_day(promoList,day, itemList, saleObj.sale_id) + itemList.each do|list| + list.each do |l| + array_same.push({ + item_instance_code: l.item_instance_code, + order_id:l.order_id, + qty:l.qty + }) + end + end end + item_list =[] + array_same.group_by do |same| + same.values_at :item_instance_code + end.map do |(item_instance_code), array_same| + quantities = array_same.map { |p| p[:qty] } + qty = quantities.all? ? quantities.reduce(:+) : nil + item_list.push({ item_instance_code: item_instance_code, qty: qty }) + end + Rails.logger.debug "-------promo_activate array_same-------" + puts item_list.to_json + is_promo_day(promoList,day, item_list, saleObj.sale_id) + end def self.is_between_promo_datetime(current_day,current_time) #database is not local time @@ -31,9 +52,11 @@ class Promotion < ApplicationRecord def self.combine_item(saleObj) # order_id = saleObj.sale_orders[0][0].order_id # itemList = OrderItem.where("order_id = ?", order_id).group(:item_instance_code).sum(:qty) + # array_same =[] itemList = [] saleObj.sale_orders.each do |so| - itemList << OrderItem.where("order_id = ?",so.order_id).group(["item_instance_code", "order_id"]).sum(:qty) + # itemList << OrderItem.where("order_id = ?",so.order_id).group(["item_instance_code", "order_id"]).sum(:qty) + itemList << OrderItem.where("order_id = ?",so.order_id).select(:item_instance_code,:order_id,:qty) end return itemList @@ -52,21 +75,21 @@ class Promotion < ApplicationRecord end def self.find_promo_item(promo, orderitem, sale_id) - # item_code = OrderItem.find_by_item_instance_code(orderitem[0][0]).item_code - orderitem.each do |odr_item| - if promo.original_product.downcase.to_s == odr_item[0][0] - if promo.min_qty.to_i > odr_item[1].to_i + item_code = OrderItem.find_by_item_instance_code(orderitem[:item_instance_code]).item_code + # orderitem.each do |odr_item| + if promo.original_product.downcase.to_s == orderitem[:item_instance_code] + if promo.min_qty.to_i > orderitem[:qty].to_i return false else - check_promo_type(promo,odr_item, sale_id) + check_promo_type(promo,orderitem, sale_id) end end - end + # end end def self.check_promo_type(promo, orderitem, sale_id) promo.promotion_products.each do |promo_product| - if promo_product.item_code.downcase == orderitem[0][0] + if promo_product.item_code.downcase == orderitem[:item_instance_code] same = true else # return false, promo_product @@ -74,10 +97,10 @@ class Promotion < ApplicationRecord end # same, promo_product = check_giveaway_product(promo, orderitem[0][0]) if promo.promo_type == Promotion::PROMO_TYPE1 - if same - give_promotion_same_product(orderitem[1], promo.min_qty, promo_product.min_qty, orderitem, sale_id,promo_product.item_code) + if same + give_promotion_same_product(orderitem[:qty], promo.min_qty, promo_product.min_qty, orderitem, sale_id,promo_product.item_code) else - give_promotion_second_product(orderitem[1], promo.min_qty, promo_product.item_code, orderitem, sale_id) + give_promotion_second_product(orderitem[:qty], promo.min_qty, promo_product.item_code, orderitem, sale_id) end elsif promo.promo_type == Promotion::PROMO_TYPE2 @@ -106,6 +129,7 @@ class Promotion < ApplicationRecord end def self.give_promotion_same_product(qty, promoqty, foc_min_qty, orderitem, sale_id,promo_product) + item ='' puts " Order qty: " + qty.to_s + " / promoqty: " + promoqty.to_s + " / giveaway: " + foc_min_qty.to_s multiple = qty.to_i / promoqty.to_i # loop count charge_qty = 0 @@ -132,20 +156,45 @@ class Promotion < ApplicationRecord else charge_qty += qty end - item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first - if promo_product.downcase != item.item_instance_code - # item = item - # else - # item = OrderItem.find_by_item_code(promo_product) - item = OrderItem.where("item_code = '#{promo_product}' and order_id = '#{orderitem[0][1]}'").first + sale_order =SaleOrder.where("sale_id=?",sale_id) + price =0 + source ='' + sale_order.each do|order| + source = Order.find(order.order_id).source + end + + item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } + if promo_product.downcase != item[:item_instance_code] + + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_code = ?",promo_product).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } end if !item.nil? - source = Order.find(item.order_id).source - update_existing_item(foc_qty, item, sale_id, "promotion", item.price,source) + update_existing_item(foc_qty, item, sale_id, "promotion", item[:price],source) end end # AA - 10 # 3 # BB # orderList, #S34345 def self.give_promotion_second_product(orderitem_count, foc_min_qty, promo_product, orderitem, sale_id) + source ='' + item ='' puts "..... orderitem_count: " + orderitem_count.to_s + " / foc_min_qty: " + foc_min_qty.to_s + " /promo_product: " + promo_product + " orderitem: " + orderitem.to_s promotion_qty = orderitem_count.to_i / foc_min_qty.to_i # get foc item qty foc_qty = find_second_item_qty(sale_id, promo_product) @@ -153,91 +202,164 @@ class Promotion < ApplicationRecord promotion_qty = foc_qty end # item = OrderItem.find_by_item_instance_code(promo_product) - item = OrderItem.where("item_instance_code = '#{promo_product}' and order_id = '#{orderitem[0][1]}'").first + sale_order =SaleOrder.where("sale_id=?",sale_id) + price =0 + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code = ?",promo_product).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } + # item = OrderItem.where("item_instance_code = '#{promo_product}' and order_id = '#{orderitem[0][1]}'").first if !item.nil? - source = Order.find(item.order_id).source - update_existing_item(promotion_qty, item, sale_id, "promotion", item.price,source) + # source = Order.find(item.order_id).source + update_existing_item(promotion_qty, item, sale_id, "promotion", item[:price],source) end end def self.update_existing_item(qty, item, sale_id, type, item_price,source) - menu_category = MenuCategory.get_menu_category(item.item_code) #get menu category for menu items - - sale_item = SaleItem.new - if !menu_category.nil? - sale_item.menu_category_code = menu_category.code - sale_item.menu_category_name = menu_category.name + if qty >0 + menu_category = MenuCategory.get_menu_category(item[:item_code]) #get menu category for menu items + + sale_item = SaleItem.new + if !menu_category.nil? + sale_item.menu_category_code = menu_category.code + sale_item.menu_category_name = menu_category.name + end + sale_item.product_code = item[:item_code] + sale_item.item_instance_code = item[:item_instance_code] + sale_item.product_name = item[:item_name] + "(promotion)" + sale_item.product_alt_name = item[:alt_name] + sale_item.account_id = item[:account_id] + sale_item.remark = type + sale_item.status = "promotion" + sale_item.qty = qty * (-1) + + sale_item.unit_price = item_price # * (-1) + sale_item.taxable_price = (qty * item_price) * (-1) + sale_item.price = qty * item_price * (-1) + + sale_item.is_taxable = 1 + sale_item.sale_id = sale_id + sale_item.save + sale = Sale.find(sale_id) + sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount,nil,source) end - sale_item.product_code = item.item_code - sale_item.item_instance_code = item.item_instance_code - sale_item.product_name = item.item_name + "(promotion)" - sale_item.product_alt_name = item.alt_name - sale_item.account_id = item.account_id - sale_item.remark = type - sale_item.status = "promotion" - sale_item.qty = qty * (-1) - - sale_item.unit_price = item_price # * (-1) - sale_item.taxable_price = (qty * item_price) * (-1) - sale_item.price = qty * item_price * (-1) - - sale_item.is_taxable = 1 - sale_item.sale_id = sale_id - sale_item.save - sale = Sale.find(sale_id) - sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount,nil,source) end def self.give_promotion_nett_off(same, promo_product, foc_min_qty, orderitem, sale_id) + item ='' + source ='' puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s + sale_order =SaleOrder.where("sale_id=?",sale_id) if same - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[:qty].to_i / foc_min_qty # item = OrderItem.find_by_item_instance_code(orderitem[0][0]) - item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first + + price =0 + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } + # item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first if !item.nil? - source = Order.find(item.order_id).source + # source = Order.find(item.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off,source) end else - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[:qty].to_i / foc_min_qty # foc_qty = find_second_item_qty(sale_id, promo_product.item_code) # item = OrderItem.find_by_item_instance_code(promo_product.item_code) - item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first + # item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code = ?",promo_product.item_code).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } if !item.nil? - source = Order.find(item.order_id).source + # source = Order.find(item.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion nett off", promo_product.net_off,source) end - + end end def self.give_promotion_nett_price(same, promo_product, foc_min_qty, orderitem, sale_id) puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s + sale_order =SaleOrder.where("sale_id=?",sale_id) + source ='' + item ='' if same - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[:qty].to_i / foc_min_qty # item = OrderItem.find_by_item_instance_code(orderitem[0][0]) # need to specify with menu item instance - item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first + # item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } if !item.nil? - price = item.price.to_i - promo_product.net_price.to_i - source = Order.find(item.order_id).source + price = item[:price].to_i - promo_product.net_price.to_i + # source = Order.find(item.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion nett price", price,source) end else order_qty = find_second_item_qty(sale_id, promo_product.item_code)# need to check for qty - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[:qty].to_i / foc_min_qty if foc_qty > order_qty foc_qty = order_qty end # item = OrderItem.find_by_item_instance_code(promo_product.item_code) - item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first + # item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code",promo_product.item_code).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } + if !item.nil? - price = item.price - promo_product.net_price - source = Order.find(item.order_id).source + price = item[:price].to_i - promo_product.net_price.to_i + # source = Order.find(item.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion nett price", price,source) end @@ -246,47 +368,90 @@ class Promotion < ApplicationRecord def self.give_promotion_discount(same, promo_product, foc_min_qty, orderitem, sale_id) puts " same: " + same.to_s + " promo_product: " + promo_product.item_code.to_s + " foc_min_qty: " + foc_min_qty.to_s + " orderitem: " + orderitem.to_s + sale_order =SaleOrder.where("sale_id=?",sale_id) + source ='' + item ='' if same - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[:qty].to_i / foc_min_qty # item = OrderItem.find_by_item_instance_code(orderitem[0][0]) - item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first + # item = OrderItem.where("item_instance_code = '#{orderitem[0][0]}' and order_id = '#{orderitem[0][1]}'").first + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code = ?",orderitem[:item_instance_code]).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } # total = orderitem[1].to_i * item.price if !item.nil? - total = item.price + total = item[:price] price = calculate_discount(total, promo_product.percentage) - source = Order.find(item.order_id).source + # source = Order.find(item.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion discount", price,source) end else order_qty = find_second_item_qty(sale_id, promo_product.item_code) #need to check - foc_qty = orderitem[1].to_i / foc_min_qty + foc_qty = orderitem[:qty].to_i / foc_min_qty # give total qty is 1 #foc_qty = (foc_qty - foc_qty) + 1 if foc_qty > order_qty foc_qty = order_qty end # item = OrderItem.find_by_item_instance_code(promo_product.item_code) - item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first + # item = OrderItem.where("item_instance_code = '#{promo_product.item_code}' and order_id = '#{orderitem[0][1]}'").first + sale_order.each do|order| + source = Order.find(order.order_id).source + end + item = OrderItem.where("item_instance_code = ?",promo_product.item_code).order("order_items_id DESC").first + item ={ + item_code:item.item_code, + item_instance_code:item.item_instance_code, + item_name:item.item_name, + alt_name:item.alt_name, + account_id:item.account_id, + price:item.price + } # total = item.price * foc_qty if !item.nil? - total = item.price + total = item[:price] price = calculate_discount(total, promo_product.percentage) - source = Order.find(item.order_id).source + # source = Order.find(item.order_id).source update_existing_item(foc_qty, item, sale_id, "promotion discount", price,source) end end end def self.find_second_item_qty(sale_id, promo_item) + array_same =[] saleObj = Sale.find_by_sale_id(sale_id) - itemList = combine_item(saleObj) - itemList.each do |item| - item.each do |i| - if i[0][0] == promo_item.downcase - return i[1] + itemList = combine_item(saleObj) + itemList.each do|list| + list.each do |l| + array_same.push({ + item_instance_code: l.item_instance_code, + order_id:l.order_id, + qty:l.qty + }) + end + end + item_list =[] + array_same.group_by do |same| + same.values_at :item_instance_code + end.map do |(item_instance_code), array_same| + quantities = array_same.map { |p| p[:qty] } + qty = quantities.all? ? quantities.reduce(:+) : nil + item_list.push({ item_instance_code: item_instance_code, qty: qty }) + end + item_list.each do |item| + if item[:item_instance_code] == promo_item.downcase + return item[:qty].to_i end - end end return 0 end diff --git a/app/models/reservation_item.rb b/app/models/reservation_item.rb index 19e28b82..6329f24e 100644 --- a/app/models/reservation_item.rb +++ b/app/models/reservation_item.rb @@ -7,7 +7,7 @@ class ReservationItem < ApplicationRecord belongs_to :reservation, autosave: true private - def generate_custom_id - self.reservation_items_id = SeedGenerator.generate_id(self.class.name, "RSI") - end + def generate_custom_id + self.reservation_items_id = SeedGenerator.generate_id(self.class.name, "RSI") + end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 47c3790f..8be79db3 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -13,9 +13,12 @@ class Sale < ApplicationRecord has_many :sale_taxes has_many :sale_payments has_many :sale_orders + has_many :orders, through: :sale_orders has_many :bookings has_many :product_commissions + after_update :update_stock_journal + scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") } scope :complete_sale, -> { where("sale_status = 'completed' and receipt_date BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") } @@ -26,185 +29,210 @@ class Sale < ApplicationRecord } SALE_STATUS_OUTSTANDING = "outstanding" SALE_STATUS_COMPLETED = "completed" - - def generate_invoice_from_booking(booking_id, requested_by, cashier, order_source = nil) - booking = Booking.find(booking_id) - status = false - Rails.logger.debug "Booking -> " + booking.id.to_s - if (booking) + def self.sync_sale_records(sales) + if !sales.nil? + sales.each do |s| + sale = Sale.find_by_sale_id(s['sale_id']) + # unless Sale.exists?(s['sale_id']) + if sale.nil? + sale = Sale.new + end + sale.sale_id = s['sale_id'] + sale.cashier_id = s['cashier_id'] + sale.cashier_name = s['cashier_name'] + sale.requested_by = s['requested_by'] + sale.requested_at = s['requested_at'] + sale.receipt_no = s['receipt_no'] + sale.receipt_date = s['receipt_date'] + sale.customer_id = s['customer_id'] + sale.payment_status = s['payment_status'] + sale.sale_status = s['sale_status'] + sale.total_amount = s['total_amount'] + sale.discount_type = s['discount_type'] + sale.total_tax = s['total_tax'] + sale.total_discount = s['total_discount'] + sale.tax_type = s['tax_type'] + sale.grand_total = s['grand_total'] + sale.rounding_adjustment = s['rounding_adjustment'] + sale.amount_received = s['amount_received'] + sale.amount_changed = s['amount_changed'] + sale.shift_sale_id = s['shift_sale_id'] + sale.old_grand_total = s['old_grand_total'] + sale.rebate_status = s['rebate_status'] + sale.equal_persons = s['equal_persons'] + sale.save + end + Rails.logger.debug '........ Sale data sync completed .......' + end + end + def self.generate_invoice_from_booking(booking, requested_by, cashier, order_source = nil, current_checkin_induties_count) + if booking + Rails.logger.debug "Booking -> " + booking.id.to_s Rails.logger.debug "Booking -> Booking Order Count -> " + booking.booking_orders.count.to_s #get all order attached to this booking and combine into 1 invoice - booking.booking_orders.each do |order| - if booking.sale_id - status, sale_id = generate_invoice_from_order(order.order_id, nil, booking, requested_by, cashier, order_source) - else - status, sale_id = generate_invoice_from_order(order.order_id, booking.sale_id, booking, requested_by, cashier, order_source) - end - booking.sale_id = sale_id + unless sale = booking.sale + sale = booking.build_sale( + { + tax_type: "execulive" # Default Tax - Values + } + ) end + booking.booking_orders.each do |order| + sale.generate_invoice_from_order(order.order_id, booking, requested_by, cashier, order_source) + # saleObj = Sale.find(sale_id) + # order = booking.booking_orders.take.order + # link_order_sale(order.order_id) + end + # InventoryJob.perform_now(self.id) + # InventoryDefinition.calculate_product_count(saleObj) - order = booking.booking_orders.take.order - link_order_sale(order.id) # dining charges - charges = DiningCharge.where('dining_facility_id=?',booking.dining_facility_id).take - if !charges.nil? + charges = DiningCharge.where('dining_facility_id=?', booking.dining_facility_id).take + if !charges.nil? block_count, diningprice = DiningCharge.amount_calculate(charges, booking.checkin_at, booking.checkout_at) if charges.charge_type =='hr' dining_time = booking.checkin_at.strftime('%H:%M %p').to_s + " - " + booking.checkout_at.strftime('%H:%M %p').to_s else dining_time = booking.checkin_at.strftime('%B %d, %H:%M %p').to_s + " - " + booking.checkout_at.strftime('%B %d, %H:%M %p').to_s end - create_saleitem_diningcharges(charges, block_count, diningprice, booking.dining_facility.name, dining_time, order_source) + later_time = booking.checkout_at + early_time = booking.checkin_at + distance_in_minutes = ((later_time - early_time)/60.0).round + basic_pay_amount = 0 + name = "" + if current_checkin_induties_count != "0" + basic_pay = Commission.where('commission_type=?','Basic Pay') + basic_pay.each do |pay| + basic_pay_amount = pay.amount + name = pay.name + end + induties_pay_amount = (current_checkin_induties_count.to_i * (distance_in_minutes / 60.0).to_f * basic_pay_amount).to_i + sale.create_saleitem_indutycharges(charges, current_checkin_induties_count.to_i, induties_pay_amount, booking.dining_facility.name, dining_time, order_source, basic_pay_amount) + end + sale.create_saleitem_diningcharges(charges, block_count, diningprice, booking.dining_facility.name, dining_time, order_source) end - return status, sale_id + return sale end end - def generate_invoice_from_order (order_id, sale_id, booking, requested_by, cashier = nil, order_source = nil) + def generate_invoice_from_order(order_id, booking, requested_by, cashier = nil, order_source = nil) taxable = true - #if sale_id is exsit and validate - #add order to that invoice - if (sale_id) - self.find(sale_id) - end - Rails.logger.debug "Does it have Existing Sale -> [#{self.id.to_s}] - Status [#{self.sale_status}]" - if self.sale_status == "void" - return false, "Invoice is void. Cannot be edited" + order = Order.find(order_id) + + # current cashier login + open_cashier = Employee.where("role = 'cashier' AND token_session <> ''") + current_shift = ShiftSale.current_shift + # shift with terminal zone + + # set cashier + if order_source.present? && order_source.downcase == "emenu" + if !booking.dining_facility_id.nil? + table = DiningFacility.find(booking.dining_facility_id) + cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first + #for multiple zone with terminal + if shift.nil? + multiple_zone = CashierTerminalByZone.where("zone_id = #{table.zone_id}") + multiple_zone.each do |zone| + shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{zone.cashier_terminal_id}").first + if !shift.nil? then + break + end + end + end + end else - #if this is new sale generate_receipt_no - # generate_receipt_no - order = Order.find(order_id) - - #Default Tax - Values - self.tax_type = "exclusive" - # current cashier login - open_cashier = Employee.where("role = 'cashier' AND token_session <> ''") - current_shift = ShiftSale.current_shift - # shift with terminal zone - - # set cashier - if order_source.downcase == "emenu" - if !booking.dining_facility_id.nil? - table = DiningFacility.find(booking.dining_facility_id) - cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) - shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{cashier_zone.cashier_terminal_id}").first - #for multiple zone with terminal - if shift.nil? - multiple_zone = CashierTerminalByZone.where("zone_id = #{table.zone_id}") - multiple_zone.each do |zone| - shift = ShiftSale.where("shift_started_at is not null and shift_closed_at is null and cashier_terminal_id = #{zone.cashier_terminal_id}").first - if !shift.nil? then - break - end - end + shift = ShiftSale.current_open_shift(cashier.id) + end + # set cashier + if shift != nil #if current login employee open shift + self.cashier_id = cashier.id + self.cashier_name = cashier.name + self.shift_sale_id = shift.id + else + if open_cashier.count>0 # if we have two open cashier + # table and terminal in multiple shift + self.cashier_id = open_cashier[0].id + self.cashier_name = open_cashier[0].name + shift_id = ShiftSale.current_open_shift(open_cashier[0].id) + if shift_id + self.shift_sale_id = shift_id.id + else + self.shift_sale_id = current_shift.id end - end else - shift = ShiftSale.current_open_shift(cashier.id) + self.cashier_id = current_shift.employee_id + self.cashier_name = Employee.find(current_shift.employee_id).name + self.shift_sale_id = current_shift.id end - # set cashier - if shift != nil #if current login employee open shift - self.cashier_id = cashier.id - self.cashier_name = cashier.name - self.shift_sale_id = shift.id - else - if open_cashier.count>0 # if we have two open cashier - # table and terminal in multiple shift - self.cashier_id = open_cashier[0].id - self.cashier_name = open_cashier[0].name - shift_id = ShiftSale.current_open_shift(open_cashier[0].id) - if shift_id - self.shift_sale_id = shift_id.id - else - self.shift_sale_id = current_shift.id - end - else - self.cashier_id = current_shift.employee_id - self.cashier_name = Employee.find(current_shift.employee_id).name - self.shift_sale_id = current_shift.id + end + + + # set waiter + self.requested_by = requested_by.name + + self.requested_at = DateTime.now.utc.getlocal + + Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}" + if order + self.customer_id = order.customer_id + Rails.logger.debug "Order -> #{order.id} | Items Count -> #{order.order_items.count}" + + order.order_items.each do |item| + self.add_item(item) + if !item.set_menu_items.nil? + self.add_sub_item(item.set_menu_items) end end + self.orders << order + end + #compute sales summary + if order_source.nil? + order_source = order.source + end + self.compute(order_source) - # set waiter - self.requested_by = requested_by.name + #Update the order items that is billed + order.update_items_status_to_billed(nil) + order.status = "billed" + order.save - self.requested_at = DateTime.now.utc.getlocal - - Rails.logger.debug "Order -> #{order.id} | order_status -> #{order.status}" - if order - self.customer_id = order.customer_id - Rails.logger.debug "Order -> #{order.id} | Items Count -> #{order.order_items.count}" - - order.order_items.each do |item| - add_item(item) - if !item.set_menu_items.nil? - add_sub_item(item.set_menu_items) - end - end - - link_order_sale(order.id) - - end - self.save! - - #compute sales summary - if order_source.nil? - order_source = order.source - end - compute(order_source) - - #Update the order items that is billed - order.update_items_status_to_billed(nil) - order.status = "billed" - order.save - - booking.sale_id = self.id - if !booking.checkout_at.nil? - if booking.checkout_at.utc < Time.now.utc - booking.checkout_at = Time.now.utc.getlocal - end - else + if !booking.checkout_at.nil? + if booking.checkout_at.utc < Time.now.utc booking.checkout_at = Time.now.utc.getlocal end - - booking.checkout_by = requested_by.name - booking.save - - # InventoryJob.perform_now(self.id) - saleObj = Sale.find(self.id) - InventoryDefinition.calculate_product_count(saleObj) - - return true, self.id + else + booking.checkout_at = Time.now.utc.getlocal end - return false, nil + booking.checkout_by = requested_by.name + booking.save + # InventoryJob.perform_now(self.id) + # saleObj = Sale.find(self.id) + # InventoryDefinition.calculate_product_count(saleObj) + + return self end #fOR Quick Service pay and create def self.request_bill(order,current_user,current_login_employee) - @sale = Sale.new - sale_order=SaleOrder.new - if !ShiftSale.current_shift.nil? order_id = order.order_id # order_id bk_order = BookingOrder.find_by_order_id(order_id) check_booking = Booking.find_by_booking_id(bk_order.booking_id) - - if check_booking.sale_id.nil? + + if @sale_data = check_booking.sale # Create Sale if it doesn't exist # puts "current_login_employee" # puts current_login_employee.name - @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee,current_user,order.source) - @sale_data = Sale.find_by_sale_id(@sale_id) @sale_items = SaleItem.where("sale_id=?",@sale_id) - else - @sale_data = Sale.find_by_sale_id(check_booking.sale_id) + elsif @sale_data = Sale.generate_invoice_from_booking(check_booking,current_login_employee,current_user,order.source) @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id) end @@ -213,9 +241,9 @@ class Sale < ApplicationRecord # @sale_data.save # Promotion Activation - Promotion.promo_activate(@sale) + Promotion.promo_activate(@sale_data) @status = true - return @status, @sale + return @status, @sale_data else @status = false @message = "No Current Open Shift for This Employee" @@ -234,7 +262,7 @@ class Sale < ApplicationRecord if !item.set_menu_items.nil? add_sub_item(item.set_menu_items) end - + #this will result in multiple orders belonging in multiple invoices - because of spilt invoices. link_order_sale(item.order_id, taxable) end @@ -253,7 +281,7 @@ class Sale < ApplicationRecord #save sale_audit sale_item = SaleItem.new - + #pull if !menu_category.nil? sale_item.menu_category_code = menu_category.code @@ -326,11 +354,29 @@ class Sale < ApplicationRecord sale_item.price = diningprice sale_item.save - # Re-calc + # Re-calc + sale = Sale.find(self.id) + self.compute_by_sale_items(self.id, sale.sale_items, self.total_discount, nil, order_source) + end + def create_saleitem_indutycharges(chargeObj, current_checkin_induties_count, induties_pay_amount, dining_name, dining_time, order_source = nil, basic_pay_amount) + sale_item = SaleItem.new + sale_item.menu_category_code = "IndutyCharge" + sale_item.menu_category_name = "Induty Charge" + sale_item.product_code = "" + sale_item.product_name ='Vocalist' + " ( " + dining_time.to_s + " )" + sale_item.account_id = 0 + sale_item.product_alt_name = "-" + sale_item.qty = current_checkin_induties_count + sale_item.unit_price = basic_pay_amount + sale_item.taxable_price = induties_pay_amount + sale_item.is_taxable = chargeObj.taxable + sale_item.sale_id = self.id + sale_item.price = induties_pay_amount + sale_item.save + # Re-calc sale = Sale.find(self.id) self.compute_by_sale_items(self.id, sale.sale_items, self.total_discount, nil, order_source) end - def update_item (item) #save sale_audit @@ -374,6 +420,7 @@ class Sale < ApplicationRecord self.total_amount = subtotal_price self.total_discount = total_discount self.grand_total = (self.total_amount - self.total_discount) + self.total_tax + self.grand_total_round #compute rounding adjustment adjust_rounding @@ -382,7 +429,8 @@ class Sale < ApplicationRecord end #compute - invoice total - def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil,tax_type=nil) + def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil,order_source=nil,tax_type=nil,type=nil) + shop = Shop.first sale = Sale.find(sale_id) sales_items = sale_itemss @@ -393,19 +441,23 @@ class Sale < ApplicationRecord sales_items.each do |item| #compute each item and added to total - subtotal_price = subtotal_price + item.price + subtotal_price = subtotal_price + item.price # check for item is taxable and calculate if item.is_taxable total_taxable = total_taxable + item.taxable_price end end - compute_tax(sale, total_taxable, total_discount, order_source, tax_type) - sale.total_amount = subtotal_price sale.total_discount = total_discount - sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax + if type =="foc" + sale.grand_total = 0 + else + sale.grand_total = (sale.total_amount - sale.total_discount) + sale.total_tax + sale.grand_total_round + end + if discount_type == "member_discount" sale.discount_type = discount_type end @@ -441,6 +493,7 @@ class Sale < ApplicationRecord self.total_amount = subtotal_price self.total_discount = total_discount self.grand_total = (self.total_amount - self.total_discount) + self.total_tax + self.grand_total_round #compute rounding adjustment adjust_rounding @@ -481,7 +534,7 @@ class Sale < ApplicationRecord if order_source.to_s == "emenu" order_source = "cashier" end - + if sale.payment_status != 'foc' tax_profiles.each do |tax| if tax.group_type.to_s == order_source.to_s @@ -548,7 +601,7 @@ class Sale < ApplicationRecord # Tax Calculate def apply_tax(total_taxable, order_source = nil, tax_type = nil) shop = Shop.first - + #if tax is not apply create new record # SaleTax.where("sale_id='#{self.sale_id}'").find_each do |existing_tax| # #delete existing and create new @@ -658,9 +711,11 @@ class Sale < ApplicationRecord saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take if saleOrder.nil? - sale_order = SaleOrder.new - sale = sale_order.create_sale_order(self.id, order_id) + saleOrder = SaleOrder.new + # sale = saleOrder.create_sale_order(self.id, order_id) end + + sale = saleOrder.create_sale_order(self.id, order_id) # if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?) # SaleOrder.create(:sale_id => self.id, :order_id => order_id) # end @@ -669,7 +724,7 @@ class Sale < ApplicationRecord end def adjust_rounding - shop_details = Shop.first + shop_details = Shop.first # rounding adjustment if shop_details.is_rounding_adj a = self.grand_total % 25 # Modulus @@ -685,11 +740,11 @@ class Sale < ApplicationRecord else self.rounding_adjustment = 0.00 end - + end def compute_adjust_rounding(grand_total) - shop_details = Shop.first + shop_details = Shop.first # rounding adjustment if shop_details.is_rounding_adj a = grand_total % 25 # Modulus @@ -786,7 +841,7 @@ class Sale < ApplicationRecord .joins(" JOIN booking_orders ON booking_orders.booking_id=bookings.booking_id") .joins(" JOIN orders ON orders.order_id=booking_orders.order_id") .where("DATE_FORMAT(receipt_date,'%d-%m-%Y') >= ?" + " AND DATE_FORMAT(receipt_date,'%d-%m-%Y') <= ? and (CASE WHEN (sales.grand_total + sales.amount_changed)=(select SUM(sale_payments.payment_amount) - FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) #{keyword} #{custo} #{source}", from,to) + FROM sale_payments WHERE sale_payments.sale_id=sales.sale_id AND sale_payments.payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) #{keyword} #{custo} #{source}", from,to) else sale = Sale.select("sales.*,#{order_source_query} as source").joins(" JOIN sale_payments sp on sp.sale_id = sales.sale_id") .joins(" JOIN bookings ON bookings.sale_id=sales.sale_id") @@ -842,6 +897,7 @@ def self.daily_sales_list(from,to) AND DATE_FORMAT(CONVERT_TZ(s.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') = DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d')" payments_total = Sale.select("CAST((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')) AS DATE) as sale_date, + SUM(case when (sale_payments.payment_method='KBZPay') then sale_payments.payment_amount else 0 end) as kbzpay_amount, SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount, SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount, @@ -891,6 +947,7 @@ def self.daily_sales_list(from,to) :paypar_amount => pay.paypar_amount, :unionpay_amount => pay.unionpay_amount, :alipay_amount => pay.alipay_amount, + :kbzpay_amount => pay.kbzpay_amount, :paymal_amount => pay.paymal_amount, :dinga_amount => pay.dinga_amount, :junctionpay_amount => pay.junctionpay_amount, @@ -922,7 +979,7 @@ def self.get_by_range_by_saleitems(from,to,status,report_type) .group('i.product_code') .order("sale_items.menu_category_code") - query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id JOIN employees ea ON ea.id = sales.cashier_id") @@ -944,7 +1001,7 @@ def self.get_by_shiftsales(from,to,shift) .joins("JOIN sale_payments as sp on sp.sale_id=sales.sale_id") .where("sales.shift_sale_id=? and sp.payment_method='foc'",shift_sale.id) .first() - + if !foc_data.foc_sales.nil? && foc_data.foc_sales > 0 shift_sale.other_sales -= foc_data.foc_sales foc = foc_data.foc_sales @@ -959,7 +1016,8 @@ def self.get_by_shiftsales(from,to,shift) :credit_sales => shift_sale.credit_sales, :other_sales => shift_sale.other_sales.to_f, :foc_sales => foc, - :grand_total => shift_sale.grand_total + :grand_total => shift_sale.grand_total, + :shift_id => shift_sale.id } end @@ -1001,13 +1059,15 @@ def self.get_item_query(type) elsif type == "promotion" sale_type = "#{check_product} and i.status = 'promotion'" end - query = Sale.select("acc.title as account_name, + query = Sale.select("sales.sale_id,acc.title as account_name, i.item_instance_code as item_code,i.account_id as account_id, " + "SUM(i.qty * i.unit_price) as grand_total, SUM(i.qty) as total_item,i.qty as qty," + "i.status as status_type,i.remark as remark,"+ "i.unit_price,i.price as price,i.product_name as product_name, " + - "i.menu_category_name,i.menu_category_code as menu_category_id ") + "i.menu_category_name,i.menu_category_code as menu_category_id, " + + "date_format(CONVERT_TZ(receipt_date,'+00:00', '+06:30'), '%I %p') + as date_format") query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id") @@ -1015,7 +1075,8 @@ def self.get_item_query(type) query = query.joins(" JOIN accounts acc ON acc.id = i.account_id") query = query.where("#{sale_type}") query = query.group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price") - .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc") + .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.item_instance_code asc, SUM(i.qty) desc, i.unit_price asc") + # query = query.order("i.menu_category_name asc, SUM(i.qty) desc") end def self.get_other_charges() @@ -1037,7 +1098,7 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,accou end query = self.get_item_query(type) - + discount_query = 0 total_card_amount = 0 total_cash_amount = 0 @@ -1098,12 +1159,11 @@ def self.get_by_shift_items(shift_sale_range, shift, from, to, status,type,accou else query = query.where("sales.receipt_date between ? and ? #{account_type} and sale_status='completed'",from,to) - if type.nil? || type == 'all' || type == "other" other_charges = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) end product = product.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) - + discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount) change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed) sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay' or sale_payments.payment_method = 'giftvoucher') then (sale_payments.payment_amount) else 0 end) as card_amount, @@ -1138,17 +1198,17 @@ end #product sale report query def self.get_menu_item_query(order_by) - query = MenuItem.unscoped.select("acc.id as account_id, - acc.title as account_name, + query = MenuItem.unscoped.select("acc.id as account_id, + acc.title as account_name, mii.item_instance_code as item_code, " + "(CASE WHEN si.qty IS NOT NULL THEN SUM(si.qty) ELSE 0 END) as total_item," + "(CASE WHEN si.unit_price != mii.price THEN si.unit_price ELSE mii.price END) as unit_price," + "(CASE WHEN si.qty IS NOT NULL THEN (SUM(si.qty) * si.unit_price) ELSE 0 END) as grand_total," + - "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END) as product_name, + "mii.price as unit_price, (CASE WHEN si.product_name IS NOT NULL THEN si.product_name ELSE CONCAT(menu_items.name,' - ',mii.item_instance_name) END) as product_name, mc.name as" + - " menu_category_name,mc.id as menu_category_id, si.status as status_type, + " menu_category_name,mc.id as menu_category_id, si.status as status_type, si.price as price ") - .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + + .joins(" LEFT JOIN menu_item_instances mii ON menu_items.id = mii.menu_item_id" + " LEFT JOIN menu_categories mc ON mc.id = menu_items.menu_category_id" + " LEFT JOIN accounts acc ON acc.id = menu_items.account_id" + " LEFT JOIN sale_items si ON si.item_instance_code = mii.item_instance_code" + @@ -1194,7 +1254,7 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay query = Sale.select("sales.*,bookings.dining_facility_id as table_id") .where("sale_status= 'completed' and sale_payments.payment_amount != 0 #{payment_type}") .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") - .joins("join bookings on bookings.sale_id = sales.sale_id") + .joins("join bookings on bookings.sale_id = sales.sale_id") .group("sales.sale_id") if shift.present? query = query.where("sales.shift_sale_id in (?)", shift.to_a) @@ -1207,13 +1267,13 @@ def self.get_shift_sales_by_receipt_no_detail(shift_sale_range,shift,from,to,pay end def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter,order_source) - sub_query = "SELECT (CASE WHEN SUM(payment_amount) > 0 + sub_query = "SELECT (CASE WHEN SUM(payment_amount) > 0 THEN DATE_FORMAT(CONVERT_TZ(sale_payments.created_at,'+00:00','+06:30'),'%d %b %y %h:%i%p') ELSE '-' END) FROM `sale_payments` INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id WHERE sale_audits.sale_id = s.sale_id" - sub_query1 = "SELECT (CASE WHEN SUM(payment_amount) > 0 THEN SUM(payment_amount) - + sub_query1 = "SELECT (CASE WHEN SUM(payment_amount) > 0 THEN SUM(payment_amount) - (SUM(payment_amount) - (SELECT SUM(payment_amount) FROM sale_payments WHERE payment_method='creditnote' AND sale_id=s.sale_id)) ELSE 0 END) FROM `sale_payments` INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id @@ -1244,7 +1304,7 @@ def self.get_by_shift_sale_credit_payment(shift_sale_range,shift,from,to,filter, WHERE sale_audits.sale_id = s.sale_id) = 0" end order_source_query = "(select orders.source FROM orders JOIN sale_orders so ON so.order_id=orders.order_id WHERE so.sale_id=s.sale_id GROUP BY so.sale_id)" - + if order_source.blank? source = "" else @@ -1336,7 +1396,7 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id INNER JOIN sales ON sa.sale_id = sales.sale_id WHERE sales.sale_status='completed' " - + if shift.present? shift_ids = shift.map(&:id).join(",") sub_query += " AND sales.shift_sale_id in (#{shift_ids})" @@ -1372,6 +1432,7 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type SUM(case when (sale_payments.payment_method='paypar') then sale_payments.payment_amount else 0 end) as paypar_amount, SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount, SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount, + SUM(case when (sale_payments.payment_method='KBZPay') then sale_payments.payment_amount else 0 end) as kbzpay_amount, SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount, SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount, SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount, @@ -1380,7 +1441,7 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type (CASE WHEN (SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end)) > 0 THEN (SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) - (#{sub_query})) ELSE 0 END) as credit_amount, SUM(case when (sale_payments.payment_method='giftvoucher') then sale_payments.payment_amount else 0 end) as giftvoucher_amount, SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount") - .joins("join sales on sales.sale_id = sale_payments.sale_id") + .joins("join sales on sales.sale_id = sale_payments.sale_id") if shift.present? @@ -1388,7 +1449,7 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") if payment_type.blank? sale_type = sale_payment.where(" s.sale_status = 'completed' and payment_amount != 0 and s.shift_sale_id in (?)",shift.to_a) - .order("payment_method") + .order("payment_method") else sale_type = sale_payment.where(" payment_method= '#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift.to_a) end @@ -1399,20 +1460,20 @@ def self.get_payment_method_by_shift(shift_sale_range,shift,from,to,payment_type # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") if payment_type.blank? sale_type = sale_payment.where(" s.sale_status = 'completed' and payment_amount != 0 and s.shift_sale_id in (?)",shift_sale_range.to_a) - .order("payment_method") + .order("payment_method") else sale_type = sale_payment.where(" payment_method='#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.shift_sale_id in (?)",shift_sale_range.to_a) end - + else all_total = payments_total.where("sales.receipt_date between ? and ? and sales.sale_status= 'completed' and sale_payments.payment_amount != 0", from,to) # .group("DATE_FORMAT((CONVERT_TZ(sales.receipt_date,'+00:00','+06:30')),'%Y-%m-%d')") if payment_type.blank? sale_type = sale_payment.where(" s.sale_status = 'completed' and payment_amount != 0 and s.receipt_date between ? and ? ",from,to) - .order("payment_method") + .order("payment_method") else - sale_type = sale_payment.where(" payment_method='#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) + sale_type = sale_payment.where(" payment_method='#{payment_type}' and payment_amount != 0 and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to) end end @@ -1429,7 +1490,7 @@ def self.get_wastes_and_spoilages(from,to,status) .joins("JOIN sale_items ON sales.sale_id = sale_items.sale_id" ) .where("sales.receipt_date between ? and ? #{type}",from,to) .group("sales.receipt_no,sale_items.menu_category_code,sale_items.item_instance_code") - .order("sales.sale_id,sale_items.menu_category_name,sale_items.product_name") + .order("sales.sale_id,sale_items.qty desc,sale_items.menu_category_name,sale_items.product_name") end # def self.get_separate_tax(from,to,payment_method=nil) @@ -1554,6 +1615,13 @@ end end def self.hourly_sales(today,current_user,from,to,from_time,to_time) + logger.debug 'hourly_sales<<<<<<<<<<<<<<<<<<<<<<<<' + logger.debug today + logger.debug current_user.to_json + logger.debug from + logger.debug to + logger.debug from_time + logger.debug to_time if (!from.nil? && !to.nil?) && (from != "" && to!="") if current_user.nil? query = Sale.hourly_sale_data(today,nil,from,to,from_time,to_time) @@ -1585,12 +1653,12 @@ end def self.employee_sales(today,current_user,from,to,from_time,to_time) #sub query for credit payment - outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END + outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END FROM sale_payments JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sale_payments.outstanding_amount LIKE '%-%' AND sales.sale_status='completed'" - + if (!from.nil? && !to.nil?) && (from != "" && to!="") if !from_time.nil? && !to_time.nil? outstanding_query += " AND DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'" @@ -1756,12 +1824,12 @@ end end def self.credit_payment(today,current_user=nil,from=nil,to=nil,from_time=nil,to_time=nil) - outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END + outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END FROM sale_payments JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sale_payments.outstanding_amount LIKE '%-%' AND sales.sale_status='completed'" - + if (!from.nil? && !to.nil?) && (from != "" && to!="") if !from_time.nil? && !to_time.nil? outstanding_query += " AND DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'" @@ -1963,12 +2031,12 @@ end time_query = " and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'" end - outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END + outstanding_query = "SELECT CASE WHEN SUM(sale_payments.outstanding_amount) < 0 THEN SUM(sale_payments.outstanding_amount) ELSE 0 END FROM sale_payments JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id JOIN sales ON sale_payments.sale_id = sales.sale_id WHERE sale_payments.outstanding_amount LIKE '%-%' AND sales.sale_status='completed'" - + if (!from.nil? && !to.nil?) && (from != "" && to!="") if !from_time.nil? && !to_time.nil? outstanding_query += " AND DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(sales.receipt_date, '+00:00', '+06:30'),'%H:%i') between '#{from_time}' and '#{to_time}'" @@ -2153,7 +2221,7 @@ end if !shift.nil? if !from_time.nil? && !to_time.nil? query = query.where('DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%H:%i") between ? and ? and sales.shift_sale_id=?',from,to,from_time,to_time,shift.id).first() - else + else query = query.where('DATE_FORMAT(CONVERT_TZ(sales.receipt_date,"+00:00","+06:30"),"%Y-%m-%d") between ? and ? and sales.shift_sale_id=?',from,to,shift.id).first() end end @@ -2369,14 +2437,14 @@ end if current_user.nil? if !from_time.nil? && !to_time.nil? query = query.where("DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time) - else + else query = query.where("DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to) end else if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' || current_user.role == 'supervisor' if !from_time.nil? && !to_time.nil? query = query.where("DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ? and DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%H:%i') between ? and ?",from,to,from_time,to_time) - else + else query = query.where("DATE_FORMAT(CONVERT_TZ(sales.receipt_date,'+00:00','+06:30'),'%Y-%m-%d') between ? and ?",from,to) end else @@ -2459,80 +2527,42 @@ end query = Sale.select("cst.res_date,cst.res_time,cst.trace,cst.pan,cst.batch_no,cst.exp_date,cst.app,cst.res_type,cst.ref_no,cst.terminal_id,cst.merchant_id,cst.app_code") .joins("JOIN card_sale_trans as cst on cst.sale_id = sales.sale_id") .where("sales.sale_id=? and status = 'Approved'",sale_id) - + return query end def self.add_to_existing_pending_invoice(dining,sale_id,booking) - + + sale = Sale.find(sale_id) existing_booking = Booking.find_by_sale_id(sale_id) - if dining.to_i > 0 - table = DiningFacility.find(dining) - table.bookings.each do |booking| - # if !booking.checkout_at.nil? - # existing_booking.update_attributes(checkout_at: checkout_at) - # end - if booking.sale_id.nil? - booking.booking_orders.each do |booking_order| - - booking.booking_status = 'moved' - order = Order.find(booking_order.order_id) - order.status = 'billed' - order.order_items.each do |item| - item.order_item_status = 'billed' - end - # create sale item - saleobj = Sale.find(sale_id) - order.order_items.each do |orer_item| - saleobj.add_item (orer_item) - end - # Re-compute for add - saleobj.compute(order.source) - saleobj.save - order.save - booking.save - end - - booking_order = BookingOrder.where('booking_id=?',booking) - booking_order.each do |bo| - bo.booking_id = existing_booking.booking_id - bo.save - end - end - end - else - if booking.sale_id.nil? - booking.booking_orders.each do |booking_order| - - booking.booking_status = 'moved' - order = Order.find(booking_order.order_id) - order.status = 'billed' - order.order_items.each do |item| - item.order_item_status = 'billed' - end - # create sale item - saleobj = Sale.find(sale_id) - order.order_items.each do |orer_item| - saleobj.add_item (orer_item) - end + if booking.sale_id.nil? || booking.booking_id != existing_booking.booking_id + booking.orders.where(status: 'new').update(booking: existing_booking) + booking.update(booking_status: 'moved') + end - # Re-compute for add - saleobj.compute(order.source) - saleobj.save - order.save - booking.save - end - - booking_order = BookingOrder.where('booking_id=?',booking) - booking_order.each do |bo| - bo.booking_id = existing_booking.booking_id - bo.save - end - end + existing_booking.orders.where(status: 'new').each do |order| + order.status = 'billed' + order.order_items.each do |item| + item.order_item_status = 'billed' + sale.add_item(item) end + order.save + sale.compute(order.source) + sale.orders << order + end + end + def self.get_shift_sale_items(sh_id) + query = Sale.select("sales.shift_sale_id as shift_sale_id, i.account_id as account_id, acc.title as account_name, i.item_instance_code as item_code, i.menu_category_name, i.menu_category_code as menu_category_id, i.product_name as product_name, i.unit_price, i.price as price, i.qty as qty, SUM(i.qty) as total_item, SUM(i.qty * i.unit_price) as grand_total, i.status as status_type, i.remark as remark") + .joins("JOIN sale_items i on i.sale_id = sales.sale_id") + .joins("JOIN accounts acc on acc.id = i.account_id") + .where("sales.shift_sale_id=?", sh_id) + .group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price") + .order("acc.title desc, i.account_id desc, i.menu_category_code desc, i.unit_price asc") +end + def self.pending_sale(type) query = Sale.all query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id") @@ -2568,17 +2598,17 @@ end SUM(case when (sale_payments.payment_method='mpu') then sale_payments.payment_amount else 0 end) as mpu_amount, SUM(case when (sale_payments.payment_method='master') then sale_payments.payment_amount else 0 end) as master_amount, SUM(case when (sale_payments.payment_method='visa') then sale_payments.payment_amount else 0 end) as visa_amount, - SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount, - SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount, - SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount, - SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount, - SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount, - SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount, + SUM(case when (sale_payments.payment_method='jcb') then sale_payments.payment_amount else 0 end) as jcb_amount, + SUM(case when (sale_payments.payment_method='unionpay') then sale_payments.payment_amount else 0 end) as unionpay_amount, + SUM(case when (sale_payments.payment_method='alipay') then sale_payments.payment_amount else 0 end) as alipay_amount, + SUM(case when (sale_payments.payment_method='paymal') then sale_payments.payment_amount else 0 end) as paymal_amount, + SUM(case when (sale_payments.payment_method='dinga') then sale_payments.payment_amount else 0 end) as dinga_amount, + SUM(case when (sale_payments.payment_method='JunctionPay') then sale_payments.payment_amount else 0 end) as junctionpay_amount, SUM(case when (sale_payments.payment_method='creditnote') then sale_payments.payment_amount else 0 end) as credit_amount, SUM(case when (sale_payments.payment_method='foc') then sale_payments.payment_amount else 0 end) as foc_amount, SUM(case when (sale_payments.payment_method='giftvoucher') then sale_payments.payment_amount else 0 end) as giftvoucher_amount, SUM(case when (sale_items.status='foc') then sale_items.price else 0 end) as item_foc, - SUM(case when (sale_items.status='Discount') then sale_items.price else 0 end) as item_discount, + SUM(case when (sale_items.status='Discount') then sale_items.price else 0 end) as item_discount, SUM(sale_items.qty) as qty, sales.cashier_name as cashier_name, surveys.child as child, @@ -2588,7 +2618,7 @@ end .joins("join sale_items on sale_items.sale_id = sales.sale_id") .joins("join sale_audits on sale_audits.sale_id = sales.sale_id") .joins("left join surveys on surveys.receipt_no = sales.receipt_no") - + query = query.where("sales.sale_status != 'new' && sale_payments.payment_amount > 0") query = query.where("sales.created_at between ? and ?", '2017-11-01 00:00:00 +0630','2018-11-16 13:59:59 +0630') .group("sales.sale_id") @@ -2710,9 +2740,182 @@ def self.employee_sale(today,shift=nil,from=nil,to=nil,from_time=nil,to_time=nil return query end +# Start hourly sale item report +def self.get_by_hourly_items(shift_sale_range, shift, from, to, status,type,account_type) + # date_type_selection = get_sql_function_for_report_type(report_type) + if account_type.blank? + account_type = '' + else + account_type = " and acc.title = '#{account_type}'" + end + + query = self.get_hourly_item_query(type) + + discount_query = 0 + total_card_amount = 0 + total_cash_amount = 0 + total_credit_amount = 0 + total_foc_amount = 0 + total_grand_total = 0 + + if type.nil? || type == 'all' || type == "other" + other_charges = self.get_other_charges() + end + product = self.get_product_sale() + + if shift.present? + query = query.where("sales.shift_sale_id IN (?) #{account_type} and sale_status='completed'",shift.to_a) + if type.nil? || type == 'all' || type == "other" + other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + end + product = product.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift.to_a) + discount_query = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:total_discount) + change_amount = Sale.where("sales.shift_sale_id in (?) and sale_status= 'completed' ", shift.to_a).sum(:amount_changed) + sale_cash = Sale.select("SUM(case when (sale_payments.payment_method ='mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay' or sale_payments.payment_method = 'giftvoucher') then (sale_payments.payment_amount) else 0 end) as card_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift.to_a) + sale_cash.each do |s_c| + total_cash_amount += s_c.cash_amount.to_f + total_card_amount += s_c.card_amount.to_f + total_credit_amount += s_c.credit_amount.to_f + total_foc_amount += s_c.foc_amount.to_f + end + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + + ### => get all sales range in shift_sales + elsif shift_sale_range.present? + query = query.where("sales.shift_sale_id IN (?) #{account_type} and sale_status='completed'",shift_sale_range.to_a) + if type.nil? || type == 'all' || type == "other" + other_charges = other_charges.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a) + end + product = product.where("sales.shift_sale_id IN (?) and sale_status='completed'",shift_sale_range.to_a) + discount_query = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:total_discount) + change_amount = Sale.where("sales.shift_sale_id IN (?) and sale_status ='completed'", shift_sale_range.to_a).sum(:amount_changed) + sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay' or sale_payments.payment_method = 'giftvoucher') then (sale_payments.payment_amount) else 0 end) as card_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.shift_sale_id in (?) and sale_status = 'completed' and sale_payments.payment_amount != 0 ", shift_sale_range.to_a) + sale_cash.each do |s_c| + total_cash_amount += s_c.cash_amount.to_f + total_card_amount += s_c.card_amount.to_f + total_credit_amount += s_c.credit_amount.to_f + total_foc_amount += s_c.foc_amount.to_f + end + + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + + else + query = query.where("sales.receipt_date between ? and ? #{account_type} and sale_status='completed'",from,to) + if type.nil? || type == 'all' || type == "other" + other_charges = other_charges.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) + end + product = product.where("sales.receipt_date between ? and ? and sale_status='completed'",from,to) + + discount_query = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:total_discount) + change_amount = Sale.where("sales.receipt_date between ? and ? and sale_status ='completed'", from,to).sum(:amount_changed) + sale_cash = Sale.select("SUM(case when (sale_payments.payment_method = 'mpu' or sale_payments.payment_method = 'visa' or sale_payments.payment_method = 'master' or sale_payments.payment_method = 'jcb' or sale_payments.payment_method = 'paypar' or sale_payments.payment_method = 'unionpay' or sale_payments.payment_method = 'alipay' or sale_payments.payment_method = 'paymal' or sale_payments.payment_method = 'dinga' or sale_payments.payment_method = 'JunctionPay' or sale_payments.payment_method = 'giftvoucher') then (sale_payments.payment_amount) else 0 end) as card_amount, + SUM(case when (sale_payments.payment_method='cash') then (sale_payments.payment_amount) else 0 end) as cash_amount, + SUM(case when (sale_payments.payment_method='creditnote') then (sale_payments.payment_amount) else 0 end) as credit_amount, + SUM(case when (sale_payments.payment_method='foc') then (sale_payments.payment_amount) else 0 end) as foc_amount") + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .where("sales.receipt_date between ? and ? and sale_status = 'completed' and sale_payments.payment_amount != 0 ", from,to) + sale_cash.each do |s_c| + total_cash_amount += s_c.cash_amount.to_f + total_card_amount += s_c.card_amount.to_f + total_credit_amount += s_c.credit_amount.to_f + total_foc_amount += s_c.foc_amount.to_f + end + total_grand_total = total_cash_amount.to_f + total_card_amount.to_f + total_credit_amount.to_f + + end + + return query,other_charges, product, discount_query , total_cash_amount , total_card_amount , total_credit_amount , total_foc_amount , total_grand_total , change_amount +end + +def self.get_hourly_item_query(type) + check_product = "i.menu_category_name != 'product'" + if type == "revenue" + sale_type = "i.qty > 0 and status IS NULL" + elsif type == "all" || type.nil? + sale_type = "#{check_product}" + elsif type == "discount" + sale_type = "#{check_product} and i.status = 'Discount'" + elsif type == "foc" + sale_type = "#{check_product} and i.status = 'foc' and i.item_instance_code IS NOT NULL and i.qty > 0" + elsif type == "void" + sale_type = "#{check_product} and i.status = 'void' and i.item_instance_code IS NOT NULL and i.qty > 0" + elsif type == "other" + sale_type = "#{check_product} and i.item_instance_code IS NULL" + elsif type == "promotion" + sale_type = "#{check_product} and i.status = 'promotion'" + end + query = Sale.select("sales.sale_id,acc.title as account_name, + i.item_instance_code as item_code,i.account_id as account_id, " + + "SUM(i.qty * i.unit_price) as grand_total, + SUM(i.qty) as total_item,i.qty as qty," + + "i.status as status_type,i.remark as remark,"+ + "i.unit_price,i.price as price,i.product_name as product_name, " + + "i.menu_category_name,i.menu_category_code as menu_category_id, " + + + "concat(hour(CONVERT_TZ(receipt_date,'+00:00', '+06:30')), ':00 - ', hour(CONVERT_TZ(receipt_date,'+00:00', '+06:30')) + 1, ':00') as date_format," + + "hour(CONVERT_TZ(receipt_date,'+00:00', '+06:30')) as hour") + + query = query.joins("JOIN sale_items i ON i.sale_id = sales.sale_id" + + " JOIN shift_sales sh ON sh.`id` = sales.shift_sale_id") + # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ") + query = query.joins(" JOIN accounts acc ON acc.id = i.account_id") + query = query.where("#{sale_type}") + query = query.group("acc.title,i.account_id,i.menu_category_code,i.item_instance_code,i.product_name,i.unit_price,hour") + .order("hour asc") + # query = query.order("i.menu_category_name asc, SUM(i.qty) desc") +end + +# End hourly sale item report + + +#not to show decimal in grand total +def grand_total_round + print_settings = PrintSetting.get_precision_delimiter() + if !print_settings.nil? + self.grand_total =self.grand_total.round(print_settings.precision.to_i) + end +end private def generate_custom_id - self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") + if self.sale_id.nil? + self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") + end + end + + def update_stock_journal + if self.sale_status == "void" && self.sale_status_before_last_save != "void" + self.sale_items.each do |item| + found, inventory_definition = InventoryDefinition.find_product_in_inventory(item) + if found + stock = StockJournal.where('item_code=?', item.item_instance_code).order("id DESC").first + unless stock.nil? + check_item = StockCheckItem.where('item_code=?', item.item_instance_code).order("id DESC").first + StockJournal.add_to_journal(item.item_instance_code, -item.qty, stock.balance, "void", inventory_definition, item.id, StockJournal::SALES_TRANS) + check_item.different = check_item.different + item.qty + check_item.save + end + end + end + elsif self.sale_status == "waste" || self.sale_status == "spoile" || (self.payment_status == "foc" && self.payment_status_was != "foc") + self.bookings.first.order_items.each do |item| + found, inventory_definition = InventoryDefinition.find_product_in_inventory(item) + if found + if stock_journal = StockJournal.find_by_trans_ref(item.order_items_id) + stock_journal.update(remark: self.sale_status) + end + end + end + end end end diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index 97dbe01c..d96034ad 100755 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -6,6 +6,28 @@ class SaleAudit < ApplicationRecord belongs_to :sale + def self.sync_sale_audit_records(sale_audits) + if !sale_audits.nil? + sale_audits.each do |sa| + sale_audit = SaleAudit.find_by_sale_audit_id(sa['sale_audit_id']) + # unless SaleAudit.exists?(sa['sale_audit_id']) + if sale_audit.nil? + sale_audit = SaleAudit.new + end + sale_audit.sale_audit_id = sa['sale_audit_id'] + sale_audit.sale_id = sa['sale_id'] + sale_audit.action = sa['action'] + sale_audit.action_at = sa['action_at'] + sale_audit.action_by = sa['action_by'] + sale_audit.approved_by = sa['approved_by'] + sale_audit.approved_at = sa['approved_at'] + sale_audit.remark = sa['remark'] + sale_audit.save + end + Rails.logger.debug '....... Sale Audit sync completed .......' + end + end + def self.record_audit_void(sale_id, void_by, approved_by, reason) #sale_audit sale_audit = SaleAudit.new() @@ -154,6 +176,8 @@ class SaleAudit < ApplicationRecord private def generate_custom_id - self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") + if self.sale_audit_id.nil? + self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") + end end end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index 13f295a9..d17edc6e 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -11,19 +11,50 @@ class SaleItem < ApplicationRecord def compute_item end + after_update :update_stock_journal + # Add Sale Items def self.add_sale_items(sale_items) sale_items.each do|saleitemObj| @newsaleitem = SaleItem.new @newsaleitem = saleitemObj.dup - @newsaleitem.save - @newsaleitem.qty = saleitemObj.qty * (-1) + @newsaleitem.qty = saleitemObj.qty * (-1) @newsaleitem.unit_price = saleitemObj.unit_price * (-1) @newsaleitem.taxable_price = (saleitemObj.unit_price * saleitemObj.qty) * (-1) - @newsaleitem.price = (saleitemObj.unit_price * saleitemObj.qty) * (-1) + @newsaleitem.price = (saleitemObj.unit_price * saleitemObj.qty) * (-1) @newsaleitem.product_name = saleitemObj.product_name + ' (FOC)' @newsaleitem.save - end + end + end + + def self.sync_sale_item_records(sale_items) + if !sale_items.nil? + sale_items.each do |si| + sale_item = SaleItem.find_by_sale_item_id(si['sale_item_id']) + # unless SaleItem.exists?(si['sale_item_id']) + if sale_item.nil? + sale_item = SaleItem.new + end + sale_item.sale_item_id = si['sale_item_id'] + sale_item.sale_id = si['sale_id'] + sale_item.menu_category_code = si['menu_category_code'] + sale_item.menu_category_name = si['menu_category_name'] + sale_item.product_code = si['product_code'] + sale_item.product_name = si['product_name'] + sale_item.product_alt_name = si['product_alt_name'] + sale_item.item_instance_code = si['item_instance_code'] + sale_item.account_id = si['account_id'] + sale_item.status = si['status'] + sale_item['remark'] = si['remark'] + sale_item['qty'] = si['qty'] + sale_item['unit_price'] = si['unit_price'] + sale_item['taxable_price'] = si['taxable_price'] + sale_item['price'] = si['price'] + sale_item['is_taxable'] = si['is_taxable'] + sale_item.save + end + Rails.logger.debug '....... Sale Item sync completed ......' + end end def self.update_existing_item(qty, item, sale_id, type, item_price, price) @@ -32,31 +63,33 @@ class SaleItem < ApplicationRecord item.save menu_category = MenuCategory.get_menu_category(item.product_code) #get menu category for menu items - sale_item = SaleItem.new - sale_item.menu_category_code = menu_category.code ? menu_category.code : nil - sale_item.menu_category_name = menu_category.name - sale_item.product_code = item.product_code - sale_item.item_instance_code = item.item_instance_code - sale_item.product_name = item.product_name + " (#{type.upcase})" - sale_item.product_alt_name = item.product_alt_name - sale_item.account_id = item.account_id - sale_item.status = type - sale_item.remark = type - if type == "foc" || type == "promotion" || type == "void" || type == "waste" || type == "spoile" - sale_item.qty = qty * (-1) - else - sale_item.qty = qty + # sale_item = SaleItem.new + # sale_item.menu_category_code = menu_category.code ? menu_category.code : nil + # sale_item.menu_category_name = menu_category.name + # sale_item.product_code = item.product_code + # sale_item.item_instance_code = item.item_instance_code + # sale_item.product_name = item.product_name + " (#{type.upcase})" + # sale_item.product_alt_name = item.product_alt_name + # sale_item.account_id = item.account_id + # sale_item.status = type + # sale_item.remark = type + # if type == "foc" || type == "promotion" || type == "void" || type == "waste" || type == "spoile" + # sale_item.qty = qty * (-1) + # else + # sale_item.qty = qty + # end + + # sale_item.unit_price = item_price # * (-1) + # sale_item.taxable_price = (price) * (-1) + # sale_item.price = (price) * (-1) + + # sale_item.is_taxable = 1 + # sale_item.sale_id = sale_id + # sale_item.save + if type != "foc" + sale = Sale.find(sale_id) + sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) end - - sale_item.unit_price = item_price # * (-1) - sale_item.taxable_price = (price) * (-1) - sale_item.price = (price) * (-1) - - sale_item.is_taxable = 1 - sale_item.sale_id = sale_id - sale_item.save - sale = Sale.find(sale_id) - sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount) end def self.get_order_items_details(sale_id) @@ -86,7 +119,7 @@ class SaleItem < ApplicationRecord # Check for actual sale items sale_items.each do |si| - if si.account_id == a.id + if si.account_id == a.id account_price[:price] = account_price[:price] + si.price end end @@ -158,7 +191,7 @@ class SaleItem < ApplicationRecord total = 0 # Check for actual sale items sale_items.each do |si| - if si.product_code == "Other Charges" && si.item_instance_code == nil + if si.product_code == "Other Charges" && si.item_instance_code == nil total = total + si.price end end @@ -177,13 +210,13 @@ class SaleItem < ApplicationRecord # return price # end - def self.get_all_sale_items(sale_id) + def self.get_all_sale_items(sale_id) sale_items = SaleItem.select("sale_id,product_code,item_instance_code, product_name,product_alt_name,account_id,status,remark, - (CASE WHEN (qty > 0 AND remark IS NULL) OR (qty < 0 AND status='Discount') OR (status='promotion' AND (remark='promotion' OR remark = 'promotion nett price' OR remark= 'promotion discount')) THEN SUM(qty) ELSE qty END) as qty, + SUM(qty) as qty, unit_price, taxable_price, - (CASE WHEN (price > 0 AND remark IS NULL) OR (price < 0 AND status='Discount') OR (status='promotion' AND (remark='promotion' OR remark = 'promotion nett price' OR remark= 'promotion discount')) THEN SUM(price) ELSE price END) as price, + SUM(price) as price, is_taxable") .where("sale_id = ?",sale_id) .order("product_name asc") @@ -193,6 +226,53 @@ class SaleItem < ApplicationRecord private def generate_custom_id - self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") + if self.sale_item_id.nil? + self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") + end end + + def update_stock_journal + is_void = self.status == "void" && self.status_before_last_save != "void" + cancel_void = self.status_before_last_save == "void" && self.status.nil? + is_edit = self.qty >= 0 && self.qty != self.qty_before_last_save + is_foc = self.status == "foc" && self.status_before_last_save != "foc" + cancel_foc = self.status_before_last_save == "foc" + + if is_void or cancel_void or is_edit or is_foc or cancel_foc + found, inventory_definition = InventoryDefinition.find_product_in_inventory(self) + if found + stock = StockJournal.where('item_code=?', self.item_instance_code).order("id DESC").first + unless stock.nil? + check_item = StockCheckItem.where('item_code=?', self.item_instance_code).order("id DESC").first + if is_void or cancel_void or is_edit + if is_void + qty = -self.qty + remark = "void" + elsif cancel_void + qty = self.qty + remark = "cancel void" + elsif is_edit + qty = self.qty - self.qty_before_last_save + remark = "edit" + end + StockJournal.add_to_journal(self.item_instance_code, qty, stock.balance, remark, inventory_definition, self.id, StockJournal::SALES_TRANS) + check_item.different = check_item.different + qty + check_item.save + else is_foc or cancel_foc + qty = StockJournal.where(trans_ref: self.sale_item_id).sum("credit-debit") + if order_item_id = self.sale.bookings.first.order_items.where(item_instance_code: self.item_instance_code, qty: self.qty + qty).select(:order_items_id).first.order_items_id + if stock_journal = StockJournal.find_by_trans_ref(order_item_id) + if is_foc + stock_journal.update(remark: "foc") + elsif cancel_foc + stock_journal.update(remark: "cancel_foc") + end + end + end + end + end + end + end + end + end diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index 631a5e62..bbd68829 100755 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -7,17 +7,36 @@ class SaleOrder < ApplicationRecord belongs_to :sale belongs_to :order - def create_sale_order(sale, order) - sale_order = SaleOrder.new - sale_order.sale_id = sale - sale_order.order_id = order - sale_order.save! + def create_sale_order(sale_id, order_id) + # sale_order = SaleOrder.new + self.sale_id = sale_id + self.order_id = order_id + self.save! + end + + def self.sync_sale_order_records(sale_orders) + if !sale_orders.nil? + sale_orders.each do |so| + sale_order = SaleOrder.find_by_sale_order_id(so['sale_order_id']) + # unless SaleOrder.exists?(so['sale_order_id']) + if sale_order.nil? + sale_order = SaleOrder.new + end + sale_order.sale_order_id = so['sale_order_id'] + sale_order.sale_id = so['sale_id'] + sale_order.order_id = so['order_id'] + sale_order.save + end + Rails.logger.debug '......... Sale Order sync completed ........' + end end private def generate_sale_order_id - self.class.name - saleOrderId = SeedGenerator.generate_id(self.class.name, "SOI") - self.sale_order_id = saleOrderId + # self.class.name + if self.sale_order_id.nil? + self.sale_order_id = SeedGenerator.generate_id(self.class.name, 'SOI') + end + end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 9d418f7b..2e1700f8 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -8,6 +8,59 @@ class SalePayment < ApplicationRecord attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status,:action_by + def self.sync_sale_payment_records(sale_payments) + if !sale_payments.nil? + sale_payments.each do |sp| + payment = SalePayment.find_by_sale_payment_id(sp['sale_payment_id']) + # unless SalePayment.exists?(sp['sale_payment_id']) + if payment.nil? + payment = SalePayment.new + end + payment.sale_payment_id = sp['sale_payment_id'] + payment.sale_id = sp['sale_id'] + payment.payment_method = sp['payment_method'] + payment.payment_amount = sp['payment_amount'] + payment.outstanding_amount = sp['outstanding_amount'] + payment.payment_reference = sp['payment_reference'] + payment.payment_status = sp['payment_status'] + payment.save + end + Rails.logger.debug '....... Sale Payment sync completed ......' + end + end + + def self.get_kbz_pay_amount(sale_id, current_user) + amount = 0 + kbz_pay_method = PaymentMethodSetting.where(:payment_method => KbzPay::KBZ_PAY).last + sale_payment = SalePayment.where('sale_id=? and payment_method=? and payment_status!=?', sale_id, KbzPay::KBZ_PAY, 'dead').last + if !sale_payment.nil? and !kbz_pay_method.nil? + if sale_payment.payment_status == 'pending' + amount = KbzPay.query(sale_payment.id, current_user, kbz_pay_method.gateway_url, kbz_pay_method.auth_token, kbz_pay_method.merchant_account_id, kbz_pay_method.additional_parameters) + elsif sale_payment.payment_status == 'paid' + amount = sale_payment.payment_amount + end + end + + return amount + end + + def process_kbz_payment(sale_id, grand_total, pay_amount, status) + if status == 'pending' + SalePayment.where("sale_id=? and payment_method=? and payment_status=?", sale_id, KbzPay::KBZ_PAY, 'pending').update_all(:payment_status => 'dead') + end + + self.sale_id = sale_id + self.payment_method = KbzPay::KBZ_PAY + self.payment_amount = self.payment_amount.to_i + pay_amount.to_i + if grand_total > 0 + self.outstanding_amount = grand_total.to_i - pay_amount.to_i + else + self.outstanding_amount = self.outstanding_amount.to_i - pay_amount.to_i + end + self.payment_status = status + return self.save + end + def process_payment(invoice, action_by, cash_amount, payment_method,remark=nil,payment_for=false) self.sale = invoice self.received_amount = cash_amount @@ -23,20 +76,19 @@ class SalePayment < ApplicationRecord invoice_sale_payments = invoice.sale_payments amount_due = invoice.grand_total end - + invoice_sale_payments.each do |payment| if (payment.payment_status == "paid" ) amount_due = amount_due - payment.payment_amount end end - if (amount_due >= 0) payment_status = false membership_data = nil #route to payment type case payment_method when "cash" - payment_status = cash_payment(payment_for) + payment_status ,outstanding_amount ,balance_amount = cash_payment(payment_for) when "creditnote" if !self.sale.customer_id.nil? payment_status = creditnote_payment(self.customer_id) @@ -69,6 +121,8 @@ class SalePayment < ApplicationRecord payment_status,membership_data = dinga_payment when "GiftVoucher" payment_status = giftvoucher_payment + when KbzPay::KBZ_PAY + payment_status = kbz_payment else puts "it was something else" end @@ -84,7 +138,7 @@ class SalePayment < ApplicationRecord shift = ShiftSale.current_shift shift_sale_id = shift.id end - + remark = "#{self.sale_payment_id}||#{shift_sale_id} -> #{remark}" sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by.name) @@ -106,7 +160,7 @@ class SalePayment < ApplicationRecord # end end - return true, self.save,membership_data + return true, self.save,membership_data, outstanding_amount ,balance_amount else #record an payment in sale-audit remark = "Payment failed - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]" @@ -123,6 +177,11 @@ class SalePayment < ApplicationRecord end + def kbz_edit_sale_payment(amt, action_by) + self.action_by = action_by + sale_update_payment_status(amt) + end + def self.get_paypar_account(url,token,membership_id,campaign_type_id,merchant_uid,auth_token) # Control for Paypar Cloud begin @@ -178,7 +237,8 @@ class SalePayment < ApplicationRecord def self.redeem(paypar_url,token,membership_id,received_amount,sale_id) # membership_actions_data = MembershipAction.find_by_membership_type("redeem"); membership_actions_data = PaymentMethodSetting.find_by_payment_method("Redeem") - + puts "This is membership_actions_data" + puts membership_actions_data.to_json if !membership_actions_data.nil? url = paypar_url.to_s + membership_actions_data.gateway_url.to_s @@ -310,7 +370,7 @@ class SalePayment < ApplicationRecord if sp.payment_method == "jcb" || sp.payment_method == "mpu" || sp.payment_method == "visa" || sp.payment_method == "master" || sp.payment_method == "unionpay" || sp.payment_method == "alipay" return true; end - end + end end private @@ -320,8 +380,9 @@ class SalePayment < ApplicationRecord if sale_payments_data.nil? status = true end - + payment_status = false + self.payment_method = "cash" self.payment_amount = self.received_amount if !payment_for @@ -330,12 +391,22 @@ class SalePayment < ApplicationRecord credit_sale_payment = SalePayment.get_credit_total_left(self.sale_id)[0] ? SalePayment.get_credit_total_left(self.sale_id)[0].payment_amount.to_f : 0 ###need to calculate creditnote total in here self.outstanding_amount = credit_sale_payment - self.received_amount.to_f end + self.payment_status = "paid" payment_status = self.save! if !payment_for sale_update_payment_status(self.received_amount,status) end - return payment_status + balance_amount =0.0 + outstanding_amount =0.0 + if self.sale.grand_total.to_f > self.received_amount.to_f + balance_amount = self.sale.grand_total.to_f - self.received_amount.to_f + outstanding_amount = 0.0 + else + balance_amount = 0.0 + outstanding_amount = self.received_amount.to_f - self.sale.grand_total.to_f + end + return payment_status , outstanding_amount.to_i, balance_amount.to_i end def foc_payment @@ -343,10 +414,12 @@ class SalePayment < ApplicationRecord # add to sale item with foc sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'") - + sale_items.each do|item| SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price) end + sale = Sale.find(self.sale.sale_id) + sale.compute_by_sale_items(sale.id, sale.sale_items, sale.total_discount,'','','',"foc") self.payment_method = "foc" self.payment_amount = self.received_amount @@ -354,11 +427,11 @@ class SalePayment < ApplicationRecord self.outstanding_amount = 0.00 self.payment_status = "paid" payment_status = self.save! - # sale_update_payment_status(self.received_amount) - sale_update_payment_status(0) + # sale_update_payment_status(self.received_amount) + sale_update_payment_status(0) return payment_status end - + def creditnote_payment(customer_id) payment_status = false @@ -373,7 +446,7 @@ class SalePayment < ApplicationRecord return payment_status end - def external_terminal_card_payment(method, payment_for=false) + def external_terminal_card_payment(method, payment_for=false) payment_status = false self.payment_method = method self.payment_amount = self.received_amount @@ -551,7 +624,18 @@ class SalePayment < ApplicationRecord return payment_status end - def sale_update_payment_status(paid_amount,check_foc = false) + def kbz_payment + payment_status = false + self.payment_amount = self.received_amount + self.payment_reference = self.payment_reference + self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f + self.payment_status = "paid" + payment_status = self.save! + # sale_update_payment_status(self.received_amount) + return payment_status + end + + def sale_update_payment_status(paid_amount,check_foc = false) #update amount_outstanding self.sale.amount_received = self.sale.amount_received.to_f + paid_amount.to_f self.sale.save! @@ -560,6 +644,7 @@ class SalePayment < ApplicationRecord sObj = Sale.find(self.sale_id) is_credit = 0 is_foc = 0 + is_kbz_pay = 0 method_status = false sObj.sale_payments.each do |spay| all_received_amount += spay.payment_amount.to_f @@ -569,11 +654,13 @@ class SalePayment < ApplicationRecord if spay.payment_method == "foc" is_foc = 1 end - if spay.payment_method == "cash" || spay.payment_method == "foc" || spay.payment_method == "creditnote" + if spay.payment_method == KbzPay::KBZ_PAY + is_kbz_pay = 1 + end + if spay.payment_method == "cash" || spay.payment_method == "foc" || spay.payment_method == "creditnote" || spay.payment_method == KbzPay::KBZ_PAY method_status = true end end - if (self.sale.grand_total <= all_received_amount) && method_status if is_credit == 0 self.sale.payment_status = "paid" @@ -586,12 +673,16 @@ class SalePayment < ApplicationRecord else self.sale.payment_status = "foc" end - + + if is_kbz_pay == 1 + self.sale.payment_status = 'paid' + end + self.sale.sale_status = "completed" if MembershipSetting.find_by_rebate(1) && is_foc == 0 && is_credit == 0 response = rebat(sObj) - + #record an payment in sale-audit remark = "#{response} Rebate- for Customer #{self.sale.customer_id} | Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " sale_audit = SaleAudit.record_paymal(sObj.sale_id, remark, 1) @@ -614,7 +705,7 @@ class SalePayment < ApplicationRecord end self.sale.save! - + if check_foc table_update_status(sObj) update_shift @@ -630,13 +721,13 @@ class SalePayment < ApplicationRecord # update for cashier shift def update_shift - + shift = ShiftSale.current_open_shift(self.action_by.id) if shift.nil? shift = ShiftSale.current_open_shift(self.sale.cashier_id) end - + if !shift.nil? shift.update(self.sale) self.sale.shift_sale_id = shift.id @@ -664,7 +755,7 @@ class SalePayment < ApplicationRecord else # extra_changed_amount = self.received_amount.to_f + credit_payment_left shift.cash_sales = shift.cash_sales.to_f + (self.received_amount.to_f + credit_payment_left) - + self.sale.amount_received = self.sale.amount_received.to_f - credit_payment_left self.sale.amount_changed = self.sale.amount_changed.to_f - credit_payment_left self.sale.save! @@ -676,7 +767,7 @@ class SalePayment < ApplicationRecord shift.credit_sales = shift.credit_sales.to_f - self.received_amount.to_f else shift.credit_sales = shift.credit_sales.to_f - (self.received_amount.to_f + credit_payment_left) - end + end shift.save end end @@ -692,7 +783,7 @@ class SalePayment < ApplicationRecord bookings.each do |tablebooking| if tablebooking.booking_status != 'moved' if tablebooking.sale_id - if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' && tablebooking.sale.sale_status != 'spoile' && tablebooking.sale.sale_status != 'waste' + if tablebooking.sale.sale_status != 'completed' && tablebooking.sale.sale_status != 'void' && tablebooking.sale.sale_status != 'spoile' && tablebooking.sale.sale_status != 'waste' status = false sale_count += 1 else @@ -716,7 +807,7 @@ class SalePayment < ApplicationRecord #if ENV["SERVER_MODE"] != 'cloud' # if ENV["SERVER_MODE"] == 'cloud' # from = request.subdomain + "." + request.domain - # else + # else # from = "" # end # ActionCable.server.broadcast "order_channel",table: table,type:type,from:from @@ -745,7 +836,7 @@ class SalePayment < ApplicationRecord end # overall_dis = SaleItem.get_overall_discount(sObj.id) overall_dis = sObj.total_discount - + if credit != 1 membership = MembershipSetting.find_by_membership_type("paypar_url") memberaction = MembershipAction.find_by_membership_type("get_member_campaign") @@ -756,8 +847,8 @@ class SalePayment < ApplicationRecord # Control for Paypar Cloud begin - response = HTTParty.get(url, - :body => { + response = HTTParty.get(url, + :body => { member_group_id:sObj.customer.membership_type, merchant_uid:merchant_uid, campaign_type_id: campaign_type_id, @@ -771,7 +862,7 @@ class SalePayment < ApplicationRecord response = { "status": false , "message": " Connection timeout" } rescue OpenURI::HTTPError response = { "status": false, "message": "Can't connect server"} - + rescue SocketError response = { "status": false, "message": "Can't connect server"} end @@ -791,7 +882,7 @@ class SalePayment < ApplicationRecord if cm[:amount] > 0 data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i} total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i - + type_arr.push(data) end end @@ -803,7 +894,7 @@ class SalePayment < ApplicationRecord Rails.logger.debug type_arr.to_json rebate_arr =[] - + campaign_method.each do |a| data = {:type => a[:type], :amount => a[:amount]} type_arr.each do |si| @@ -815,14 +906,14 @@ class SalePayment < ApplicationRecord actual = a[:amount].to_f - amount.to_f data[:amount] = actual end - + end end rebate_arr.push(data) end Rails.logger.debug "---------------Rebate Response----------------" Rails.logger.debug rebate_arr.to_json - + total_amount = rebate_prices - payparcost - overall_dis Rails.logger.debug total_amount @@ -841,8 +932,8 @@ class SalePayment < ApplicationRecord # Control for Paypar Cloud begin - response = HTTParty.post(url, - :body => { + response = HTTParty.post(url, + :body => { generic_customer_id:generic_customer_id , total_sale_transaction_amount: sObj.grand_total, merchant_uid:merchant_uid, @@ -860,7 +951,7 @@ class SalePayment < ApplicationRecord response = { "status": false , "message": "Connect To" } rescue OpenURI::HTTPError response = { "status": false, "message": "Can't connect server"} - + rescue SocketError response = { "status": false, "message": "Can't connect server"} end @@ -870,7 +961,7 @@ class SalePayment < ApplicationRecord end end else - response = { "status": "no_member", "message": "Not membership"} + response = { "status": "no_member", "message": "Not membership"} end end @@ -889,18 +980,18 @@ class SalePayment < ApplicationRecord order_source_query = "(select orders.source FROM orders JOIN sale_orders so ON so.order_id=orders.order_id WHERE so.sale_id=s.sale_id GROUP BY so.sale_id)" - query = SalePayment.select("s.receipt_no, sale_payments.sale_payment_id, - sale_payments.payment_method, + query = SalePayment.select("s.receipt_no, sale_payments.sale_payment_id, + sale_payments.payment_method, SUM(sale_payments.payment_amount) as payment_amount, s.receipt_date as sale_date, s.sale_id, s.cashier_name as cashier_name, c.name as customer_name") .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id") .joins("INNER JOIN customers c ON c.customer_id = s.customer_id") - + if params[:type].nil? query = query.where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) and s.sale_status = 'completed' and s.payment_status='paid' #{receipt_no} #{customer}") - elsif params[:type] == "cashier" + elsif params[:type] == "cashier" query = query.where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' AND #{order_source_query}='#{params[:type]}' OR #{order_source_query}='emenu' END) and s.sale_status = 'completed' and s.payment_status='paid' #{receipt_no} #{customer}") else query = query.where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' AND #{order_source_query}='#{params[:type]}' END) and s.sale_status = 'completed' and s.payment_status='paid' #{receipt_no} #{customer}") @@ -911,8 +1002,8 @@ class SalePayment < ApplicationRecord end def self.get_credit_amount_due_left(sale_id) - query = SalePayment.select("(SUM(sale_payments.payment_amount) - - (CASE WHEN SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id + query = SalePayment.select("(SUM(sale_payments.payment_amount) - + (CASE WHEN SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id THEN SUM(sale_payments.payment_amount) ELSE 0 END)) as payment_amount") .joins(" LEFT JOIN sale_audits sa on SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id") .where("sale_payments.payment_method = 'creditnote' AND sale_payments.sale_id = '#{sale_id}'") @@ -920,7 +1011,7 @@ class SalePayment < ApplicationRecord end def self.get_credit_total_left(sale_id) - query = SalePayment.select("(SUM(sale_payments.payment_amount) - + query = SalePayment.select("(SUM(sale_payments.payment_amount) - (SELECT (CASE WHEN SUM(sale_payments.payment_amount) > 0 THEN SUM(sale_payments.payment_amount) ELSE 0 END) AS payment_amount FROM sale_payments INNER JOIN sale_audits ON SUBSTRING_INDEX(sale_audits.remark,'||',1)=sale_payments.sale_payment_id @@ -932,7 +1023,7 @@ class SalePayment < ApplicationRecord def self.get_sale_payment_for_credit(sale_data) query = sale_data.sale_payments .joins(" JOIN sale_audits sa on SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id") - .where("sa.action='SALEPAYMENT' AND sa.remark IS NOT NULL + .where("sa.action='SALEPAYMENT' AND sa.remark IS NOT NULL AND DATE_FORMAT(sale_payments.created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(sale_payments.created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ") #AND sale_payments.payment_method!='cash' .group("sale_payments.sale_payment_id") @@ -973,6 +1064,8 @@ class SalePayment < ApplicationRecord private def generate_custom_id - self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") + if self.sale_payment_id.nil? + self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") + end end end diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index 216a0267..06c73253 100755 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -5,6 +5,26 @@ class SaleTax < ApplicationRecord before_create :generate_custom_id belongs_to :sale + def self.sync_sale_tax_records(sale_taxes) + if !sale_taxes.nil? + sale_taxes.each do |t| + tax = SaleTax.find_by_sale_tax_id(t['sale_tax_id']) + # unless SaleTax.exists?(t['sale_tax_id']) + if tax.nil? + tax = SaleTax.new + end + tax.sale_tax_id = t['sale_tax_id'] + tax.sale_id = t['sale_id'] + tax.tax_name = t['tax_name'] + tax.tax_rate = t['tax_rate'] + tax.tax_payable_amount = t['tax_payable_amount'] + tax.inclusive = t['inclusive'] + tax.save + end + Rails.logger.debug '...... Sale Tax sync completed .....' + end + end + def self.get_tax(from,to) query = SaleTax.select("sale_taxes.tax_name,SUM(sale_taxes.tax_payable_amount) as tax_amount") .joins("join sales on sales.sale_id = sale_taxes.sale_id") @@ -14,6 +34,8 @@ class SaleTax < ApplicationRecord private def generate_custom_id - self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") + if self.sale_tax_id.nil? + self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") + end end end diff --git a/app/models/seed_generator.rb b/app/models/seed_generator.rb index 44160834..2a363dd8 100755 --- a/app/models/seed_generator.rb +++ b/app/models/seed_generator.rb @@ -1,15 +1,38 @@ class SeedGenerator < ApplicationRecord # Generate ID for Tables def self.generate_id(model, prefix) - cur_val, next_val = self.update_seed(model) + model_name = self.get_model_name(model) + + if ENV["SERVER_MODE"] == 'cloud' + prefix = "C#{prefix}" + end + + cur_val, next_val = self.update_seed(model_name) if (cur_val == 0) - cur_val, next_val = self.execute_query(model) - end + cur_val, next_val = self.execute_query(model_name) + end padding_len = 15 - prefix.length saleOrderId = prefix +"-"+ cur_val.to_s.to_s.rjust((14-prefix.length)+1,'0') - return saleOrderId + return saleOrderId + end + + def self.sync_seed_generator_records(seed_generators) + if !seed_generators.nil? + seed_generators.each do |sg| + seed = SeedGenerator.find_by_model(sg['model']) + if seed.nil? + seed = SeedGenerator.new + end + seed.model = sg['model'] + seed.increase_by = sg['increase_by'] + seed.current = sg['current'] + seed.next = sg['next'] + seed.save + end + Rails.logger.debug '....... Seed Generator sync completed! .......' + end end # Generate Receipt No for number order (1,2,3) Don't touch @@ -66,6 +89,17 @@ class SeedGenerator < ApplicationRecord # return next_code # end + def self.get_model_name(model) + model_name = "" + if ENV["SERVER_MODE"] == 'cloud' + model_name = "Cloud#{model}" + else + model_name = model + end + + return model_name + end + def self.execute_query(model) current = 0 nex = 0 diff --git a/app/models/shift_sale.rb b/app/models/shift_sale.rb index eb812b7b..2d263c21 100755 --- a/app/models/shift_sale.rb +++ b/app/models/shift_sale.rb @@ -32,6 +32,51 @@ class ShiftSale < ApplicationRecord #end end + def self.sync_shift_sale_records(shift_sales) + if !shift_sales.nil? + shift_sales.each do |ss| + # status = nil + shift_sale = nil + + # if ShiftSale.exists?(ss['id']) + shift_sale = ShiftSale.find_by_id(ss['id']) + # status = 'updated' + if shift_sale.nil? + shift_sale = ShiftSale.new + # status = 'created' + end + + shift_sale.id = ss['id'] + shift_sale.cashier_terminal_id = ss['cashier_terminal_id'] + shift_sale.shift_started_at = ss['shift_started_at'] + shift_sale.shift_closed_at = ss['shift_closed_at'] + shift_sale.employee_id = ss['employee_id'] + shift_sale.opening_balance = ss['opening_balance'] + shift_sale.closing_balance = ss['closing_balance'] + shift_sale.total_revenue = ss['total_revenue'] + shift_sale.total_discounts = ss['total_discounts'] + shift_sale.total_taxes = ss['total_taxes'] + shift_sale.grand_total = ss['grand_total'] + shift_sale.nett_sales = ss['nett_sales'] + shift_sale.cash_sales = ss['cash_sales'] + shift_sale.credit_sales = ss['credit_sales'] + shift_sale.other_sales = ss['other_sales'] + shift_sale.commercial_taxes = ss['commercial_taxes'] + shift_sale.cash_in = ss['cash_in'] + shift_sale.cash_out = ss['cash_out'] + shift_sale.dining_count = ss['dining_count'] + shift_sale.takeaway_count = ss['takeaway_count'] + shift_sale.member_count = ss['member_count'] + shift_sale.total_rounding = ss['total_rounding'] + shift_sale.total_receipt = ss['total_receipt'] + shift_sale.total_void = ss['total_void'] + shift_sale.save + + end + Rails.logger.debug "....... Shift Sale sync completed ......" + end + end + def create(opening_balance,cashier_terminal, current_user) self.cashier_terminal_id = cashier_terminal self.shift_started_at = DateTime.now @@ -112,6 +157,7 @@ class ShiftSale < ApplicationRecord SUM(case when (sale_payments.payment_method='jcb') then (sale_payments.payment_amount) else 0 end) as jcb_amount, SUM(case when (sale_payments.payment_method='unionpay') then (sale_payments.payment_amount) else 0 end) as unionpay_amount, SUM(case when (sale_payments.payment_method='alipay') then (sale_payments.payment_amount) else 0 end) as alipay_amount, + SUM(case when (sale_payments.payment_method='KBZPay') then (sale_payments.payment_amount) else 0 end) as kbzpay_amount, SUM(case when (sale_payments.payment_method='dinga') then (sale_payments.payment_amount) else 0 end) as dinga_amount, SUM(case when (sale_payments.payment_method='giftvoucher') then (sale_payments.payment_amount) else 0 end) as giftvoucher_amount, SUM(case when (sale_payments.payment_method='JunctionPay') then (sale_payments.payment_amount) else 0 end) as junctionpay_amount, @@ -156,7 +202,14 @@ class ShiftSale < ApplicationRecord .joins("JOIN customers as c ON c.customer_id = sales.customer_id") .where('shift_sale_id =? and sales.sale_status = "completed" and c.customer_type = "Takeaway" and c.membership_id is null',shift.id) .first() - end + end + + # def self.get_total_other_charges_for_sale_item_report(from, to) + # query = SaleItem.select("sum(sale_items.qty * sale_items.unit_price) as total_other_charges_amount") + # .joins("JOIN sales as s ON s.sale_id = sale_items.sale_id") + # .joins("JOIN shift_sales ss ON ss.id = s.shift_sale_id") + # .where('s.sale_status = "completed" and sale_items.product_code = "Other Charges" and sale_items.item_instance_code is null and s.receipt_date between ? and ?',from, to) + # end def self.get_total_other_charges(shift) query = SaleItem.select("sum(sale_items.qty * sale_items.unit_price) as total_other_charges_amount") diff --git a/app/models/shop.rb b/app/models/shop.rb index c039ace4..75c30dd7 100755 --- a/app/models/shop.rb +++ b/app/models/shop.rb @@ -1,5 +1,5 @@ class Shop < ApplicationRecord - ShopDetail = Shop.find_by_id(1) + #ShopDetail = Shop.find_by_id(1) # Shop Image Uploader mount_uploader :logo, ShopImageUploader diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb index 05ee98a7..16699803 100755 --- a/app/models/stock_check_item.rb +++ b/app/models/stock_check_item.rb @@ -2,7 +2,14 @@ class StockCheckItem < ApplicationRecord belongs_to :stock_check def create(stock_id, item) - journal_id, balance = StockCheckItem.find_journal(item['sku']) + # check_item = StockCheckItem.find_by_item_code(item['sku']) + check_item = StockCheckItem.where('item_code=?', item_code).order("id DESC").first + if check_item.nil? + balance = 0 + else + balance = check_item.different + end + journal_id = StockCheckItem.find_journal(item['sku']) remark, different = StockCheckItem.stock_different(item['qty'], balance ) self.stock_check_id = stock_id self.item_code = item['sku'] @@ -15,7 +22,7 @@ class StockCheckItem < ApplicationRecord end def self.find_journal(item_code) - journal = StockJournal.where('item_code=?', item_code).order('created_at desc').take + journal = StockJournal.where('item_code=?', item_code).order("id DESC").first if journal return journal.id, journal.balance else @@ -24,13 +31,14 @@ class StockCheckItem < ApplicationRecord end def self.stock_different(stock_check_qty, journal_balance) - if stock_check_qty.to_i == journal_balance.to_i - return 'match', stock_check_qty - elsif stock_check_qty.to_i > journal_balance.to_i - return 'missing order item', stock_check_qty.to_i - journal_balance.to_i - elsif stock_check_qty.to_i < journal_balance.to_i - return 'missing stock', stock_check_qty.to_i - journal_balance.to_i - end + # if stock_check_qty.to_i == journal_balance.to_i + # return 'match', stock_check_qty + # elsif stock_check_qty.to_i > journal_balance.to_i + # return 'missing order item', stock_check_qty.to_i - journal_balance.to_i + # elsif stock_check_qty.to_i < journal_balance.to_i + # return 'missing stock', stock_check_qty.to_i - journal_balance.to_i + # end + return 'add new stock', stock_check_qty.to_i + journal_balance.to_i end def self.get_transaction(from, to, item_code) @@ -58,4 +66,8 @@ class StockCheckItem < ApplicationRecord .order("acc.title desc,mi.menu_category_id desc") return query end + + def self.delete_stock_check_item(item_code) + self.where("item_code=?", item_code).delete_all + end end diff --git a/app/models/stock_journal.rb b/app/models/stock_journal.rb index 9a30d3b0..6e72d94a 100755 --- a/app/models/stock_journal.rb +++ b/app/models/stock_journal.rb @@ -1,22 +1,31 @@ class StockJournal < ApplicationRecord SALES_TRANS = "sale" + ORDER_TRANS = "order" STOCK_CHECK_TRANS = "stock_check" - def self.add_to_journal(item, balance, stock_message, inventory_definition) # item => saleObj | balance => Stock journal - journal = StockJournal.new - journal.credit = balance + def self.add_to_journal(item_instance_code, qty, old_balance, stock_message, inventory_definition, trans_ref, trans_type) # item => saleObj | balance => Stock journal - balance = calculate_balance(balance, item.qty) - - journal.item_code = item.item_instance_code - journal.inventory_definition_id = inventory_definition.id - journal.debit = item.qty - journal.balance = balance - journal.remark = stock_message - journal.trans_ref = item.id - journal.trans_type = StockJournal::SALES_TRANS - journal.save + balance = calculate_balance(old_balance, qty) + + if balance < old_balance + credit = 0 + debit = qty.abs + else + credit = qty.abs + debit = 0 + end + + journal = StockJournal.create( + item_code: item_instance_code, + credit: credit, + debit: debit, + balance: balance, + inventory_definition_id: inventory_definition.id, + remark: stock_message, + trans_ref: trans_ref, + trans_type: trans_type + ) end def self.calculate_balance(balance, qty) @@ -24,13 +33,19 @@ class StockJournal < ApplicationRecord end def self.from_stock_check(item) + stock_journal = StockJournal.where('item_code=?', item.item_code).order("id DESC").first + if stock_journal.nil? + old_blance = 0 + else + old_blance = stock_journal.balance + end definition_id = InventoryDefinition.find_by_item_code(item.item_code) journal = StockJournal.new journal.item_code = item.item_code journal.inventory_definition_id = definition_id.id journal.debit = 0 journal.credit = item.stock_count - journal.balance = item.stock_count + journal.balance = item.stock_count + old_blance.to_i journal.remark = StockJournal::STOCK_CHECK_TRANS journal.trans_ref = item.id journal.trans_type = StockJournal::STOCK_CHECK_TRANS @@ -43,7 +58,7 @@ class StockJournal < ApplicationRecord .joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code") if !from_time.nil? && !to_time.nil? query = query.where("DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'") - else + else query = query.where("DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'") end query = query.group("mii.item_instance_name") @@ -57,4 +72,17 @@ class StockJournal < ApplicationRecord end end + def self.update_stock_journal(item_instance_code,remark) + product = InventoryDefinition.find_by_item_code(item_instance_code) + if !product.nil? + stock = self.where("item_code=?", item_instance_code).order("id DESC").first + stock.remark = remark + stock.save + end + end + + def self.delete_stock_journal(item_code) + self.where("item_code=?", item_code).delete_all + end + end diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 2a42a98d..d4564291 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -2,7 +2,7 @@ class CloseCashierPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width - def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) + def initialize(printer_settings, shift_sale, sale_items, total_other_charges_info, acc_cate_count, menu_cate_count, total_by_acc, shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height self.header_font_size = printer_settings.header_font_size.to_i @@ -55,6 +55,10 @@ class CloseCashierPdf < Prawn::Document stroke_horizontal_rule shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) + + if !sale_items.nil? or !sale_items.blank? + sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges_info) + end end def header (shop_details) @@ -175,6 +179,7 @@ class CloseCashierPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right end + #start other payment details if shift_sale.other_sales > 0 other_payment.each do |other| @@ -239,6 +244,16 @@ class CloseCashierPdf < Prawn::Document end end + if other.kbzpay_amount && other.kbzpay_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "KBZ Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.kbzpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + if other.junctionpay_amount && other.junctionpay_amount.to_f > 0 y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do @@ -394,9 +409,9 @@ class CloseCashierPdf < Prawn::Document text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right end else - @overall = shift_sale.total_discounts + @overall = shift_sale.total_discounts end - + y_position = cursor bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do text "Total Discount :", :size => self.item_font_size, :align => :right @@ -496,6 +511,150 @@ class CloseCashierPdf < Prawn::Document move_down 5 stroke_horizontal_rule move_down 5 + + end + + def sale_items_detail(sale_items, acc_cate_count, menu_cate_count, total_by_acc, total_other_charges) + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Sale Items Summary", :size => self.header_font_size, :align => :center + end + + total_items = 0 + total_amount = 0 + total_qty = 0 + sub_total = 0 + flag = false + + arr = Array.new + + unless sale_items.nil? + sale_items.each do |item| + + if !arr.include?(item['menu_category_id']) + + if flag == true + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + end + + total_qty = 0 + sub_total = 0 + flag = true + + move_down 10 + + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "#{item['menu_category_name']}", :size => self.header_font_size, :align => :left + end + + add_item_line('Items', 'Price', 'Qty', 'Total') + move_down 2 + stroke_horizontal_rule + end + + move_down 3 + + # y_position = cursor + # pad_top(15) { + # bounding_box([0,y_position], :width =>self.item_width) do + # text "#{item['product_name']}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix + # end + # text_box "#{item['unit_price'].to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + # text_box "#{item['total_item'].to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + # text_box "#{item['grand_total'].to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + # } + add_item_line(item['product_name'], item['unit_price'].to_i, item['total_item'].to_i, item['grand_total'].to_i) + + if item['total_item'].to_i > 0 or item['status_type'] == 'foc' or item['status_type'] == 'void' + total_qty += item['total_item'].to_i + total_items += item['total_item'].to_i + end + + sub_total += item['grand_total'].to_i + total_amount += item['grand_total'].to_i + arr.push(item['menu_category_id']) + end + + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + move_down 5 + total_other_amount, total_other_item = other_charges_detail(total_other_charges) + + total_items += total_other_item + total_amount += total_other_amount + move_down 5 + stroke_horizontal_rule + total_details('Total Amount', total_items, total_amount) + end + end + + def other_charges_detail(total_other_charges) + total_charges = 0 + total_charges_items = 0 + + unless total_other_charges.nil? + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Other Charges", :size => self.header_font_size, :align => :left + end + + move_down 5 + add_item_line('Items', 'Price', 'Qty', 'Total') + move_down 2 + stroke_horizontal_rule + + total_other_charges.each do |charges| + move_down 3 + add_item_line(charges['product_name'], charges['unit_price'].to_i, charges['total_item'].to_i, charges['grand_total'].to_i) + + total_charges_items += charges['total_item'].to_i + total_charges += charges['grand_total'].to_i + end + end + move_down 5 + stroke_horizontal_rule + total_details('Total Charges Amount', total_charges_items, total_charges) + + return total_charges, total_charges_items + end + + def add_item_line(product_name, unit_price, total_item, grand_total) + self.item_width = 73 + self.price_width = 60 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + y_position = cursor + pad_top(15) { + bounding_box([0,y_position], :width =>self.item_width) do + text "#{product_name}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix + end + text_box "#{unit_price}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{total_item}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{grand_total}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + end + + def total_details(col_name, total_qty, sub_total) + self.item_width = 73 + self.price_width = 60 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + y_position = cursor + pad_top(15) { + text_box "#{col_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{total_qty.to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{sub_total.to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } end end \ No newline at end of file diff --git a/app/pdf/close_cashier_pdf_v1.rb b/app/pdf/close_cashier_pdf_v1.rb new file mode 100644 index 00000000..687f0aa8 --- /dev/null +++ b/app/pdf/close_cashier_pdf_v1.rb @@ -0,0 +1,505 @@ +class CloseCashierPdf < Prawn::Document + include ActionView::Helpers::NumberHelper + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width + + def initialize(printer_settings, shift_sale, total_by_acc, shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges,total_waste,total_spoile,total_credit_payments) + self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width + self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i + self.margin = 5 + self.price_width = 60 + self.qty_width = 20 + self.total_width = 40 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) + self.item_height = 15 + self.item_description_width = (self.page_width-20) / 2 + self.label_width = 100 + + self.text_width = (self.page_width - 80) - self.price_width / 3 + # @item_width = self.page_width.to_i / 2 + # @qty_width = @item_width.to_i / 3 + # @double = @qty_width * 1.3 + # @half_qty = @qty_width / 2 + #setting page margin and width + super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # db font setup + if printer_settings.font != "" + font_families.update("#{printer_settings.font}" => { + :normal => "public/fonts/#{printer_settings.font}.ttf", + :italic => "public/fonts/#{printer_settings.font}.ttf", + :bold => "public/fonts/#{printer_settings.font}.ttf", + :bold_italic => "public/fonts/#{printer_settings.font}.ttf" + }) + + font "#{printer_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" + + #precision checked + if printer_settings.precision.to_i > 2 + printer_settings.precision = 2 + end + #check delimiter + if printer_settings.delimiter + delimiter = "," + else + delimiter = "" + end + + header( shop_details) + + stroke_horizontal_rule + + shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) + + end + + def header (shop_details) + move_down 7 + text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center + move_down 5 + text "#{shop_details.address}", :size => self.item_font_size,:align => :center + # move_down self.item_height + move_down 5 + text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center + move_down 5 + + stroke_horizontal_rule + end + + def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter,total_waste,total_spoile,total_other_charges,total_credit_payments) + move_down 7 + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Cashier : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ shift_sale.employee.name}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Cashier Station : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ shift_sale.cashier_terminal.name}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Opening Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ shift_sale.shift_started_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Closing Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ shift_sale.shift_closed_at.utc.getlocal.strftime('%d-%m-%Y %I:%M %p') }" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Opening Float : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do + text "Closing Float : ", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do + text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left + # text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}" + end + + + move_down 10 + + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Shift Sale Summary", :size => self.header_font_size, :align => :center + end + move_down 10 + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Received Amount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Cash In:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Cash Out:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + + move_down -5 + stroke_horizontal_rule + move_down 7 + + @total_foc = 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Cash Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Credit Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right + end + + #start other payment details + if shift_sale.other_sales > 0 + other_payment.each do |other| + @total_foc = other.foc_amount.round(2) + if other.mpu_amount && other.mpu_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "MPU Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.visa_amount && other.visa_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "VISA Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.master_amount && other.master_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Master Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.jcb_amount && other.jcb_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "JCB Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.unionpay_amount && other.unionpay_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "UNIONPAY Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.unionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.alipay_amount && other.alipay_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Alipay Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.alipay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.junctionpay_amount && other.junctionpay_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "JunctionPay Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.junctionpay_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.dinga_amount && other.dinga_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Dinga Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.dinga_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.paypar_amount && other.paypar_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Redeem Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.paymal_amount && other.paymal_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Paymal Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.paymal_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + if other.giftvoucher_amount && other.giftvoucher_amount.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "GiftVoucher Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(other.giftvoucher_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + end + else + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Other Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Rounding Adjustments :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right + end + + # end other payment details + move_down -5 + stroke_horizontal_rule + move_down 7 + + #start service charges and commercial tax + sale_taxes.each do |tax| + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Taxes :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right + end + + if total_credit_payments && total_credit_payments.to_f > 0 + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Credit Payment :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(total_credit_payments, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + end + #end for service charges and commercial tax +#COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES + # y_position = cursor + # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + # text "Total Sale :", :size => self.item_font_size, :align => :right + # end + # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + # text "#{shift_sale.total_revenue}", :size => self.item_font_size, :align => :right + # end + + move_down -5 + stroke_horizontal_rule + move_down 7 + #start total amount by Account Like Food / Beverage /.. + total_discount_by_account.each do |amount| + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right + end + end + #end total amount by Account + + if total_member_discount[0].member_discount.present? + @member_discount = total_member_discount[0].member_discount rescue 0.0 + @overall = shift_sale.total_discounts - @member_discount + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Member Discount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + else + @overall = shift_sale.total_discounts + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Discount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total FOC :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Void :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "(#{shift_sale.total_void})", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Waste :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "(#{ number_with_precision(total_waste, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Spoile :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "(#{ number_with_precision(total_spoile, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right + end + + # y_position = cursor + # bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + # text "Grand Total :", :size => self.item_font_size, :align => :right + # end + # bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + # text "#{shift_sale.grand_total}", :size => self.item_font_size, :align => :right + # end + + move_down -5 + stroke_horizontal_rule + move_down 7 + + #start total amount by Account Like Food / Beverage /.. + total_amount_by_account.each do |amount| + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right + end + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Other Amount :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{total_other_charges}", :size => self.item_font_size, :align => :right + end + #end total amount by Account + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Dine-in Count :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.dining_count}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Takeaway Count :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.takeaway_count}", :size => self.item_font_size, :align => :right + end + + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => 20) do + text "Total Receipts :", :size => self.item_font_size, :align => :right + end + bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do + text "#{shift_sale.total_receipt}", :size => self.item_font_size, :align => :right + end + + move_down 5 + stroke_horizontal_rule + move_down 5 + move_down 5 + + end + +end \ No newline at end of file diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index f9367907..978f7137 100755 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -35,7 +35,7 @@ class CrmOrderPdf < Prawn::Document end header( printer_settings.printer_name, printer_settings.name) - stroke_horizontal_rule + stroke_horizontal_rule cashier_info(booking) line_items(order_items) diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb index 48bead98..5d44b393 100644 --- a/app/pdf/move_table_pdf.rb +++ b/app/pdf/move_table_pdf.rb @@ -1,21 +1,22 @@ class MoveTablePdf < Prawn::Document include ActionView::Helpers::NumberHelper - attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height self.header_font_size = printer_settings.header_font_size.to_i self.item_font_size = printer_settings.item_font_size.to_i self.margin = 0 + self.margin_top = 7 self.price_width = 40 # No Need for item self.qty_width = 40 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) - self.item_height = 15 + self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=90 + self.label_width=90 - super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # db font setup if printer_settings.font != "" @@ -85,7 +86,7 @@ class MoveTablePdf < Prawn::Document move_down 5 order_items.each do|odi| - # check for item not to show + # check for item not to show # if odi.price != 0 y_position = cursor @@ -103,15 +104,15 @@ class MoveTablePdf < Prawn::Document bounding_box([0,y_position], :width => self.item_width) do text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left end - + if !(odi.alt_name).empty? move_down 4 # font("public/fonts/NotoSansCJKtc-Regular.ttf") do text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true # end end - - end + + end end end diff --git a/app/pdf/move_table_star_pdf.rb b/app/pdf/move_table_star_pdf.rb new file mode 100644 index 00000000..0467cbab --- /dev/null +++ b/app/pdf/move_table_star_pdf.rb @@ -0,0 +1,117 @@ +class MoveTableStarPdf < Prawn::Document + include ActionView::Helpers::NumberHelper + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) + self.page_width = printer_settings.page_width + self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i + self.margin = 0 + self.price_width = 40 # No Need for item + self.qty_width = 40 + self.total_width = 40 # No Need for item + self.item_width = self.page_width - (self.qty_width - self.margin) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.label_width=90 + + super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # db font setup + if printer_settings.font != "" + font_families.update("#{printer_settings.font}" => { + :normal => "public/fonts/#{printer_settings.font}.ttf", + :italic => "public/fonts/#{printer_settings.font}.ttf", + :bold => "public/fonts/#{printer_settings.font}.ttf", + :bold_italic => "public/fonts/#{printer_settings.font}.ttf" + }) + + font "#{printer_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + + header(printer_settings.name,type) + + call_move_table(to,from,date,type,moved_by) + + move_down 5 + stroke_horizontal_rule + move_down 5 + + add_lining_item(order_items, printer_settings.precision) + + move_down 5 + stroke_horizontal_rule + move_down 5 + + end + + def header (name,type) + text "Move #{type}", :left_margin => -10, :size => self.header_font_size.to_i + 3,:align => :center + # move_down self.item_height + move_down 5 + stroke_horizontal_rule + move_down 5 + end + + def call_move_table (to,from,date,type,moved_by) + move_down 3 + text "Date Time : #{date.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :left_margin => -10, :size => self.header_font_size + text "Change [#{from}] To [#{to}]", :left_margin => -10, :size => self.header_font_size + text "Moved By : #{moved_by}", :left_margin => -10, :size => self.header_font_size + end + + def add_lining_item(order_items, precision) + y_position = cursor + + bounding_box([0,y_position], :width => self.item_width) do + text "Item", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "Qty", :size => self.item_font_size,:align => :left + end + + stroke_horizontal_rule + move_down 5 + + add_item(order_items, precision) + end + + # Add order items under order info + def add_item(order_items, precision) + y_position = cursor + + move_down 5 + + order_items.each do|odi| + # check for item not to show + # if odi.price != 0 + y_position = cursor + + # bounding_box([0,y_position], :width => self.item_width + 60, :height => self.item_height) do + # text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + # end + bounding_box([0,y_position], :width => self.item_width) do + text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left + end + + bounding_box([0,y_position], :width => self.item_width) do + text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + end + + if !(odi.alt_name).empty? + move_down 4 + # font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + # end + end + + end + end + +end diff --git a/app/pdf/order_item_customise_pdf.rb b/app/pdf/order_item_customise_pdf.rb index 727991ef..850a9574 100644 --- a/app/pdf/order_item_customise_pdf.rb +++ b/app/pdf/order_item_customise_pdf.rb @@ -12,9 +12,9 @@ class OrderItemCustomisePdf < Prawn::Document self.qty_width = 40 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) - self.item_height = 15 + self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=90 + self.label_width=90 super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # super(:margin => [10, 5, 30, 5], :page_size => [200,400]) @@ -29,17 +29,17 @@ class OrderItemCustomisePdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" - # font "public/fonts/padauk.ttf" - #font "public/fonts/Chinese.ttf" + # font "public/fonts/padauk.ttf" + #font "public/fonts/Chinese.ttf" if !order_item.dining.nil? text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 else text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 end - + stroke_horizontal_rule move_down 3 @@ -51,31 +51,31 @@ class OrderItemCustomisePdf < Prawn::Document end # Write Order Information to PDF - def order_info(order_no, order_by, order_at) + def order_info(order_no, order_by, order_at) #booking ID booking_id = get_booking_id(order_no) y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Booking: #{booking_id}", :size => self.order_no_font_size,:align => :left + text "Booking: #{booking_id}", :size => self.order_no_font_size,:align => :left end move_down 1 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left + text "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left end move_down 1 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderBy: #{order_by} ", :size => self.order_no_font_size,:align => :left + text "OrderBy: #{order_by} ", :size => self.order_no_font_size,:align => :left end move_down 1 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.order_no_font_size,:align => :left + text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.order_no_font_size,:align => :left end stroke_horizontal_rule @@ -87,7 +87,7 @@ class OrderItemCustomisePdf < Prawn::Document def order_items(order_item, options, alt_name, precision, before_updated_qty) y_position = cursor - #Add Order Item + #Add Order Item add_order_items(order_item, options, alt_name, precision) dash(1, :space => 1, :phase => 1) diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index f3883627..58937093 100755 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -1,21 +1,23 @@ class OrderItemPdf < Prawn::Document include ActionView::Helpers::NumberHelper - attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height self.header_font_size = print_settings.header_font_size.to_i self.item_font_size = print_settings.item_font_size.to_i self.margin = 0 + self.margin_top = 7 self.price_width = 40 # No Need for item self.qty_width = 40 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) - self.item_height = 15 + self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=90 + self.label_width=90 - super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # super(:margin => [10, 5, 30, 5], :page_size => [200,400]) # db font setup @@ -28,17 +30,17 @@ class OrderItemPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" - # font "public/fonts/padauk.ttf" - #font "public/fonts/Chinese.ttf" + # font "public/fonts/padauk.ttf" + #font "public/fonts/Chinese.ttf" if !order_item.dining.nil? text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 else text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 end - + stroke_horizontal_rule move_down 3 @@ -50,31 +52,31 @@ class OrderItemPdf < Prawn::Document end # Write Order Information to PDF - def order_info(order_no, order_by, order_at) + def order_info(order_no, order_by, order_at) #booking ID booking_id = get_booking_id(order_no) y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left + text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left end move_down 2 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderNo: #{order_no}", :size => self.item_font_size,:align => :left + text "OrderNo: #{order_no}", :size => self.item_font_size,:align => :left end move_down 2 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left + text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left end move_down 2 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left + text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left end stroke_horizontal_rule @@ -86,7 +88,7 @@ class OrderItemPdf < Prawn::Document def order_items(order_item, options, alt_name, precision, before_updated_qty) y_position = cursor - #Add Order Item + #Add Order Item add_order_items(order_item, options, alt_name, precision) dash(1, :space => 1, :phase => 1) @@ -154,7 +156,7 @@ class OrderItemPdf < Prawn::Document booking = Order.joins(" JOIN booking_orders bo ON bo.order_id = orders.order_id") .joins(" JOIN bookings b ON b.booking_id=bo.booking_id") .where("orders.order_id='#{order_no}'") - .first() + .first() return booking.booking_id end diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb index 83df19da..33e1e314 100755 --- a/app/pdf/order_item_slim_pdf.rb +++ b/app/pdf/order_item_slim_pdf.rb @@ -1,6 +1,7 @@ class OrderItemSlimPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height diff --git a/app/pdf/order_item_star_pdf.rb b/app/pdf/order_item_star_pdf.rb new file mode 100644 index 00000000..711fb81e --- /dev/null +++ b/app/pdf/order_item_star_pdf.rb @@ -0,0 +1,163 @@ +class OrderItemStarPdf < Prawn::Document + include ActionView::Helpers::NumberHelper + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + + def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty) + self.page_width = print_settings.page_width + self.page_height = print_settings.page_height + self.header_font_size = print_settings.header_font_size.to_i + self.item_font_size = print_settings.item_font_size.to_i + self.margin = 0 + self.margin_top = 7 + self.price_width = 40 # No Need for item + self.qty_width = 38 + self.total_width = 40 # No Need for item + self.item_width = self.page_width - (self.qty_width - self.margin) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.label_width=90 + + super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + # super(:margin => [10, 5, 30, 5], :page_size => [200,400]) + + # db font setup + if print_settings.font != "" + font_families.update("#{print_settings.font}" => { + :normal => "public/fonts/#{print_settings.font}.ttf", + :italic => "public/fonts/#{print_settings.font}.ttf", + :bold => "public/fonts/#{print_settings.font}.ttf", + :bold_italic => "public/fonts/#{print_settings.font}.ttf" + }) + + font "#{print_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" + #font "public/fonts/Chinese.ttf" + if !order_item.dining.nil? + text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 + else + text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 + end + + stroke_horizontal_rule + move_down 3 + + #order_info + order_info(order_item.order_id, order_item.order_by,order_item.order_at) + + # order items + order_items(order_item, options, alt_name, print_settings.precision, before_updated_qty) + end + + # Write Order Information to PDF + def order_info(order_no, order_by, order_at) + #booking ID + booking_id = get_booking_id(order_no) + + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Booking: #{booking_id}", :size => self.item_font_size,:align => :left + end + + move_down 2 + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "OrderNo: #{order_no}", :size => self.item_font_size,:align => :left + end + + move_down 2 + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left + end + + move_down 2 + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left + end + + stroke_horizontal_rule + + move_down 10 + end + + # Write Order items to PDF + def order_items(order_item, options, alt_name, precision, before_updated_qty) + y_position = cursor + + #Add Order Item + add_order_items(order_item, options, alt_name, precision) + + dash(1, :space => 1, :phase => 1) + stroke_horizontal_line 0, (self.page_width - self.margin) + add_updated_qty_text(before_updated_qty, order_item.qty, precision) + move_down 5 + end + + # Add order items under order info + def add_order_items(order_item, options, alt_name, precision) + y_position = cursor + + move_down 5 + + bounding_box([0,y_position], :width => self.item_width) do + text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "[#{number_with_precision(order_item.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left + end + + bounding_box([0,y_position], :width => self.item_width) do + text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left + + end + + if alt_name + if order_item.alt_name + move_down 4 + # font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + # end + end + end + + if !options.empty? + move_down 5 + + # add option + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "#{options}", :size => self.item_font_size,:align => :left + end + end + + move_down 5 + + end + + #add updated qty text + def add_updated_qty_text(before_updated_qty, updated_qty, precision) + if before_updated_qty.to_i > 0 && !before_updated_qty.nil? + move_down 5 + + # add option + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "* Change quantity [#{number_with_precision(before_updated_qty.to_i, :precision => precision.to_i)}] to [#{number_with_precision(updated_qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left + end + end + end + + def get_booking_id(order_no) + booking = Order.joins(" JOIN booking_orders bo ON bo.order_id = orders.order_id") + .joins(" JOIN bookings b ON b.booking_id=bo.booking_id") + .where("orders.order_id='#{order_no}'") + .first() + + return booking.booking_id + end +end diff --git a/app/pdf/order_summary_customise_pdf.rb b/app/pdf/order_summary_customise_pdf.rb index f434ac7d..8ffedca0 100644 --- a/app/pdf/order_summary_customise_pdf.rb +++ b/app/pdf/order_summary_customise_pdf.rb @@ -12,9 +12,9 @@ class OrderSummaryCustomisePdf < Prawn::Document self.qty_width = 40 self.total_width = 40 # No Need for item self.item_width = self.page_width - (self.qty_width - self.margin) - self.item_height = 15 + self.item_height = 15 self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) - self.label_width=90 + self.label_width=90 super(:margin => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) @@ -28,18 +28,18 @@ class OrderSummaryCustomisePdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - + if !order[0].dining.nil? text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 else text "#{ print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20 end - + stroke_horizontal_rule move_down 5 @@ -55,31 +55,31 @@ class OrderSummaryCustomisePdf < Prawn::Document end # Write Order Information to PDF - def order_info(order_no, order_by, order_at) + def order_info(order_no, order_by, order_at) #booking ID booking_id = get_booking_id(order_no) y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Booking: #{booking_id}", :size => self.order_no_font_size,:align => :left - end - - move_down 1 - y_position = cursor - bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left + text "Booking: #{booking_id}", :size => self.order_no_font_size,:align => :left end move_down 1 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderBy: #{order_by} ", :size => self.order_no_font_size,:align => :left + text "OrderNo: #{order_no} ", :size => self.order_no_font_size,:align => :left end move_down 1 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.order_no_font_size,:align => :left + text "OrderBy: #{order_by} ", :size => self.order_no_font_size,:align => :left + end + + move_down 1 + y_position = cursor + bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do + text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.order_no_font_size,:align => :left end stroke_horizontal_rule @@ -93,7 +93,7 @@ class OrderSummaryCustomisePdf < Prawn::Document #Add Order Item add_order_items(order_item, alt_name, precision) - + end # Add order items under order info @@ -103,7 +103,7 @@ class OrderSummaryCustomisePdf < Prawn::Document move_down 5 order_item.each do|odi| - # check for item not to show + # check for item not to show # if odi.price != 0 y_position = cursor @@ -120,7 +120,7 @@ class OrderSummaryCustomisePdf < Prawn::Document text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left end - + if alt_name if !(odi.alt_name).empty? move_down 4 @@ -128,15 +128,15 @@ class OrderSummaryCustomisePdf < Prawn::Document text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true # end end - + end # add option options = odi.options == "[]"? "" : odi.options - + if options != "" move_down 5 - + y_position = cursor bounding_box([0,y_position], :width => self.item_width) do text "#{options}", :size => self.item_font_size,:align => :left @@ -151,7 +151,7 @@ class OrderSummaryCustomisePdf < Prawn::Document stroke_horizontal_line 0, (self.page_width - self.margin) move_down 5 # end - end + end end def get_booking_id(order_no) diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index f093b6bc..fd446131 100755 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -66,7 +66,7 @@ class OrderSummaryPdf < Prawn::Document move_down 5 y_position = cursor bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do - text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left + text "OrderNo: #{order_no}", :size => self.item_font_size,:align => :left end move_down 5 diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 573dd1ee..2a99e9f9 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -1,9 +1,11 @@ +# require 'prawn/qrcode' +require 'prawn/measurement_extensions' class ReceiptBillPdf < Prawn::Document include ActionView::Helpers::NumberHelper attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move - - def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,other_charges_amount,latest_order_no,card_balance_amount) + + def initialize(printer_settings, kbz_pay_status, qr_code, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,other_charges_amount,latest_order_no,card_balance_amount) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height self.header_font_size = printer_settings.header_font_size.to_i @@ -101,7 +103,11 @@ class ReceiptBillPdf < Prawn::Document if shop_details.note && !shop_details.note.nil? shop_note(shop_details) end - + + if kbz_pay_status + kbzpay_qr_generator(printed_status, qr_code) + end + footer(printed_status) end @@ -129,7 +135,7 @@ class ReceiptBillPdf < Prawn::Document text "OrderNo : #{ latest_order_no }", :size => self.header_font_size,:align => :left end move_down line_move - + # move_down 2 y_position = cursor bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do @@ -146,7 +152,7 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left - end + end bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right end @@ -164,7 +170,7 @@ class ReceiptBillPdf < Prawn::Document end # bounding_box([self.item_description_width,y_position], :width =>self.label_width+5) do - # text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } + # text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } # - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" , # :size => self.item_font_size,:align => :right # end @@ -201,7 +207,7 @@ class ReceiptBillPdf < Prawn::Document end def add_line_item_row(sale_items,precision,delimiter) - + if precision.to_i > 0 item_name_width = (self.item_width+self.price_width) item_qty_front_width = (self.item_width+self.price_width) + 5 @@ -218,18 +224,18 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor move_down line_move - sub_total = 0.0 + @sub_total = 0.0 total_qty = 0.0 show_price = Lookup.find_by_lookup_type("show_price") sale_items.each do |item| - # check for item not to show - + # check for item not to show + if item.status != 'Discount' && item.qty > 0 if !show_price.nil? && show_price.value.to_i > 0 && item.price == 0 - total_qty += item.qty + total_qty += item.qty else if item.price != 0 - total_qty += item.qty + total_qty += item.qty end end end @@ -242,13 +248,13 @@ class ReceiptBillPdf < Prawn::Document # 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 + @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 - + if !show_price.nil? && show_price.value.to_i>0 item_row(item,precision,delimiter,product_name,price,qty ,total_price) @@ -257,7 +263,7 @@ class ReceiptBillPdf < Prawn::Document item_row(item,precision,delimiter,product_name,price,qty ,total_price) end end - + end stroke_horizontal_rule @@ -268,7 +274,7 @@ class ReceiptBillPdf < Prawn::Document text "Sub Total", :size => self.item_font_size,:align => :left end text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(@sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix end def item_row(item,precision,delimiter,product_name,price,qty ,total_price) @@ -291,19 +297,19 @@ class ReceiptBillPdf < Prawn::Document bounding_box([0,y_position], :width =>self.item_width) do text "#{product_name}", :size => self.item_font_size,:align => :left end - # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size - text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix - text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size + text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix - if show_alt_name - if !(item.product_alt_name).empty? - move_down 2 - # font("public/fonts/NotoSansCJKtc-Regular.ttf") do - text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true - # end - end + if show_alt_name + if !(item.product_alt_name).empty? + move_down 2 + # font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + # end end + end move_down line_move } @@ -327,22 +333,78 @@ class ReceiptBillPdf < Prawn::Document text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right end + service_tax_desc = "" + service_tax_amount = 0 + service_tax_rate = 0 + com_tax_desc = "" + com_tax_amount = 0 + com_tax_rate = 0 if sale_data.sale_taxes.length > 0 incl_tax = "" if sale_data.tax_type == "inclusive" incl_tax = "Incl." end - sale_data.sale_taxes.each do |st| - move_down line_move - y_position = cursor + find_lookup = Lookup.find_by_lookup_type('show_total_before_tax') + if find_lookup.nil? || find_lookup == nil + lookup = Lookup.new(lookup_type: 'show_total_before_tax', name: 'Show Total Before Tax', value: '0') + lookup.save + end + check_lookup_type = Lookup.find_by_lookup_type('show_total_before_tax') + if check_lookup_type.value == '1' + sale_data.sale_taxes.each do |st| + if (st.tax_name.include? "Service") + service_tax_desc = st.tax_name + service_tax_amount = number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter) + if incl_tax + service_tax_rate = st.tax_rate.to_i + end + end + if (st.tax_name.include? "Commercial") + com_tax_desc = st.tax_name + com_tax_amount = number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter) + if incl_tax + com_tax_rate = st.tax_rate.to_i + end + end + end + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ service_tax_desc } (#{incl_tax} #{ service_tax_rate }%)", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(service_tax_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + move_down line_move + y_position = cursor + stroke_horizontal_rule + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Total Before Tax", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{service_tax_amount.to_i + @sub_total.to_i}" , :size => self.item_font_size,:align => :right + end + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ com_tax_desc } (#{incl_tax} #{ com_tax_rate.to_i }%)", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(com_tax_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + else + sale_data.sale_taxes.each do |st| + move_down line_move + y_position = cursor - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do - text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left - end - bounding_box([self.item_description_width,y_position], :width =>self.label_width) do - text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right - end + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + end end else @@ -367,7 +429,7 @@ class ReceiptBillPdf < Prawn::Document end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{sale_data.rounding_adjustment}", :size => self.item_font_size,:align => :right - end + end end move_down line_move @@ -380,11 +442,11 @@ class ReceiptBillPdf < Prawn::Document text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right end move_down line_move - - sale_payment(sale_data,precision,delimiter) + + sale_payment(sale_data,precision,delimiter) end - def sale_payment(sale_data,precision,delimiter) + def sale_payment(sale_data,precision,delimiter) stroke_horizontal_rule #move_down line_move sql = "SELECT SUM(payment_amount) @@ -408,21 +470,21 @@ class ReceiptBillPdf < Prawn::Document sale_payments.each do |payment| y_position = cursor if payment.payment_method == "paypar" - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Redeem Payment", :size => self.item_font_size,:align => :left - end + end else - bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do text "#{payment.payment_method.capitalize} Payment", :size => self.item_font_size,:align => :left + end end - end - + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end move_down line_move end - if sale_data.amount_received > 0 + if sale_data.amount_received > 0 y_position = cursor move_down line_move bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do @@ -432,12 +494,12 @@ class ReceiptBillPdf < Prawn::Document text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end # move_down line_move - end + end end # show member information def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance) - if rebate_amount != nil + if rebate_amount != nil if rebate_amount["status"] == true stroke_horizontal_rule total = 0 @@ -466,8 +528,8 @@ class ReceiptBillPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end - - end + + end # Total Rebate Amount if birthday if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate" rebate_balance = rebate_balance + res["deposit"] @@ -479,7 +541,7 @@ class ReceiptBillPdf < Prawn::Document bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end - end + end #end Total rebate if birthday end @@ -502,7 +564,7 @@ class ReceiptBillPdf < Prawn::Document text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right end end - + end end @@ -512,7 +574,7 @@ class ReceiptBillPdf < Prawn::Document if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" total_balance = total_balance + res["balance"] - + end end move_down line_move @@ -524,7 +586,7 @@ class ReceiptBillPdf < Prawn::Document text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end end - + end def customer(customer_name) @@ -538,6 +600,7 @@ class ReceiptBillPdf < Prawn::Document text "#{ customer_name }" , :size => self.item_font_size,:align => :right end move_down line_move + stroke_horizontal_rule end @@ -553,7 +616,7 @@ class ReceiptBillPdf < Prawn::Document end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right - end + end move_down line_move end end @@ -570,7 +633,7 @@ class ReceiptBillPdf < Prawn::Document bounding_box([self.label_width,y_position], :width =>self.item_description_width) do text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end - move_down line_move + move_down line_move end end @@ -582,7 +645,7 @@ class ReceiptBillPdf < Prawn::Document bounding_box([self.label_width,y_position], :width =>self.item_description_width) do text "#{number_with_precision(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right end - move_down line_move + move_down line_move end #individual payment per person @@ -622,17 +685,17 @@ class ReceiptBillPdf < Prawn::Document JOIN sale_audits sa ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id where sa.sale_id='#{sale_data.sale_id}')) = 0 - THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id).each do |payment| + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id).each do |payment| if payment.payment_method == "creditnote" y_position = cursor stroke_horizontal_rule - + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do move_down 70 stroke_horizontal_rule end - + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do move_down 73 text "Approved By" , :size => self.item_font_size,:align => :center @@ -649,7 +712,7 @@ class ReceiptBillPdf < Prawn::Document move_down 70 stroke_horizontal_rule end - + if sale_data.payment_status == "foc" bounding_box([self.label_width,y_position], :width =>self.item_description_width) do move_down 73 @@ -660,9 +723,9 @@ class ReceiptBillPdf < Prawn::Document move_down 73 text "Approved By" , :size => self.item_font_size,:align => :center end - end + end end - + end def shop_note(shop) @@ -672,12 +735,26 @@ class ReceiptBillPdf < Prawn::Document move_down line_move y_position = cursor - - text "#{shop.note}", :size => self.item_font_size, :align => :left + + text "#{shop.note}", :size => self.item_font_size, :align => :left move_down line_move end + def kbzpay_qr_generator(status, qr_code) + if status == 'Frt' + move_down line_move + move_down line_move + text "Scan to pay with KBZ Pay", :size => self.header_font_size, :align => :center + move_down line_move + print_qr_code(qr_code, pos: [39, cursor], extent: 161, stroke: false, dot: 1000) + move_down line_move + text "This QR code will be expired after 20 minutes.", :size => self.item_font_size, :align => :center + move_down line_move + move_down line_move + end + end + def footer(printed_status) move_down line_move stroke_horizontal_rule @@ -687,10 +764,10 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0, y_position], :width =>self.label_width) do text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left - end + end bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left - end + end move_down line_move end @@ -728,7 +805,7 @@ class ReceiptBillPdf < Prawn::Document y_position = cursor bounding_box([0, y_position], :width =>self.label_width) do text "Card Balance: ",:style => :bold, :size => header_font_size,:align => :left - end + end bounding_box([self.item_description_width,y_position], :width =>self.label_width) do text "#{card_balance_amount}" , :size => self.item_font_size,:align => :right end @@ -752,4 +829,4 @@ class ReceiptBillPdf < Prawn::Document end return status end -end \ No newline at end of file +end diff --git a/app/pdf/receipt_bill_star_pdf.rb b/app/pdf/receipt_bill_star_pdf.rb new file mode 100644 index 00000000..0b1f8ce2 --- /dev/null +++ b/app/pdf/receipt_bill_star_pdf.rb @@ -0,0 +1,757 @@ +class ReceiptBillStarPdf < Prawn::Document + include ActionView::Helpers::NumberHelper + + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :margin_top, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width, :description_width, :price_num_width, :line_move + + def initialize(printer_settings, status, qr , sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data,other_charges_amount,latest_order_no,card_balance_amount) + self.page_width = printer_settings.page_width + self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i + self.margin = 0 + self.margin_top = 10 + self.price_width = 60 + self.qty_width = 20 + self.total_width = 40 + self.item_width = 73 + self.item_height = 15 + self.item_description_width = (self.page_width-30) / 2 + self.label_width = 90 + + self.description_width = 140 + self.price_num_width = 40 + self.line_move = 2 + # @item_width = self.page_width.to_i / 2 + # @qty_width = @item_width.to_i / 3 + # @double = @qty_width * 1.3 + # @half_qty = @qty_width / 2 + #setting page margin and width + super(:margin => [self.margin_top, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + #precision checked + if printer_settings.precision.to_i > 2 + printer_settings.precision = 2 + end + + # db font setup + if printer_settings.font != "" + font_families.update("#{printer_settings.font}" => { + :normal => "public/fonts/#{printer_settings.font}.ttf", + :italic => "public/fonts/#{printer_settings.font}.ttf", + :bold => "public/fonts/#{printer_settings.font}.ttf", + :bold_italic => "public/fonts/#{printer_settings.font}.ttf" + }) + + font "#{printer_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" + + if printer_settings.delimiter + delimiter = "," + else + delimiter = "" + end + + header(shop_details) + + stroke_horizontal_rule + + cashier_info(sale_data, customer_name, latest_order_no) + line_items(sale_items,printer_settings.precision,delimiter) + all_total(sale_data,printer_settings.precision,delimiter) + + + if member_info != nil + member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance) + end + + customer(customer_name) + + #start card sale trans data + if card_data != nil + card_sale_data(card_data) + end + #end card sale trans data + #start card blanace amount + if !card_balance_amount.nil? + card_balance_data(card_balance_amount) + end + #end card blanace amount + + if discount_price_by_accounts.length > 0 && shop_details.show_account_info + discount_account(discount_price_by_accounts,printer_settings.precision,delimiter) + end + + if shop_details.show_account_info + items_account(item_price_by_accounts,printer_settings.precision,delimiter) + if other_charges_amount + show_other_charges_amount(other_charges_amount,printer_settings.precision,delimiter) + end + end + + #start for individual payment + if !sale_data.equal_persons.nil? + individual_payment(sale_data,sale_data.equal_persons, printer_settings.precision, delimiter) + end + #end for individual payment + + sign(sale_data) + + if shop_details.note && !shop_details.note.nil? + shop_note(shop_details) + end + + footer(printed_status) + end + + def header (shop_details) + text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center + move_down line_move + text "#{shop_details.address}", :size => self.item_font_size,:align => :center + # move_down self.item_height + move_down line_move + text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center + move_down line_move + + stroke_horizontal_rule + end + + def cashier_info(sale_data, customer_name, latest_order_no) + if latest_order_no.nil? + move_down line_move + text "Booking : #{ sale_data.bookings[0].booking_id }", :size => self.header_font_size+2,:align => :left + move_down line_move + end + move_down line_move + if !latest_order_no.nil? + move_down line_move + text "OrderNo : #{ latest_order_no }", :size => self.header_font_size,:align => :left + end + move_down line_move + + # move_down 2 + y_position = cursor + bounding_box([0,y_position], :width =>self.description_width + self.price_num_width, :height => self.item_height) do + text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left + end + + if sale_data.bookings[0].dining_facility_id.to_i > 0 + bounding_box([self.description_width - 2,y_position], :width => self.price_num_width, :height => self.item_height) do + text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right + end + end + + move_down line_move + y_position = cursor + bounding_box([0, y_position], :width =>self.label_width, :height => self.item_height) do + text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left + end + bounding_box([self.label_width - 2,y_position], :width =>self.label_width, :height => self.item_height) do + text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right + end + move_down line_move + + y_position = cursor + if sale_data.bookings[0].dining_facility_id.to_i > 0 + time = sale_data.receipt_date.strftime('%d-%m-%Y') +"("+ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') +"-"+ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p')+")" + else + time = sale_data.receipt_date.strftime('%d-%m-%Y %H:%M %p') + end + + bounding_box([0,y_position], :width =>self.page_width - 10, :height => self.item_height) do + text "Date : #{ time }",:size => self.item_font_size,:align => :left + end + + # bounding_box([self.item_description_width,y_position], :width =>self.label_width+5) do + # text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } + # - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" , + # :size => self.item_font_size,:align => :right + # end + move_down line_move + stroke_horizontal_rule + end + + def line_items(sale_items,precision,delimiter) + if precision.to_i > 0 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = self.qty_width + 1 + item_label_total_front_width = (self.item_width+self.price_width) + 3 + item_label_total_end_width = self.total_width + 3 + else + # self.item_width = self.item_width.to_i + 3 + item_label_qty_front_width = (self.item_width+self.price_width) + 3 + item_label_qty_end_width = self.qty_width + 2 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = self.total_width + 1 + end + move_down line_move + y_position = cursor + move_down line_move + pad_top(15) { + # @item_width.to_i + @half_qty.to_i + text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + # move_down line_move + stroke_horizontal_rule + add_line_item_row(sale_items,precision,delimiter) + end + + def add_line_item_row(sale_items,precision,delimiter) + + if precision.to_i > 0 + item_name_width = (self.item_width+self.price_width) + item_qty_front_width = (self.item_width+self.price_width) + 2 + item_qty_end_width = self.qty_width + 1 + item_total_front_width = item_name_width + 3 + item_total_end_width = self.total_width + 3 + else + item_name_width = (self.item_width+self.price_width) + item_qty_front_width = item_name_width + 3 + item_qty_end_width = self.qty_width + 2 + item_total_front_width = item_name_width + 2 + item_total_end_width = self.total_width + 1 + end + + y_position = cursor + move_down line_move + sub_total = 0.0 + total_qty = 0.0 + show_price = Lookup.find_by_lookup_type("show_price") + sale_items.each do |item| + # check for item not to show + + if item.status != 'Discount' && item.qty > 0 + if !show_price.nil? && show_price.value.to_i > 0 && item.price == 0 + total_qty += item.qty + else + if item.price != 0 + total_qty += item.qty + end + end + end + + 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 + 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 + + + if !show_price.nil? && show_price.value.to_i>0 + item_row(item,precision,delimiter,product_name,price,qty ,total_price) + else + if item.price != 0 + item_row(item,precision,delimiter,product_name,price,qty ,total_price) + end + end + + end + + stroke_horizontal_rule + + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_width + self.price_width, :height => self.item_height) do + text "Sub Total", :size => self.item_font_size,:align => :left + end + text_box "#{number_with_precision(total_qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + end + + def item_row(item,precision,delimiter,product_name,price,qty ,total_price) + if precision.to_i > 0 + item_name_width = (self.item_width+self.price_width) + item_qty_front_width = (self.item_width+self.price_width) + 2 + item_qty_end_width = self.qty_width + 1 + item_total_front_width = item_name_width + 3 + item_total_end_width = self.total_width + 3 + else + item_name_width = (self.item_width+self.price_width) + item_qty_front_width = item_name_width + 3 + item_qty_end_width = self.qty_width + 2 + item_total_front_width = item_name_width + 2 + item_total_end_width = self.total_width + 1 + end + y_position = cursor + + pad_top(15) { + bounding_box([0,y_position], :width =>self.item_width) do + text "#{product_name}", :size => self.item_font_size,:align => :left + end + # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size + text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + + if show_alt_name + if !(item.product_alt_name).empty? + move_down 2 + # font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{item.product_alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + # end + end + end + move_down line_move + } + + + end + + def all_total(sale_data,precision,delimiter) + move_down line_move + item_name_width = self.item_width + y_position = cursor + if sale_data.discount_type == 'member_discount' + dis_type = "Member Discount:" + else + dis_type = "Overall Discount:" + end + + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ dis_type }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right + end + + if sale_data.sale_taxes.length > 0 + incl_tax = "" + if sale_data.tax_type == "inclusive" + incl_tax = "Incl." + end + + sale_data.sale_taxes.each do |st| + move_down line_move + y_position = cursor + + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ st.tax_name } (#{incl_tax} #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + end + else + + end + + # move_down 5 + # y_position = cursor + + # bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + # text "Total Tax", :size => self.item_font_size,:align => :left + # end + # bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + # text "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right + # end + + if sale_data.rounding_adjustment != 0.0 + move_down line_move + y_position = cursor + + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Rounding Adjustment", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{sale_data.rounding_adjustment}", :size => self.item_font_size,:align => :right + end + end + + move_down line_move + y_position = cursor + move_down line_move + bounding_box([0,y_position], :width =>self.item_description_width) do + text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right + end + move_down line_move + + sale_payment(sale_data,precision,delimiter) + end + + def sale_payment(sale_data,precision,delimiter) + stroke_horizontal_rule + #move_down line_move + sql = "SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}'" + sql1 = "SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}'" + + sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method") + .where("(CASE WHEN ((#{sql}) - (#{sql1}) + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id) + .group("payment_method") + + sale_payments.each do |payment| + y_position = cursor + if payment.payment_method == "paypar" + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Redeem Payment", :size => self.item_font_size,:align => :left + end + else + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{payment.payment_method.capitalize} Payment", :size => self.item_font_size,:align => :left + end + end + + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + move_down line_move + end + if sale_data.amount_received > 0 + y_position = cursor + move_down line_move + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Change Amount", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + # move_down line_move + end + end + + # show member information + def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance) + if rebate_amount != nil + if rebate_amount["status"] == true + stroke_horizontal_rule + total = 0 + balance = 0 + rebate_balance =0 + redeem = 0 + redeem_count = 0 + rebate_amount["data"].each do |res| + total = total + res["balance"] + #total redeem amount + if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Redeem" + redeem = redeem + res["withdraw"] + balance = balance + res["balance"] + end + #end Total redem + #total Rebate Earn + if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateAccount" && res["status"]== "Rebate" + + rebate_balance = rebate_balance + res["deposit"] + + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Rebate Earn", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + + end + # Total Rebate Amount if birthday + if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate" + rebate_balance = rebate_balance + res["deposit"] + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + end + #end Total rebate if birthday + end + + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Redeem Amount", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right + end + + if current_balance != nil + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Old Balance", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right + end + end + + end + end + + if member_info["status"] == true && member_info["data"].present? + total_balance = 0 + member_info["data"].each do |res| + + if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount" + total_balance = total_balance + res["balance"] + + end + end + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Total Balance", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + end + + end + + def customer(customer_name) + # move_down line_move + y_position = cursor + #move_down line_move + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "Customer Name", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{ customer_name }" , :size => self.item_font_size,:align => :right + end + move_down line_move + stroke_horizontal_rule + end + + + def discount_account(discount_price_by_accounts,precision,delimiter) + + stroke_horizontal_rule + move_down line_move + y_position = cursor + discount_price_by_accounts.each do |ipa| + y_position = cursor + bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do + text "#{ 'Total ' + ipa[:name] + ' Discounts' }", :size => self.item_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right + end + move_down line_move + end + end + + def items_account(item_price_by_accounts,precision,delimiter) + stroke_horizontal_rule + move_down line_move + y_position = cursor + item_price_by_accounts.each do |ipa| + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width) do + text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + move_down line_move + end + end + + def show_other_charges_amount(other_amount,precision,delimiter) + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width) do + text "Other Charges", :size => self.item_font_size,:align => :left + end + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + text "#{number_with_precision(other_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right + end + move_down line_move + end + + #individual payment per person + def individual_payment(sale_data, survey, precision, delimiter) + # per_person = sale_data.grand_total.to_f / survey.total_customer.to_i + per_person = sale_data.grand_total.to_f / survey.to_i + stroke_horizontal_rule + move_down line_move + y_position = cursor + bounding_box([0,y_position], :width =>self.label_width+50) do + text "Split Bill for #{sale_data.equal_persons} persons", :size => self.item_font_size+1,:align => :left + end + + bounding_box([0,y_position], :width =>self.label_width) do + move_down 15 + text "Amount Due (per person)", :size => self.item_font_size,:align => :left + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 15 + text "#{number_with_precision(per_person, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right + end + end + + def sign(sale_data) + sql = "SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}'" + sql1 = "SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}'" + + SalePayment.where("(CASE WHEN ((#{sql}) - (#{sql1}) + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id).each do |payment| + if payment.payment_method == "creditnote" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 70 + stroke_horizontal_rule + end + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 73 + text "Approved By" , :size => self.item_font_size,:align => :center + end + break; + end + end + if sale_data.payment_status == "foc" || sale_data.payment_status == "waste" || sale_data.payment_status == "spoile" + + y_position = cursor + stroke_horizontal_rule + + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 70 + stroke_horizontal_rule + end + + if sale_data.payment_status == "foc" + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 73 + text "Acknowledged By" , :size => self.item_font_size,:align => :center + end + elsif sale_data.payment_status == "waste" || sale_data.payment_status == "spoile" + bounding_box([self.label_width,y_position], :width =>self.item_description_width) do + move_down 73 + text "Approved By" , :size => self.item_font_size,:align => :center + end + end + end + + end + + def shop_note(shop) + move_down line_move + stroke_horizontal_rule + move_down line_move + + move_down line_move + y_position = cursor + + text "#{shop.note}", :size => self.item_font_size, :align => :left + + move_down line_move + end + + def footer(printed_status) + move_down line_move + stroke_horizontal_rule + move_down line_move + + move_down line_move + y_position = cursor + bounding_box([0, y_position], :width =>self.label_width) do + text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.item_description_width+20, :height => self.item_height) do + text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left + end + + move_down line_move + end + + #start card sale trans data + def card_sale_data(card_data) + if card_data != nil && !card_data.empty? + move_down line_move + stroke_horizontal_rule + move_down line_move + + y_position = cursor + card_data.each do |data| + if data['app'] == 'CUP' + data['app'] = 'UNIONPAY' + elsif data['app'] == 'MASTERCARD' + data['app'] = 'MASTER' + end + text "DATE/TIME: #{data['res_date']} #{data['res_time']} ", :size => @item_font_size, :align => :left + text "BATCH NUM: #{data['batch_no']} TRACE#: #{data['trace']}",:size => @item_font_size, :align => :left + text "RREF NUM: #{data['ref_no']} APPR CODE: #{data['app_code']} ",:size => @item_font_size, :align => :left + text "TID: #{data['tid']} ",:size => @item_font_size, :align => :left + text "#{data['app']} #{data['pan']} ",:size => @item_font_size, :align => :left + end + end + end + + #start card balance data + def card_balance_data(card_balance_amount) + if card_balance_amount > 0 + move_down line_move + stroke_horizontal_rule + move_down line_move + + y_position = cursor + bounding_box([0, y_position], :width =>self.label_width) do + text "Card Balance: ",:style => :bold, :size => header_font_size,:align => :left + end + bounding_box([self.item_description_width,y_position], :width =>self.label_width) do + text "#{card_balance_amount}" , :size => self.item_font_size,:align => :right + end + end + end + + #check ReceiptBillAltName included + def show_alt_name + bill_alt_name = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf + status = false + if !bill_alt_name.empty? + bill_alt_name.each do |alt_name| + if alt_name[0] == 'ReceiptBillAltName' + if alt_name[1] == '1' + status = true + else + status = false + end + end + end + end + return status + end +end diff --git a/app/pdf/sale_items_pdf.rb b/app/pdf/sale_items_pdf.rb new file mode 100644 index 00000000..657b7fe1 --- /dev/null +++ b/app/pdf/sale_items_pdf.rb @@ -0,0 +1,266 @@ +class SaleItemsPdf < Prawn::Document + include ActionView::Helpers::NumberHelper + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width + + def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, total_other_charges) + self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width + self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i + self.margin = 5 + self.price_width = 60 + self.qty_width = 20 + self.total_width = 40 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) + self.item_height = 15 + self.item_description_width = (self.page_width-20) / 2 + @label_name_width = 70 + @label_item_width = self.page_width-@label_name_width + self.label_width = 100 + + self.text_width = (self.page_width - 80) - self.price_width / 3 + # @item_width = self.page_width.to_i / 2 + # @qty_width = @item_width.to_i / 3 + # @double = @qty_width * 1.3 + # @half_qty = @qty_width / 2 + #setting page margin and width + super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # db font setup + if printer_settings.font != "" + font_families.update("#{printer_settings.font}" => { + :normal => "public/fonts/#{printer_settings.font}.ttf", + :italic => "public/fonts/#{printer_settings.font}.ttf", + :bold => "public/fonts/#{printer_settings.font}.ttf", + :bold_italic => "public/fonts/#{printer_settings.font}.ttf" + }) + + font "#{printer_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" + + #precision checked + if printer_settings.precision.to_i > 2 + printer_settings.precision = 2 + end + #check delimiter + if printer_settings.delimiter + delimiter = "," + else + delimiter = "" + end + + header( shop_details) + + stroke_horizontal_rule + + sale_details(period, type, account, from_date, to_date, shift) + + sale_items_detail(sale_items, total_other_charges) + move_down 10 + end + + def header (shop_details) + move_down 7 + text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center + move_down 5 + text "#{shop_details.address}", :size => self.item_font_size,:align => :center + # move_down self.item_height + move_down 5 + text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center + move_down 5 + + stroke_horizontal_rule + end + + def sale_details(period, type, account, from_date, to_date, shift) + move_down 7 + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Period : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{period}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Type : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{type}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Account : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{account}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "From Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{ from_date.utc.getlocal.strftime("%d-%m-%Y")}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "To Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{ to_date.utc.getlocal.strftime("%d-%m-%Y")}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Shift : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width) do + text "#{shift}" , :size => self.item_font_size,:align => :left + end + + move_down 10 + end + + def sale_items_detail(sale_items, total_other_charges) + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Sale Items Summary", :size => self.header_font_size, :align => :center + end + + total_items = 0 + total_amount = 0 + total_qty = 0 + sub_total = 0 + flag = false + + arr = Array.new + + unless sale_items.nil? + sale_items.each do |item| + + if !arr.include?(item['menu_category_id']) + + if flag == true + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + end + + flag = true + + total_qty = 0 + sub_total = 0 + + move_down 10 + + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "#{item['menu_category_name']}", :size => self.header_font_size, :align => :left + end + + add_item_line('Items', 'Price', 'Qty', 'Total') + move_down 2 + stroke_horizontal_rule + end + + + move_down 3 + add_item_line(item['product_name'], item['unit_price'].to_i, item['total_item'].to_i, item['grand_total'].to_i) + + if item['total_item'].to_i > 0 or item['status_type'] == 'foc' or item['status_type'] == 'void' + total_qty += item['total_item'].to_i + total_items += item['total_item'].to_i + end + + sub_total += item['grand_total'].to_i + total_amount += item['grand_total'].to_i + arr.push(item['menu_category_id']) + end + + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + move_down 5 + total_other_amount, total_other_item = other_charges_detail(total_other_charges) + + total_items += total_other_item + total_amount += total_other_amount + move_down 5 + stroke_horizontal_rule + total_details('Total Amount', total_items, total_amount) + end + end + + def total_details(col_name, total_qty, sub_total) + self.item_width = 73 + self.price_width = 60 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + y_position = cursor + pad_top(15) { + text_box "#{col_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{total_qty.to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{sub_total.to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + end + + def other_charges_detail(total_other_charges) + total_charges = 0 + total_charges_items = 0 + + unless total_other_charges.nil? + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Other Charges", :size => self.header_font_size, :align => :left + end + + move_down 5 + add_item_line('Items', 'Price', 'Qty', 'Total') + move_down 2 + stroke_horizontal_rule + + total_other_charges.each do |charges| + move_down 3 + add_item_line(charges['product_name'], charges['unit_price'].to_i, charges['total_item'].to_i, charges['grand_total'].to_i) + + total_charges_items += charges['total_item'].to_i + total_charges += charges['grand_total'].to_i + end + end + + move_down 5 + stroke_horizontal_rule + total_details('Total Charges Amount', total_charges_items, total_charges) + + return total_charges, total_charges_items + end + + def add_item_line(product_name, unit_price, total_item, grand_total) + self.item_width = 73 + self.price_width = 60 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + y_position = cursor + pad_top(15) { + bounding_box([0,y_position], :width =>self.item_width) do + text "#{product_name}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix + end + text_box "#{unit_price}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{total_item}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{grand_total}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + end +end diff --git a/app/pdf/sale_items_star_pdf.rb b/app/pdf/sale_items_star_pdf.rb new file mode 100644 index 00000000..6860b341 --- /dev/null +++ b/app/pdf/sale_items_star_pdf.rb @@ -0,0 +1,250 @@ +class SaleItemsStarPdf < Prawn::Document + include ActionView::Helpers::NumberHelper + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width,:text_width + + def initialize(printer_settings, shop_details, period, type, account, from_date, to_date, shift, sale_items, total_other_charges) + self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width + self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i + self.margin = 5 + self.price_width = 60 + self.qty_width = 20 + self.total_width = 40 + self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) + self.item_height = 15 + self.item_description_width = (self.page_width-20) / 2 + @label_name_width = 50 + @label_item_width = self.page_width-@label_name_width + self.label_width = 100 + + self.text_width = (self.page_width - 80) - self.price_width / 3 + # @item_width = self.page_width.to_i / 2 + # @qty_width = @item_width.to_i / 3 + # @double = @qty_width * 1.3 + # @half_qty = @qty_width / 2 + #setting page margin and width + super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) + + # db font setup + if printer_settings.font != "" + font_families.update("#{printer_settings.font}" => { + :normal => "public/fonts/#{printer_settings.font}.ttf", + :italic => "public/fonts/#{printer_settings.font}.ttf", + :bold => "public/fonts/#{printer_settings.font}.ttf", + :bold_italic => "public/fonts/#{printer_settings.font}.ttf" + }) + + font "#{printer_settings.font}" + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] + end + # font "public/fonts/Zawgyi-One.ttf" + # font "public/fonts/padauk.ttf" + + #precision checked + if printer_settings.precision.to_i > 2 + printer_settings.precision = 2 + end + #check delimiter + if printer_settings.delimiter + delimiter = "," + else + delimiter = "" + end + + header( shop_details) + + stroke_horizontal_rule + + sale_details(period, type, account, from_date, to_date, shift) + + sale_items_detail(sale_items, total_other_charges) + end + + def header (shop_details) + move_down 7 + text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center + move_down 5 + text "#{shop_details.address}", :size => self.item_font_size,:align => :center + # move_down self.item_height + move_down 5 + text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center + move_down 5 + + stroke_horizontal_rule + end + + def sale_details(period, type, account, from_date, to_date, shift) + move_down 7 + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Period : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{period}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Type : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{type}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Account : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{account}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "From Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{ from_date.utc.getlocal.strftime("%d-%m-%Y")}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "To Date : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width, :height => self.item_height) do + text "#{ to_date.utc.getlocal.strftime("%d-%m-%Y")}" , :size => self.item_font_size,:align => :left + end + + y_position = cursor + bounding_box([0,y_position], :width =>@label_name_width, :height => self.item_height) do + text "Shift : ", :size => self.item_font_size,:align => :left + end + bounding_box([@label_name_width,y_position], :width => @label_item_width) do + text "#{shift}" , :size => self.item_font_size,:align => :left + end + + move_down 10 + end + + def sale_items_detail(sale_items, total_other_charges) + self.item_width = 73 + self.price_width = 35 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "Sale Items Summary", :size => self.header_font_size, :align => :center + end + + total_items = 0 + total_amount = 0 + total_qty = 0 + sub_total = 0 + + arr = Array.new + + unless sale_items.nil? + sale_items.each do |item| + + if !arr.include?(item['menu_category_id']) + + if flag == true + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + end + + total_qty = 0 + sub_total = 0 + + move_down 10 + + y_position = cursor + bounding_box([0,y_position], :width =>self.page_width - 10, :height => 20) do + text "#{item['menu_category_name']}", :size => self.header_font_size, :align => :left + end + + # write_stroke_dash + # dash(1, :space => 1, :phase => 1) + # stroke_horizontal_rule + # move_down 2 + y_position = cursor + pad_top(15) { + text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :left, :overflow => :shrink_to_fix + text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + move_down 2 + stroke_horizontal_rule + end + + + move_down 3 + + y_position = cursor + pad_top(15) { + bounding_box([0,y_position], :width =>self.item_width) do + text "#{item['product_name']}", :size => self.item_font_size, :align => :left#, :overflow => :shrink_to_fix + end + text_box "#{item['unit_price'].to_i}", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + text_box "#{item['total_item'].to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{item['grand_total'].to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + + if item['total_item'].to_i > 0 or item['status_type'] == 'foc' or item['status_type'] == 'void' + total_qty += item['total_item'].to_i + total_items += item['total_item'].to_i + end + + sub_total += item['grand_total'].to_i + total_amount += item['grand_total'].to_i + arr.push(item['menu_category_id']) + end + + move_down 5 + stroke_horizontal_rule + total_details('Sub Total', total_qty, sub_total) + move_down 5 + move_down 5 + stroke_horizontal_rule + total_details('Total Amount', total_items, total_amount) + + other_charges = get_other_charges(total_other_charges) + total_details('Total Other Amount', nil, other_charges) + move_down 20 + end + end + + def total_details(col_name, total_qty, sub_total) + self.item_width = 73 + self.price_width = 35 + item_label_qty_front_width = (self.item_width+self.price_width) + 2 + item_label_qty_end_width = 32 + item_label_total_front_width = (self.item_width+self.price_width) + 2 + item_label_total_end_width = 64 + + y_position = cursor + pad_top(15) { + text_box "#{col_name}", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix + text_box "#{total_qty.to_i}", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix + text_box "#{sub_total.to_i}", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix + } + end + + def get_other_charges(total_other_charges) + other_sub_total = 0 + unless total_other_charges.nil? + total_other_charges.each do |charges| + other_sub_total += charges.grand_total + end + end + + return other_sub_total + end + +end diff --git a/app/views/api/payment/mobilepayment/cash.json.jbuilder b/app/views/api/payment/mobilepayment/cash.json.jbuilder new file mode 100644 index 00000000..f0b9060b --- /dev/null +++ b/app/views/api/payment/mobilepayment/cash.json.jbuilder @@ -0,0 +1,10 @@ +# json.set! :status, @out[0] +# json.set! :data, @out[1] +# + +if @cash + json.status true +else + json.status false + json.data @cash +end diff --git a/app/views/api/shifts/create.json.jbuilder b/app/views/api/shifts/create.json.jbuilder index c5b02c92..fd15892a 100644 --- a/app/views/api/shifts/create.json.jbuilder +++ b/app/views/api/shifts/create.json.jbuilder @@ -29,4 +29,4 @@ if @status == true else json.status false json.error_message @error_message -end \ No newline at end of file +end diff --git a/app/views/api/sync/sync_data.json.jbuilder b/app/views/api/sync/sync_data.json.jbuilder new file mode 100644 index 00000000..70973240 --- /dev/null +++ b/app/views/api/sync/sync_data.json.jbuilder @@ -0,0 +1,2 @@ +json.status true +json.message "Sync Record Completed." \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index b949291b..815335f2 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -9,13 +9,30 @@
    --> -
    -
    +
    + <% if flash[:member_notice] %> + + <% elsif flash[:member_error] %> + + <% end %> +
    +
    +
    + +
    <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
    @@ -32,7 +49,22 @@
    <% end %>
    +
    + <%= form_tag crm_customers_path, :method => :get do %> +
    +
    + +
    +
    + + + +
    +
    + <%end %> +
    +
    <%= paginate @crm_customers %> @@ -46,8 +78,8 @@ - + + --> @@ -92,7 +124,14 @@ <% end %> <%= crm_customer.card_no rescue '-' %> + <%= crm_customer.paypar_account_no rescue '-' %> + <% if crm_customer.membership_id.nil? && !crm_customer.membership_type.nil? && !crm_customer.membership_type.blank? && !crm_customer.paypar_account_no.blank? && !crm_customer.paypar_account_no.nil? %> + <%= link_to t("views.btn.sync"), crm_customer_sync_path(crm_customer), :class => "btn btn-md bg-green waves-effect" %> + <% end %> + <% if @customer_update_phone_email_membertype %> + <%= link_to t("views.btn.update"), crm_customer_update_phone_email_member_type_path(crm_customer), :class => "btn btn-md bg-green waves-effect" %> + <% end %> <%= link_to t("views.btn.show"), crm_customer_path(crm_customer), :class => "btn btn-md bg-blue waves-effect" %> @@ -102,7 +141,7 @@ <% end %> - +
    <% if @create_flag %> @@ -120,6 +159,7 @@ diff --git a/app/views/crm/customers/show.html.erb b/app/views/crm/customers/show.html.erb index 572b3937..646cd06a 100644 --- a/app/views/crm/customers/show.html.erb +++ b/app/views/crm/customers/show.html.erb @@ -179,11 +179,14 @@ <%= t("views.right_panel.detail.sales_status") %> <%= t("views.right_panel.detail.receipt_date") %> + + <% add_grand_total =0 %> <% @sales.each do |sale| %> + <%= link_to sale.sale_id, transactions_sale_path(sale) %> <%= sale.receipt_no %> <%= sale.total_discount %> @@ -194,7 +197,15 @@ <%= sale.sale_status %> <%= sale.receipt_date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> + <% add_grand_total += sale.grand_total%> <% end %> + <% if !@sales.empty?%> + + Balance + <%= add_grand_total %> + + <% end %> +
    diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index a65ac631..0f9890d7 100755 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -14,10 +14,10 @@ else delimiter = "" end - %> + %>
    -
    +
    help @@ -30,7 +30,7 @@
    -
    +
    attach_money @@ -44,7 +44,7 @@
    -
    +
    person_add @@ -57,7 +57,7 @@
    -
    +
    credit_card @@ -99,27 +99,27 @@ to_time = '' end %> -
    - +
    +
    -
    - +
    +
    -
    - +
    +
    -
    - +
    +
    -
    +

    @@ -131,26 +131,29 @@
    <% if current_user.role == 'administrator' || current_user.role == 'manager' || current_user.role == 'account' %>
    -
    -
    -
    -
    -

    dashboard<%= (t :top) + " " + (t :products) %>

    - - <%= pie_chart @top_products %> + <% isMobile = request.user_agent %> + <% if !isMobile.include? "Mobile" %> +
    +
    +
    +
    +

    dashboard<%= (t :top) + " " + (t :products) %>

    + + <%= pie_chart @top_products %> +
    +
    +
    +
    +
    +
    +

    dashboard<%= (t :bottom) + " " + (t :products) %>

    + + <%= pie_chart @bottom_products %> +
    -
    -
    -
    -

    dashboard<%= (t :bottom) + " " + (t :products) %>

    - - <%= pie_chart @bottom_products %> -
    -
    -
    -
    + <% end %> + <%= pie_chart @top_products %> +
    +
    +
    +
    +
    +
    +

    dashboard<%= (t :bottom) + " " + (t :products) %>

    + + <%= pie_chart @bottom_products %> +
    +
    +
    +
    + <% end %>
    \ No newline at end of file + diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index a8a6d85c..acb35329 100755 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -154,7 +154,7 @@ $(".collapse.in").each(function () { $(this).siblings(".panel-heading").find(".glyphicon").addClass("glyphicon-minus").removeClass("glyphicon-plus"); }); - + // Toggle plus minus icon on show hide of collapse element $(".collapse").on('show.bs.collapse', function () { $(this).parent().find(".glyphicon").removeClass("glyphicon-plus").addClass("glyphicon-minus"); @@ -164,11 +164,3 @@ }); - - - - - - - - diff --git a/app/views/induties/assign_in_duties/_form.html.erb b/app/views/induties/assign_in_duties/_form.html.erb new file mode 100644 index 00000000..513d93a4 --- /dev/null +++ b/app/views/induties/assign_in_duties/_form.html.erb @@ -0,0 +1,10 @@ +<%= simple_form_for(@induties_assign_in_duty) do |f| %> + <%= f.error_notification %> + +
    +
    + +
    + <%= f.button :submit %> +
    +<% end %> diff --git a/app/views/induties/assign_in_duties/_induties_assign_in_duty.json.jbuilder b/app/views/induties/assign_in_duties/_induties_assign_in_duty.json.jbuilder new file mode 100644 index 00000000..4ad02170 --- /dev/null +++ b/app/views/induties/assign_in_duties/_induties_assign_in_duty.json.jbuilder @@ -0,0 +1,2 @@ +json.extract! induties_assign_in_duty, :id, :created_at, :updated_at +json.url induties_assign_in_duty_url(induties_assign_in_duty, format: :json) diff --git a/app/views/induties/assign_in_duties/edit.html.erb b/app/views/induties/assign_in_duties/edit.html.erb new file mode 100644 index 00000000..63e24a52 --- /dev/null +++ b/app/views/induties/assign_in_duties/edit.html.erb @@ -0,0 +1,6 @@ +

    Editing Induties Assign In Duty

    + +<%= render 'form', induties_assign_in_duty: @induties_assign_in_duty %> + +<%= link_to 'Show', @induties_assign_in_duty %> | +<%= link_to 'Back', induties_assign_in_duties_path %> diff --git a/app/views/induties/assign_in_duties/index.html.erb b/app/views/induties/assign_in_duties/index.html.erb new file mode 100644 index 00000000..fc30fed5 --- /dev/null +++ b/app/views/induties/assign_in_duties/index.html.erb @@ -0,0 +1,345 @@ + +
    +
    +
    +
    + <% @commissioners.each do |com| %> +
    +
    );background-repeat: no-repeat; background-size: cover;"> +
    +
    <%=com["name"] %>
    + <% if com["check_in_count"] >0%> +
    A :<%=com["check_in_count"] %>
    + <% end %> + +
    +
    + +
    +
    +
    + <% end %> +
    +
    +
    + add +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + + +
    + + + + + + + + + + +
    DiningCheck In AtAction
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + +
    +
    +
    +
    + <%= simple_form_for 'zone', :method => :get do |f| %> + <%= f.collection_select :dinning_id, Room.all, :id, :name, {prompt: 'Select Room'},:class=>'form-control',:required => true %> + <%end %> +
    +
    +
    +
    + <%= simple_form_for 'zone_t', :method => :get do |f| %> + <%= f.collection_select :dinning_id, Table.all, :id, :name, {prompt: 'Select Table'},:class=>'form-control',:required => true %> + <%end %> +
    +
    +
    +
    +
    +
    + <%= simple_form_for 'save_induties', :url => induties_induties_create_path, :method => :post do |f| %> + <%= f.check_box :by_name,:class=>'form-control'%> + + <% end %> +
    +
    + +
    +
    + +
    + + diff --git a/app/views/induties/assign_in_duties/index.json.jbuilder b/app/views/induties/assign_in_duties/index.json.jbuilder new file mode 100644 index 00000000..057eb2db --- /dev/null +++ b/app/views/induties/assign_in_duties/index.json.jbuilder @@ -0,0 +1 @@ +json.array! @induties_assign_in_duties, partial: 'induties_assign_in_duties/induties_assign_in_duty', as: :induties_assign_in_duty diff --git a/app/views/induties/assign_in_duties/new.html.erb b/app/views/induties/assign_in_duties/new.html.erb new file mode 100644 index 00000000..512f3038 --- /dev/null +++ b/app/views/induties/assign_in_duties/new.html.erb @@ -0,0 +1,5 @@ +

    New Induties Assign In Duty

    + +<%= render 'form', induties_assign_in_duty: @induties_assign_in_duty %> + +<%= link_to 'Back', induties_assign_in_duties_path %> diff --git a/app/views/induties/assign_in_duties/show.html.erb b/app/views/induties/assign_in_duties/show.html.erb new file mode 100644 index 00000000..82a22e22 --- /dev/null +++ b/app/views/induties/assign_in_duties/show.html.erb @@ -0,0 +1,4 @@ +

    <%= notice %>

    + +<%= link_to 'Edit', edit_induties_assign_in_duty_path(@induties_assign_in_duty) %> | +<%= link_to 'Back', induties_assign_in_duties_path %> diff --git a/app/views/induties/assign_in_duties/show.json.jbuilder b/app/views/induties/assign_in_duties/show.json.jbuilder new file mode 100644 index 00000000..0367be23 --- /dev/null +++ b/app/views/induties/assign_in_duties/show.json.jbuilder @@ -0,0 +1 @@ +json.partial! "induties_assign_in_duties/induties_assign_in_duty", induties_assign_in_duty: @induties_assign_in_duty diff --git a/app/views/inventory/inventory/_inventory_list.html.erb b/app/views/inventory/inventory/_inventory_list.html.erb index 0f4813f2..061ae65f 100755 --- a/app/views/inventory/inventory/_inventory_list.html.erb +++ b/app/views/inventory/inventory/_inventory_list.html.erb @@ -1,30 +1,31 @@ - + + - <% cate_arr = Array.new %> + <% cate_arr = Array.new %> <% - count = 0 - @inventory_definitions.each do |item| + count = 0 + @inventory_definitions.each do |item| count += 1 - %> + %> - <% if !cate_arr.include?(item.menu_category_id) %> - - <% cate_arr.push(item.menu_category_id) %> - <% else %> - - <% end %> + + + + + + @@ -35,9 +36,30 @@ <%= item.balance rescue 0 %> <% end %> + <% if !item.balance.nil? %> + <% if item.balance >= 0 %> + + <% else %> + + <% end %> + <% else %> + + <% end %> + + + + + +
    + +
    + <% end %> + +
    + -
    -
    - <%= render 'inventory_list' %> +
    + + +
    +
    +
    + <%= render 'inventory_list' %> +
    diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index 03a63033..66497616 100644 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -5,7 +5,7 @@
    -
    + @@ -118,7 +119,7 @@ - +
    @@ -134,7 +135,7 @@
    - + @@ -148,7 +149,7 @@ - +
    @@ -17,20 +24,20 @@
    <%= t("views.right_panel.header.menu_category") %> <%= t("views.right_panel.detail.product") %> <%= t("views.right_panel.detail.min_order") %> <%= t("views.right_panel.detail.max_stock") %> <%= t("views.right_panel.detail.balance") %><%= t("views.right_panel.detail.status") %> <%= t("views.right_panel.detail.action") %>
    <%= item.menu_category_name %>  <%= item.item_name rescue '-' %> - <%= item.instance_name%> <%= item.min_order_level %> <%= item.max_stock_level %> +
    OK
    +     		+
    OUT OF STOCK
    +
    OK
    		 + +
    Items Min Qty Max Qty
    <%= form_tag transactions_bookings_path, :method => :get do %>
    -
    +
    -
    - +
    +
    -
    - +
    +
    - -
    + +

    @@ -96,7 +103,3 @@ }); - - - - diff --git a/app/views/transactions/bookings/show.html.erb b/app/views/transactions/bookings/show.html.erb index 4aae7c79..2ac8532f 100755 --- a/app/views/transactions/bookings/show.html.erb +++ b/app/views/transactions/bookings/show.html.erb @@ -23,7 +23,7 @@ <%= t :sale_details %> - +
    @@ -78,7 +78,7 @@
    - +
    @@ -167,7 +167,7 @@ if(order_id!=undefined && order_id!=null && order_id!=""){ if($('#request_bill').is(":visible")) { $('#request_bill').prop("disabled",true); - } + } $.ajax({ type: "GET", url: ajax_url, @@ -176,11 +176,11 @@ $('#request_bill').prop("disabled",false); swal("Information!", result.error_message); } - else { + else { location.reload(); } } - }); + }); }else{ swal("Opps","There is no orders!","warning"); } @@ -198,10 +198,10 @@ $('#change_booking_status').prop("disabled",false); swal("Opps",result.error_message,"warning"); } - else { + else { swal({ - title: "Information", - text: result.message, + title: "Information", + text: result.message, type: "success", html: true, closeOnConfirm: false, @@ -213,8 +213,6 @@ }); } } - }); + }); }); - - diff --git a/app/views/transactions/card_sale_trans/index.html.erb b/app/views/transactions/card_sale_trans/index.html.erb index d35ef116..b9c929e8 100644 --- a/app/views/transactions/card_sale_trans/index.html.erb +++ b/app/views/transactions/card_sale_trans/index.html.erb @@ -7,6 +7,13 @@ +
    @@ -17,40 +24,40 @@
    - + - +
    <%= form_tag transactions_card_sale_trans_path, :method => :get do %>
    -
    +
    <% if defined? @payment_method %> -
    +
    - <%= select_tag "payment_type", options_for_select(@payment_method, :selected => params[:payment_type]), :class => "form-control" %> + <%= select_tag "payment_type", options_for_select(@payment_method, :selected => params[:payment_type]), :class => "form-control" %>
    <% end %> <% if not defined? status %> - -
    + +
    - + -
    +
    <% end %> -
    - +
    +
    -
    - +
    +
    - -
    + +

    @@ -58,12 +65,12 @@ <% end %>
    - +
    @@ -102,7 +109,7 @@ UnionPay <% else %> <%= cardSale.app %> - <% end %> + <% end %> <%= cardSale.sale.customer.name rescue '-' %> <%= cardSale.sale.cashier_name rescue '-' %> @@ -111,18 +118,18 @@ TID : <%= cardSale.terminal_id %>
    <% end %> - <% if cardSale.merchant_id != '' %> + <% if cardSale.merchant_id != '' %> MID : <%= cardSale.merchant_id %>
    <% end %> - <% if cardSale.batch_no != '' %> + <% if cardSale.batch_no != '' %> Batch : <%= cardSale.batch_no %>
    <% end %> - <% if cardSale.trace != '' %> + <% if cardSale.trace != '' %> Trace : <%= cardSale.trace %> - <% end %> - + <% end %> + <%= cardSale.status %> <% end %> @@ -150,24 +157,24 @@ $('#status_type').val("<%= params[:status_type] %>"); $('#sale_id').val("<%= params[:sale_id] %>"); $('#sel_period').val("<%= params[:period] %>"); - + var check_arr = []; search_by_period(); $('#sel_period').change(function(){ - + search_by_period(); - + }); - + function search_by_period(){ var period = $('#sel_period').val(); var period_type = 0; var from = ""; var to = ""; - show_shift_name(period,period_type,from,to,'shift_item'); - } - + show_shift_name(period,period_type,from,to,'shift_item'); + } + // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ new_date = new Date(date) ; @@ -182,32 +189,32 @@ to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); $('#to').val(to); search_by_date(); - }); - + }); + function search_by_date(){ from = $("#from").val(); - to = $("#to").val(); + to = $("#to").val(); var period = 0; - var period_type = 1; + var period_type = 1; if(to != '' && from != ''){ shift_name = from + ',' + to; check_arr.push(to); - + console.log(check_arr.length) if(check_arr.length == 1){ - show_shift_name(period,period_type,from,to,'shift_item'); + show_shift_name(period,period_type,from,to,'shift_item'); } if(check_arr.length == 3){ check_arr = []; } } - + } - + function show_shift_name(period,period_type,from,to,shift_item){ var shift = $('#shift_name'); if (from == '' && to == '') { @@ -215,18 +222,18 @@ to = $("#to").val(); } shift.empty(); - + var str = ''; - var param_shift = ''; + var param_shift = ''; var param_shift = '<%= params[:shift_name] rescue '-'%>'; url = '<%= reports_get_shift_by_date_path %>'; - + $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){ str = ''; - $(data.message).each(function(index){ - + $(data.message).each(function(index){ + var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date; var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date; var shift_id = data.message[index].shift_id ; @@ -235,18 +242,18 @@ selected = 'selected = "selected"'; } else{ - selected = ''; - } + selected = ''; + } }else{ - selected = ''; - } + selected = ''; + } str += ''; - + // console.log(sh_date) - }) + }) shift.append(str); }); } }); - \ No newline at end of file + diff --git a/app/views/transactions/card_settle_trans/index.html.erb b/app/views/transactions/card_settle_trans/index.html.erb index 7cbc3573..d6597d08 100644 --- a/app/views/transactions/card_settle_trans/index.html.erb +++ b/app/views/transactions/card_settle_trans/index.html.erb @@ -7,6 +7,13 @@
    +
    @@ -17,40 +24,40 @@ <%= form_tag transactions_card_settle_trans_path, :method => :get do %>
    -
    +
    <% if defined? @payment_method %> -
    +
    - <%= select_tag "payment_type", options_for_select(@payment_method, :selected => params[:payment_type]), :class => "form-control" %> + <%= select_tag "payment_type", options_for_select(@payment_method, :selected => params[:payment_type]), :class => "form-control" %>
    <% end %> <% if not defined? status %> - -
    + +
    - + -
    +
    <% end %> -
    - +
    +
    -
    - +
    +
    - -
    + +

    @@ -58,14 +65,14 @@ <% end %> - + - + - +
    -
    +
    @@ -128,20 +135,20 @@ var check_arr = []; search_by_period(); $('#sel_period').change(function(){ - + search_by_period(); - + }); - + function search_by_period(){ var period = $('#sel_period').val(); var period_type = 0; var from = ""; var to = ""; - show_shift_name(period,period_type,from,to,'shift_item'); - } - + show_shift_name(period,period_type,from,to,'shift_item'); + } + // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ new_date = new Date(date) ; @@ -156,50 +163,50 @@ to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); $('#to').val(to) search_by_date(); - }); - + }); + function search_by_date(){ - + from = $("#from").val(); to = $("#to").val(); var period = 0; - var period_type = 1; + var period_type = 1; if(to != '' && from != ''){ shift_name = from + ',' + to; check_arr.push(to); - + if(check_arr.length == 1){ - show_shift_name(period,period_type,from,to,'shift_item'); + show_shift_name(period,period_type,from,to,'shift_item'); } if(check_arr.length == 3){ check_arr = []; } } - + } - + function show_shift_name(period,period_type,from,to,shift_item){ var shift = $('#shift_name'); - + shift.empty(); - + var str = ''; - var param_shift = ''; + var param_shift = ''; var param_shift = '<%= params[:shift_name] rescue '-'%>'; if (from == '' && to == '') { from = $("#from").val(); to = $("#to").val(); } url = '<%= reports_get_shift_by_date_path %>'; - + $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){ str = ''; - $(data.message).each(function(index){ - + $(data.message).each(function(index){ + var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date; var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date; var shift_id = data.message[index].shift_id ; @@ -208,19 +215,19 @@ selected = 'selected = "selected"'; } else{ - selected = ''; - } + selected = ''; + } }else{ - selected = ''; - } + selected = ''; + } str += ''; - + // console.log(sh_date) - }) + }) shift.append(str); }); } }); - \ No newline at end of file + diff --git a/app/views/transactions/credit_notes/index.html.erb b/app/views/transactions/credit_notes/index.html.erb index 2df29368..754cffb9 100755 --- a/app/views/transactions/credit_notes/index.html.erb +++ b/app/views/transactions/credit_notes/index.html.erb @@ -5,7 +5,7 @@
  • Credit Note
    • - + --> @@ -18,6 +18,13 @@ +
    @@ -28,11 +35,11 @@
    - + - +
    <%= form_tag transactions_credit_notes_path, :method => :get do %>
    -
    +
    -
    +
    +
    -
    +
    - <%= select_tag "order_source", options_for_select(@sources, :selected => params[:order_source]), :class => "form-control" %> + <%= select_tag "order_source", options_for_select(@sources, :selected => params[:order_source]), :class => "form-control" %>
    -
    - +
    +
    -
    - +
    +
    - -
    + +

    @@ -63,10 +70,10 @@ <% end %>
    @@ -109,14 +116,14 @@ <%= sale.cashier_name rescue '-' %> <%= link_to sale.customer.name, crm_customer_path(sale.customer_id) %> - + <%if sale.source == "cashier" || sale.source == "emenu" %> Cashier <% elsif sale.source == "quick_service" %> Quick Service <% else %> Online Order - <% end %> + <% end %> <%= sale.receipt_date.strftime("%d-%m-%Y %I:%M %p") %> @@ -152,7 +159,7 @@ } // console.log(arr_sale); }); - + $(".credit_payment").on('click', function(){ $.ajax({ type: 'POST', @@ -194,8 +201,3 @@ return arr_item; } - - - - - diff --git a/app/views/transactions/order_reservations/index.html.erb b/app/views/transactions/order_reservations/index.html.erb index dc0f9564..d7ba3527 100644 --- a/app/views/transactions/order_reservations/index.html.erb +++ b/app/views/transactions/order_reservations/index.html.erb @@ -7,6 +7,13 @@
    +
    @@ -17,13 +24,13 @@ <%= form_tag transactions_order_reservations_path, :method => :get do %>
    -
    +
    -
    - +
    +
    -
    - +
    +
    -
    - +
    +
    -
    +

    @@ -56,18 +63,18 @@ <% end %> - + - + - +
    - + @@ -112,8 +119,8 @@ %> <% if @order_reservations != 0 %> <% @order_reservations.each do |order_reservation| %> - <% - provider = "" + <% + provider = "" discount_amount = order_reservation.discount_amount delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0 convenience_charge = order_reservation.convenience_charge @@ -187,4 +194,4 @@ $('#sel_period').val("<%= params[:period] %>"); $('#filter').val("<%= params[:filter] %>"); }); - \ No newline at end of file + diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 41aa63e6..47216911 100755 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -8,12 +8,19 @@ +
    <%= form_tag transactions_orders_path, :method => :get do %>
    -
    +
    @@ -24,31 +31,31 @@ 0
    - +
    --> -
    - +
    +
    -
    - +
    +
    - -
    + +

    -
    -
    +
    +
    <% end %>
    <%= t("views.right_panel.detail.order_reservation_id") %> <%= t("views.right_panel.detail.sale_id") %>
    - + - + @@ -60,7 +67,7 @@ - <% @orders.each do |order| + <% @orders.each do |order| @dining = BookingOrder.find_by_order_id(order.order_id).booking.dining_facility %> @@ -73,13 +80,13 @@ - + <% end %>
    <%= t("views.right_panel.detail.order_id") %><%= t :table %>/<%= t :room %> <%= t("views.right_panel.detail.order_by") %> <%= t("views.right_panel.detail.type") %>
    <%= order.status %> <%= order.date.utc.getlocal.strftime("%d-%m-%Y %I:%M %p") %> <%= order.item_count %>

    - + <%if !@orders.nil?%> <%= paginate @orders %> <%end%> diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index 8e815b32..7ca7c08f 100644 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -7,6 +7,13 @@
    +
    @@ -17,13 +24,13 @@ <%= form_tag transactions_sales_path, :method => :get do %>
    -
    +
    -
    - +
    +
    -
    - +
    +
    -
    - +
    +
    -
    - +
    +
    - -
    + +

    @@ -62,18 +69,18 @@ <% end %> - + - + - +
    - + @@ -144,24 +151,24 @@ $('#from').val("<%= params[:from] %>"); $('#to').val("<%= params[:to] %>"); $('#sel_period').val("<%= params[:period] %>"); - + var check_arr = []; search_by_period(); $('#sel_period').change(function(){ - + search_by_period(); - + }); - + function search_by_period(){ var period = $('#sel_period').val(); var period_type = 0; var from = ""; var to = ""; - show_shift_name(period,period_type,from,to,'shift_item'); - } - + show_shift_name(period,period_type,from,to,'shift_item'); + } + // OK button is clicked $('#from').bootstrapMaterialDatePicker().on('beforeChange', function(e, date){ new_date = new Date(date) ; @@ -176,32 +183,32 @@ to = new_date.getDate() + "-" + month + "-" + new_date.getFullYear(); $('#to').val(to); search_by_date(); - }); - + }); + function search_by_date(){ from = $("#from").val(); - to = $("#to").val(); + to = $("#to").val(); var period = 0; - var period_type = 1; + var period_type = 1; if(to != '' && from != ''){ shift_name = from + ',' + to; check_arr.push(to); - + console.log(check_arr.length) if(check_arr.length == 1){ - show_shift_name(period,period_type,from,to,'shift_item'); + show_shift_name(period,period_type,from,to,'shift_item'); } if(check_arr.length == 3){ check_arr = []; } } - + } - + function show_shift_name(period,period_type,from,to,shift_item){ var shift = $('#shift_name'); if (from == '' && to == '') { @@ -209,18 +216,18 @@ to = $("#to").val(); } shift.empty(); - + var str = ''; - var param_shift = ''; + var param_shift = ''; var param_shift = '<%= params[:shift_name] rescue '-'%>'; url = '<%= reports_get_shift_by_date_path %>'; - + $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){ str = ''; - $(data.message).each(function(index){ - + $(data.message).each(function(index){ + var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date; var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date; var shift_id = data.message[index].shift_id ; @@ -229,18 +236,18 @@ selected = 'selected = "selected"'; } else{ - selected = ''; - } + selected = ''; + } }else{ - selected = ''; - } + selected = ''; + } str += ''; - + // console.log(sh_date) - }) + }) shift.append(str); }); } }); - \ No newline at end of file + diff --git a/app/views/transactions/sales/show.html.erb b/app/views/transactions/sales/show.html.erb index 3e4dfca0..c6ecbc6b 100755 --- a/app/views/transactions/sales/show.html.erb +++ b/app/views/transactions/sales/show.html.erb @@ -60,17 +60,17 @@ <%end%> <%end%> - <% end %> + <% end %> - + - - + + @@ -78,20 +78,20 @@ - + <% @sale.sale_items.each do |s| %> - + - <% end %> + <% end %> - + @@ -102,10 +102,10 @@ <% @sale.sale_taxes.each do |r|%> - + - <% end %> + <% end %> @@ -122,8 +122,8 @@ - - <% end %> + + <% end %> @@ -208,7 +208,7 @@ - + <% if @response["status"] == true %> <% @response["data"].each do |transaction| %> @@ -216,7 +216,7 @@ - + @@ -241,13 +241,13 @@ - + <% @sale_audits.each do |audit| %> - + <% end %> @@ -297,7 +297,7 @@
    - + <% @payment_methods.each_with_index do |pay, pay_index| %> <%if (pay_index+1)%3 == 0 %>
    @@ -308,8 +308,8 @@ <%end %> - - + +
    @@ -367,17 +367,17 @@ } } - // click select option icon for add - $('.payment_btn').on('click', function(event){ + // click select option icon for add + $('.payment_btn').on('click', function(event){ active = $(this).hasClass('selected-payment'); value = $(this).data('value'); type = $(this).data('type'); group = $(this).data('group'); payments = $(".payment_btn"); - if (active) { + if (active) { $(this).removeClass('selected-payment'); - }else{ + }else{ $(this).addClass('selected-payment'); } }); //End selecct attribute buttom @@ -415,7 +415,7 @@ } }); } - }); + }); }else{ swal("Opps","You are not authorized for void","warning") } @@ -438,14 +438,14 @@ if(!location.pathname.includes("credit_payment")){ calculate_member_discount(sale_id,"Cash",tax_type); } - } + } } $( "#loading_wrapper" ).hide(); receipt_no = "<%= @sale.receipt_no %>"; if((receipt_no!=undefined) && (receipt_no!="")) createReceiptNoInFirstBillData(receipt_no,type); - + window.location = '/origami/sale/'+sale_id+'/transaction/payment'; }); @@ -454,4 +454,3 @@ window.location = '/origami/sale/'+sale_id+'/transaction/payment'; }); - diff --git a/app/views/transactions/shift_sales/index.html.erb b/app/views/transactions/shift_sales/index.html.erb index 481b52c8..01c4f17f 100755 --- a/app/views/transactions/shift_sales/index.html.erb +++ b/app/views/transactions/shift_sales/index.html.erb @@ -7,6 +7,13 @@
    +
    @@ -21,7 +28,7 @@
    -
    +
    @@ -29,7 +36,7 @@
    - +

    @@ -107,6 +114,3 @@ }); - - - diff --git a/app/views/transactions/surveys/_survey_report_filter.html.erb b/app/views/transactions/surveys/_survey_report_filter.html.erb index 78a988b9..8d7ba96f 100644 --- a/app/views/transactions/surveys/_survey_report_filter.html.erb +++ b/app/views/transactions/surveys/_survey_report_filter.html.erb @@ -1,25 +1,25 @@ <%= form_tag transactions_surveys_path, :method => :get, :id=>"frm_report", :class => "form" do %>
    -
    +
    -
    - +
    +
    -
    - +
    +
    - -
    + +

    -
    -
    +
    +
    <% end %> \ No newline at end of file + diff --git a/app/views/transactions/surveys/index.html.erb b/app/views/transactions/surveys/index.html.erb index a57d724f..377d69cf 100644 --- a/app/views/transactions/surveys/index.html.erb +++ b/app/views/transactions/surveys/index.html.erb @@ -7,6 +7,13 @@
    +
    @@ -67,8 +74,8 @@ <% foreigner_lists = foreign.split(",") %> <% if !foreigner_lists.empty? %> <% foreigner_lists.each do |fgn| %> - <% unless fgn.match(/[^[:digit:]]+/) - total_foreigner = total_foreigner.to_i + fgn.to_i + <% unless fgn.match(/[^[:digit:]]+/) + total_foreigner = total_foreigner.to_i + fgn.to_i end %> <% if !fgn.scan(/\D/).empty? %> <%= fgn %> :<% end %> <%= fgn.to_i unless fgn.match(/[^[:digit:]]+/) %>
    @@ -104,4 +111,4 @@ $("#from").val("<%=params[:from] rescue '-'%>"); $("#to").val("<%=params[:to] rescue '-'%>"); }); - \ No newline at end of file + diff --git a/config/database.yml.sample b/config/database.yml.sample deleted file mode 100755 index 02c6afe3..00000000 --- a/config/database.yml.sample +++ /dev/null @@ -1,83 +0,0 @@ -# ## SQLIte3 --- Setup -# -# # SQLite version 3.x -# # gem install sqlite3 -# # -# # Ensure the SQLite 3 gem is defined in your Gemfile -# # gem 'sqlite3' -# # -# default: &default -# adapter: sqlite3 -# pool: 5 -# timeout: 5000 -# -# development: -# <<: *default -# database: db/development.sqlite3 -# -# # Warning: The database defined as "test" will be erased and -# # re-generated from your development database when you run "rake". -# # Do not set this db to the same as development or production. -# test: -# <<: *default -# database: db/test.sqlite3 -# -# production: -# <<: *default -# database: db/production.sqlite3 - -# Mysql --- Setup -# MySQL. Versions 5.0 and up are supported. -# -# Install the MySQL driver -# gem install mysql2 -# -# Ensure the MySQL gem is defined in your Gemfile -# gem 'mysql2' -# -# And be sure to use new-style password hashing: -# http://dev.mysql.com/doc/refman/5.7/en/old-client.html -# -default: &default - adapter: mysql2 - encoding: utf8 - pool: 5 - username: root - password: - socket: /tmp/mysql.sock - -development: - <<: *default - database: SXRestaurants_development - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - <<: *default - database: SXRestaurants_test - -# As with config/secrets.yml, you never want to store sensitive information, -# like your database password, in your source code. If your source code is -# ever seen by anyone, they now have access to your database. -# -# Instead, provide the password as a unix environment variable when you boot -# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database -# for a full rundown on how to provide these environment variables in a -# production deployment. -# -# On Heroku and other platform providers, you may have a full connection URL -# available as an environment variable. For example: -# -# DATABASE_URL="mysql2://myuser:mypass@localhost/somedatabase" -# -# You can use this database configuration with: -# -# production: -# url: <%= ENV['DATABASE_URL'] %> -# -production: - <<: *default - database: SXRestaurants_production - username: SXRestaurants - password: <%= ENV['SXRESTAURANTS_DATABASE_PASSWORD'] %> diff --git a/config/deploy/production.rb b/config/deploy/production.rb index dbedd2a4..bcca8f23 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -1,3 +1,13 @@ +# set :stage, :production +# set :server_name, "svr.sxrestaurant.host" + +# set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}" +# server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true + +# set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}" +# set :rbenv_ruby, '2.4.1' +# set :rails_env, :production + set :stage, :production set :server_name, "a.c2l.shop" set :branch, "r-1902001-01" diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index cab8fe5d..205c330a 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -3,45 +3,47 @@ class ActionController::Base private - def lookup_domain - if request.subdomain.present? && request.subdomain != "www" - from = request.subdomain.downcase + "." + request.domain.downcase + def lookup_domain + if request.subdomain.present? && request.subdomain != "www" + from = request.subdomain.downcase + "." + request.domain.downcase @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase if (!@license.nil?) - logger.info "Location - " + @license.dbschema - ActiveRecord::Base.establish_connection(website_connection(@license)) - # authenticate_session_token + logger.info "Location - " + @license.dbschema + ActiveRecord::Base.establish_connection(website_connection(@license)) + # authenticate_session_token # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema else # reconnect_default_db logger.info 'License is nil' # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] - end - else + + end + else # check for license file - # if check_license - # current_license(ENV["SX_PROVISION_URL"]) - # else - # redirect_to activate_path - # end - end + if check_license + current_license(ENV["SX_PROVISION_URL"]) + else + redirect_to activate_path + end + end + end - def current_license(url) + def current_license(url) @license = License.new(url) flag = @license.detail_with_local_file() if (flag == 0) - flash[:notice] = 'Expired or No License!' + flash[:notice] = 'Expired or No License!' elsif (flag == 2) - flash[:notice] = 'Expiring! Please, License extend...' + flash[:notice] = 'Expiring! Please, License extend...' else puts "RUN SAY BYAR" end end - def cache_license(url, lookup) - @license = License.new(url, lookup) + def cache_license(url, lookup) + @license = License.new(url, lookup) if (@license.detail_with_local_cache(lookup) == true) return @license @@ -51,7 +53,7 @@ class ActionController::Base end def check_license - License.check_license_file + License.check_license_file end def check_installation @@ -83,7 +85,7 @@ class ActionController::Base # RESTful url for localize def default_url_options { locale: I18n.locale } - end + end end @@ -92,26 +94,26 @@ class ActionController::API private - def lookup_domain - if request.subdomain.present? && request.subdomain != "www" - from = request.subdomain.downcase + "." + request.domain.downcase + def lookup_domain + if request.subdomain.present? && request.subdomain != "www" + from = request.subdomain.downcase + "." + request.domain.downcase @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase if (!@license.nil?) - logger.info "Location - " + @license.dbschema - ActiveRecord::Base.establish_connection(website_connection(@license)) - # authenticate_session_token + logger.info "Location - " + @license.dbschema + ActiveRecord::Base.establish_connection(website_connection(@license)) + # authenticate_session_token # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema else # reconnect_default_db logger.info 'License is nil' # redirect_to root_url(:host => request.domain) + "store_error" render :json => [{ status: false, message: 'Invalid Access!'}] - end - end - end + end + end + end - def cache_license(url, lookup) - @license = License.new(url, lookup) + def cache_license(url, lookup) + @license = License.new(url, lookup) if (@license.detail_with_local_cache(lookup) == true) return @license @@ -143,7 +145,6 @@ class ActionController::API # RESTful url for localize def default_url_options { locale: I18n.locale } - end + end end - diff --git a/config/puma.rb b/config/puma.rb index 774272b7..d24425ae 100755 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,11 +1,11 @@ -# application_path="#{File.expand_path("../..", __FILE__)}" -# directory application_path -# #environment ENV.fetch("RAILS_ENV") { "production" } -# environment "production" -# pidfile "#{application_path}/tmp/puma/pid" -# state_path "#{application_path}/tmp/puma/state" -# stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" -# port ENV.fetch("PORT") { 62158 } -# workers 2 -# preload_app! - +application_path="#{File.expand_path("../..", __FILE__)}" +directory application_path +#environment ENV.fetch("RAILS_ENV") { "production" } +environment "production" +pidfile "#{application_path}/tmp/puma/pid" +state_path "#{application_path}/tmp/puma/state" +stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log" +port ENV.fetch("PORT") { 62158 } +workers 2 +preload_app! +threads 1,1 diff --git a/config/routes.rb b/config/routes.rb index 89963f1e..bbc7a816 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -3,6 +3,7 @@ require 'sidekiq/web' Rails.application.routes.draw do scope "(:locale)", locale: /en|mm/ do + root 'home#index' mount Sidekiq::Web => '/kiq' @@ -12,7 +13,7 @@ scope "(:locale)", locale: /en|mm/ do # if ENV["SERVER_MODE"] != "cloud" mount ActionCable.server => "/cable" # end - + #--------- SmartSales Activation ------------# get 'activate' => 'install#index' @@ -28,7 +29,16 @@ scope "(:locale)", locale: /en|mm/ do delete 'logout' => 'home#destroy' get 'dashboard' => 'home#dashboard' + namespace :induties do + # resources :assign_in_duties + get ':booking_id/assign' => 'assign_in_duties#index', as: :assign_in_duties + get "/assign_in_duties/get_all_occupied_dining/:id" =>'assign_in_duties#get_all_occupied_dining', as: :get_all_occupied_dining + post ':booking_id/assign_create' => 'assign_in_duties#induties_create', as: :induties_create + post ':booking_id/assign_checkout/:induty_id' => 'assign_in_duties#induties_checkout', as: :induties_checkout + delete ':booking_id/assign_remove/:induty_id' => 'assign_in_duties#induties_remove', as: :induties_remove + get ':booking_id/get_current_booking' => 'assign_in_duties#get_current_booking' + end #--------- API Routes ------------# namespace :api, :defaults => {:format => 'json'} do #Session Login and Logout @@ -46,7 +56,9 @@ scope "(:locale)", locale: /en|mm/ do resources :menu_item_instances, only: [:show] get "item_sets" => "item_sets#index" end - + namespace :payment do + post 'mobilepayment/:cashier_id/:receipt_no/cash' =>"mobilepayment#cash" + end #User request move table or bills post "bill/:booking_id" => "bill#create" post "move" => "move#create" @@ -92,7 +104,7 @@ scope "(:locale)", locale: /en|mm/ do post "callback/:id" => "order_reservation#update_status" get "get_tax_profile" => "order_reservation#get_tax_profile" end - + post "sound_effect" => "sound_effect#sound_effect" #API for cashier app @@ -102,19 +114,22 @@ scope "(:locale)", locale: /en|mm/ do post "request_bill" => "bill#request_bill" post "paymal_payment" => "payments#paymal_payment" get ":sale_id/void" => "void#overall_void" + + #API for sync cloud + post 'sync_data' => 'sync#sync_data' end #--------- Cashier ------------# - namespace :origami do + namespace :origami do root "home#index" post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' } - get "dashboard" => "dashboard#index" - get "get_all_menu" => "dashboard#get_all_menu" + get "dashboard" => "dashboard#index" + get "get_all_menu" => "dashboard#get_all_menu" get "quick_service" => "quick_service#index" - + get ":type/pending_order" => "pending_order#index" get ":type/pending_order/:sale_id" => "pending_order#show" get ":type/completed_sale/:sale_id" => "pending_order#completed_sale" @@ -122,7 +137,7 @@ scope "(:locale)", locale: /en|mm/ do get "quick_service/modify_order/:id/:sale_id" => "quick_service#modify_order" get "quick_service/modify_order/:sale_id" => "quick_service#modify_order" post 'quick_service/update_modify_order' => "quick_service#update_modify_order", :defaults => { :format => 'json' } - + get ":type/cash_ins" => "pending_order#cash_ins" get ":type/cash_outs" => "pending_order#cash_outs" @@ -135,7 +150,7 @@ scope "(:locale)", locale: /en|mm/ do resources :cash_ins, only: [:new, :create] resources :cash_outs, only: [:new, :create] - + get "table/:dining_id" => "home#show" do #origami/:booking_id will show # resources :discounts, only: [:index,:new, :create ] #add discount type resources :customers #add customer type @@ -206,6 +221,7 @@ scope "(:locale)", locale: /en|mm/ do post 'payment/:type/foc' => 'payments#foc', :defaults => {:format => 'json'} post 'payment/cash' => 'payments#create' + # post 'payment/kbz_query/:sale_id' => 'payments#kbz_query', :defaults => {:format => 'json'} post 'payment/mpu' => "mpu#create" post 'payment/jcb' => "jcb#create" post 'payment/master' => "master#create" @@ -268,10 +284,10 @@ scope "(:locale)", locale: /en|mm/ do get '/:addorders/:id' => "addorders#detail" post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } - + get '/addorders/get_item_instance/:id' => "addorders#get_item_instance",:as => "get_item_instance", :defaults => { :format => 'json' } - + resources :commissions resources :commissioners @@ -341,7 +357,7 @@ scope "(:locale)", locale: /en|mm/ do get 'sale/:sale_id/:type/credit_payment/others_payment/Alipay' => "alipay#index" # get 'sale/:sale_id/:type/credit_payment/others_payment/DINGA' => "dinga#index" # get 'sale/:sale_id/:type/credit_payment/others_payment/GiftVoucher' => "gift_voucher#index" - + #------------- Start Reservation -------------------# resources :reservation #------------- End Reservation -------------------# @@ -358,6 +374,8 @@ scope "(:locale)", locale: /en|mm/ do namespace :crm do root "home#index" resources :customers + get "/customers/:id/sync" => "customers#sync", as:"customer_sync" + get "/customers/:id/customer_update_phone_email_member_type" => "customers#customer_update_phone_email_member_type", as:"customer_update_phone_email_member_type" resources :dining_queues post "update_booking", to: "bookings#update_booking", as: "update_booking" #assign and cancel get '/print/:id', to: "home#print_order" #print order for crm @@ -400,8 +418,8 @@ scope "(:locale)", locale: /en|mm/ do collection do post :import end - resources :menu_categories, only: [:new, :create, :edit, :delete] - end + resources :menu_categories, only: [:new, :create, :edit, :delete] + end get '/menus/:id/export' => 'menus#export' @@ -505,6 +523,7 @@ scope "(:locale)", locale: /en|mm/ do resources :receipt_no_detail resources :dailysale, :only => [:index, :show] resources :saleitem, :only => [:index, :show] + resources :hourly_saleitem, :only => [:index, :show] resources :shiftsale, :only => [:index, :show] resources :credit_payment, :only => [:index, :show] resources :void_sale, :only => [:index, :show] @@ -519,10 +538,14 @@ scope "(:locale)", locale: /en|mm/ do resources :card_settle_tran get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item" + get "hourly_saleitem/get_shift_by_date", to: "hourly_saleitem#show", as: "get_shift_by_hourly_saleitem" get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date" get "order_reservation/get_shift_by_date", to: "order_reservation#show", as: "get_shift_by_order_reservation" get "induty/get_shift_by_date", to: "induty#show", as: "get_shift_by_induty" - + get "shiftsale_print/:id" , to: "shiftsale#print_close_receipt", as: "get_shift_id" + get "receipt_reprint/:sale_id" , to: "receipt_no#reprint", as: "receipt_reprint" + post "print_sale_items", to: "saleitem#print_sale_items", as: "print_sale_items" + get "sync_data", to:'receipt_no#sync_data', as:'sync_data' end # ----------- Inventory --------------------------- diff --git a/config/secrets.yml b/config/secrets.yml index 0282c5fc..40e0906e 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -11,21 +11,20 @@ # if you're sharing your code publicly. development: - secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 - sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api - server_mode: application - cipher_type: AES-256-CBC - sx_key: Wh@t1$C2L + secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 + sx_provision_url: connect.smartsales.asia/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api + server_mode: application + cipher_type: AES-256-CBC + sx_key: Wh@t1$C2L test: - secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0 + secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0 # Do not keep production secrets in the repository, # instead read values from the environment. production: - secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api - server_mode: application - cipher_type: AES-256-CBC - sx_key: Wh@t1$C2L - + secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 + sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api + server_mode: application + cipher_type: AES-256-CBC + sx_key: Wh@t1$C2L diff --git a/db/migrate/20190617045150_change_image_to_add_limit_in_display_images.rb b/db/migrate/20190617045150_change_image_to_add_limit_in_display_images.rb new file mode 100644 index 00000000..0d7c37aa --- /dev/null +++ b/db/migrate/20190617045150_change_image_to_add_limit_in_display_images.rb @@ -0,0 +1,11 @@ +class ChangeImageToAddLimitInDisplayImages < ActiveRecord::Migration[5.1] + + def up + change_column :display_images, :image, :binary, :limit => 10.megabyte + end + + def down + change_column :display_images, :image, :binary, :limit => nil + end + +end diff --git a/db/migrate/20190617072833_add_byname_to_induties.rb b/db/migrate/20190617072833_add_byname_to_induties.rb new file mode 100644 index 00000000..04247dbb --- /dev/null +++ b/db/migrate/20190617072833_add_byname_to_induties.rb @@ -0,0 +1,5 @@ +class AddBynameToInduties < ActiveRecord::Migration[5.1] + def change + add_column :in_duties, :by_name, :boolean, default: false + end +end diff --git a/db/seeds.rb b/db/seeds.rb index 7a139b6e..9d498c2e 100755 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -209,7 +209,7 @@ queue_no_printer=PrintSetting.create({name: "Queue No", unique_code: "QueueNoPdf zone = Zone.create({id:1, name: "H1", is_active:true, created_by: "SYSTEM DEFAULT"}) -member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "https://staging.membership.paypar.ws",merchant_account_id:"pZBHXEFbGNj/G"}) +member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "https://staging.membership.paymal.ws",merchant_account_id:"vWSsseoZCzxd6xcNf_uS"}) member_actions= MembershipAction.create([{membership_type:"get_account_balance",is_active:1,gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"}, {membership_type:"redeem",is_active:1,gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1},merchant_account_id:"vWSsseoZCzxd6xcNf_uS",auth_token:"pZBHXEFbGNj/G"}, diff --git a/dump.rdb b/dump.rdb old mode 100755 new mode 100644 index 7d7b359c..e4cb2863 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/spec/controllers/induties/assign_in_duties_controller_spec.rb b/spec/controllers/induties/assign_in_duties_controller_spec.rb new file mode 100644 index 00000000..41a1df6a --- /dev/null +++ b/spec/controllers/induties/assign_in_duties_controller_spec.rb @@ -0,0 +1,141 @@ +require 'rails_helper' + +# This spec was generated by rspec-rails when you ran the scaffold generator. +# It demonstrates how one might use RSpec to specify the controller code that +# was generated by Rails when you ran the scaffold generator. +# +# It assumes that the implementation code is generated by the rails scaffold +# generator. If you are using any extension libraries to generate different +# controller code, this generated spec may or may not pass. +# +# It only uses APIs available in rails and/or rspec-rails. There are a number +# of tools you can use to make these specs even more expressive, but we're +# sticking to rails and rspec-rails APIs to keep things simple and stable. +# +# Compared to earlier versions of this generator, there is very limited use of +# stubs and message expectations in this spec. Stubs are only used when there +# is no simpler way to get a handle on the object needed for the example. +# Message expectations are only used when there is no simpler way to specify +# that an instance is receiving a specific message. +# +# Also compared to earlier versions of this generator, there are no longer any +# expectations of assigns and templates rendered. These features have been +# removed from Rails core in Rails 5, but can be added back in via the +# `rails-controller-testing` gem. + +RSpec.describe Induties::AssignInDutiesController, type: :controller do + + # This should return the minimal set of attributes required to create a valid + # Induties::AssignInDuty. As you add validations to Induties::AssignInDuty, be sure to + # adjust the attributes here as well. + let(:valid_attributes) { + skip("Add a hash of attributes valid for your model") + } + + let(:invalid_attributes) { + skip("Add a hash of attributes invalid for your model") + } + + # This should return the minimal set of values that should be in the session + # in order to pass any filters (e.g. authentication) defined in + # Induties::AssignInDutiesController. Be sure to keep this updated too. + let(:valid_session) { {} } + + describe "GET #index" do + it "returns a success response" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + get :index, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #show" do + it "returns a success response" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + get :show, params: {id: assign_in_duty.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #new" do + it "returns a success response" do + get :new, params: {}, session: valid_session + expect(response).to be_success + end + end + + describe "GET #edit" do + it "returns a success response" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + get :edit, params: {id: assign_in_duty.to_param}, session: valid_session + expect(response).to be_success + end + end + + describe "POST #create" do + context "with valid params" do + it "creates a new Induties::AssignInDuty" do + expect { + post :create, params: {induties_assign_in_duty: valid_attributes}, session: valid_session + }.to change(Induties::AssignInDuty, :count).by(1) + end + + it "redirects to the created induties_assign_in_duty" do + post :create, params: {induties_assign_in_duty: valid_attributes}, session: valid_session + expect(response).to redirect_to(Induties::AssignInDuty.last) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'new' template)" do + post :create, params: {induties_assign_in_duty: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "PUT #update" do + context "with valid params" do + let(:new_attributes) { + skip("Add a hash of attributes valid for your model") + } + + it "updates the requested induties_assign_in_duty" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + put :update, params: {id: assign_in_duty.to_param, induties_assign_in_duty: new_attributes}, session: valid_session + assign_in_duty.reload + skip("Add assertions for updated state") + end + + it "redirects to the induties_assign_in_duty" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + put :update, params: {id: assign_in_duty.to_param, induties_assign_in_duty: valid_attributes}, session: valid_session + expect(response).to redirect_to(assign_in_duty) + end + end + + context "with invalid params" do + it "returns a success response (i.e. to display the 'edit' template)" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + put :update, params: {id: assign_in_duty.to_param, induties_assign_in_duty: invalid_attributes}, session: valid_session + expect(response).to be_success + end + end + end + + describe "DELETE #destroy" do + it "destroys the requested induties_assign_in_duty" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + expect { + delete :destroy, params: {id: assign_in_duty.to_param}, session: valid_session + }.to change(Induties::AssignInDuty, :count).by(-1) + end + + it "redirects to the induties_assign_in_duties list" do + assign_in_duty = Induties::AssignInDuty.create! valid_attributes + delete :destroy, params: {id: assign_in_duty.to_param}, session: valid_session + expect(response).to redirect_to(induties_assign_in_duties_url) + end + end + +end diff --git a/spec/helpers/induties/assign_in_duties_helper_spec.rb b/spec/helpers/induties/assign_in_duties_helper_spec.rb new file mode 100644 index 00000000..15eca0b4 --- /dev/null +++ b/spec/helpers/induties/assign_in_duties_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the Induties::AssignInDutiesHelper. For example: +# +# describe Induties::AssignInDutiesHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe Induties::AssignInDutiesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/induties/assign_in_duty_spec.rb b/spec/models/induties/assign_in_duty_spec.rb new file mode 100644 index 00000000..00feb9d7 --- /dev/null +++ b/spec/models/induties/assign_in_duty_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Induties::AssignInDuty, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/requests/induties/induties_assign_in_duties_spec.rb b/spec/requests/induties/induties_assign_in_duties_spec.rb new file mode 100644 index 00000000..15a7a48e --- /dev/null +++ b/spec/requests/induties/induties_assign_in_duties_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +RSpec.describe "Induties::AssignInDuties", type: :request do + describe "GET /induties_assign_in_duties" do + it "works! (now write some real specs)" do + get induties_assign_in_duties_path + expect(response).to have_http_status(200) + end + end +end diff --git a/spec/routing/induties/assign_in_duties_routing_spec.rb b/spec/routing/induties/assign_in_duties_routing_spec.rb new file mode 100644 index 00000000..97c119a3 --- /dev/null +++ b/spec/routing/induties/assign_in_duties_routing_spec.rb @@ -0,0 +1,39 @@ +require "rails_helper" + +RSpec.describe Induties::AssignInDutiesController, type: :routing do + describe "routing" do + + it "routes to #index" do + expect(:get => "/induties/assign_in_duties").to route_to("induties/assign_in_duties#index") + end + + it "routes to #new" do + expect(:get => "/induties/assign_in_duties/new").to route_to("induties/assign_in_duties#new") + end + + it "routes to #show" do + expect(:get => "/induties/assign_in_duties/1").to route_to("induties/assign_in_duties#show", :id => "1") + end + + it "routes to #edit" do + expect(:get => "/induties/assign_in_duties/1/edit").to route_to("induties/assign_in_duties#edit", :id => "1") + end + + it "routes to #create" do + expect(:post => "/induties/assign_in_duties").to route_to("induties/assign_in_duties#create") + end + + it "routes to #update via PUT" do + expect(:put => "/induties/assign_in_duties/1").to route_to("induties/assign_in_duties#update", :id => "1") + end + + it "routes to #update via PATCH" do + expect(:patch => "/induties/assign_in_duties/1").to route_to("induties/assign_in_duties#update", :id => "1") + end + + it "routes to #destroy" do + expect(:delete => "/induties/assign_in_duties/1").to route_to("induties/assign_in_duties#destroy", :id => "1") + end + + end +end diff --git a/spec/views/induties/assign_in_duties/edit.html.erb_spec.rb b/spec/views/induties/assign_in_duties/edit.html.erb_spec.rb new file mode 100644 index 00000000..e6029a67 --- /dev/null +++ b/spec/views/induties/assign_in_duties/edit.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "induties/assign_in_duties/edit", type: :view do + before(:each) do + @induties_assign_in_duty = assign(:induties_assign_in_duty, Induties::AssignInDuty.create!()) + end + + it "renders the edit induties_assign_in_duty form" do + render + + assert_select "form[action=?][method=?]", induties_assign_in_duty_path(@induties_assign_in_duty), "post" do + end + end +end diff --git a/spec/views/induties/assign_in_duties/index.html.erb_spec.rb b/spec/views/induties/assign_in_duties/index.html.erb_spec.rb new file mode 100644 index 00000000..7fd74daf --- /dev/null +++ b/spec/views/induties/assign_in_duties/index.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "induties/assign_in_duties/index", type: :view do + before(:each) do + assign(:induties_assign_in_duties, [ + Induties::AssignInDuty.create!(), + Induties::AssignInDuty.create!() + ]) + end + + it "renders a list of induties/assign_in_duties" do + render + end +end diff --git a/spec/views/induties/assign_in_duties/new.html.erb_spec.rb b/spec/views/induties/assign_in_duties/new.html.erb_spec.rb new file mode 100644 index 00000000..ec73264c --- /dev/null +++ b/spec/views/induties/assign_in_duties/new.html.erb_spec.rb @@ -0,0 +1,14 @@ +require 'rails_helper' + +RSpec.describe "induties/assign_in_duties/new", type: :view do + before(:each) do + assign(:induties_assign_in_duty, Induties::AssignInDuty.new()) + end + + it "renders new induties_assign_in_duty form" do + render + + assert_select "form[action=?][method=?]", induties_assign_in_duties_path, "post" do + end + end +end diff --git a/spec/views/induties/assign_in_duties/show.html.erb_spec.rb b/spec/views/induties/assign_in_duties/show.html.erb_spec.rb new file mode 100644 index 00000000..79e1a2a7 --- /dev/null +++ b/spec/views/induties/assign_in_duties/show.html.erb_spec.rb @@ -0,0 +1,11 @@ +require 'rails_helper' + +RSpec.describe "induties/assign_in_duties/show", type: :view do + before(:each) do + @induties_assign_in_duty = assign(:induties_assign_in_duty, Induties::AssignInDuty.create!()) + end + + it "renders attributes in

    " do + render + end +end diff --git a/test/system/assign_in_duties_test.rb b/test/system/assign_in_duties_test.rb new file mode 100644 index 00000000..0d4d523b --- /dev/null +++ b/test/system/assign_in_duties_test.rb @@ -0,0 +1,9 @@ +require "application_system_test_case" + +class Induties::AssignInDutiesTest < ApplicationSystemTestCase + # test "visiting the index" do + # visit induties_assign_in_duties_url + # + # assert_selector "h1", text: "Induties::AssignInDuty" + # end +end

    <%= t("views.right_panel.detail.sale_id") %> <%= t("views.right_panel.detail.receipt_no") %>
    <%= @sale.receipt_date.strftime("%d-%M-%Y") %><%= @sale.receipt_date.strftime("%d-%m-%Y") %> <%= @sale.receipt_no %> <%= @sale.cashier_name rescue '-' %> <%= @sale.sale_status %> <%= @sale.requested_at.strftime("%m-%d-%Y %H:%M %p") %>
    <%= @sale.requested_at.strftime("%d-%m-%Y %H:%M %p") %>
    <%= t :sale %> <%= t("views.right_panel.detail.item_txt") %> <%= t("views.right_panel.detail.name_txt2") %> <%= t("views.right_panel.detail.qty") %><%= t("views.right_panel.detail.total_price") %> <%= t("views.right_panel.detail.created_at") %> <%= t("views.right_panel.detail.remark") %>
    <%=s.product_name rescue ' '%> <%=s.qty rescue ' '%> <%= number_with_precision(s.unit_price, :precision => 2, :delimiter => ',') rescue ' '%><%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%><%= number_with_precision(s.price, :precision => 2, :delimiter => ',') rescue ' '%> <%=l s.created_at.utc.getlocal , :format => :short rescue ' ' %> <%=s.remark rescue ' '%>
    <%= t("views.right_panel.detail.total") %><%= t("views.right_panel.detail.total") %> <%= number_with_precision(@sale.total_amount, :precision => 2, :delimiter => ',') rescue ' '%>
    <%= r.tax_name %> <%= r.tax_name %> <%= number_with_precision(r.tax_payable_amount, :precision => 2, :delimiter => ',') rescue ' '%>
    <%= t("views.right_panel.detail.grand_total") %> <%= r.payment_method.capitalize rescue ' '%> Payment <%= number_with_precision(r.payment_amount, :precision => 2, :delimiter => ',') rescue ' '%>
    <%= t("views.right_panel.detail.change") %><%= t("views.right_panel.detail.receipt_no") %>
    <%= transaction["redeem"]%> <%= transaction["rebate"] %> <%= transaction["balance"] %><%= transaction["account_status"] %><%= transaction["account_status"] %> <%= transaction["status"] %> <%= transaction["receipt_no"] %> <%= t("views.right_panel.detail.remark") %>
    <%= audit.action%> <%= audit.action_at.strftime("%m-%d-%Y %H:%M %p")%> <%= audit.approved_by%><%= audit.remark%><%= audit.remark%>