Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/controllers/origami/home_controller.rb

@@ -27,9 +27,9 @@ class Origami::HomeController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
 
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -38,21 +38,30 @@ class Origami::HomeController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
           end
         else
-          sale = Sale.find(booking.sale_id)
+          if !booking.sale_id.nil?
-          if sale.sale_status !='completed'
+            sale = Sale.find(booking.sale_id)
-            if !@order_items_count.key?(booking.dining_facility_id)
+            if sale.sale_status !='completed'
-              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+              end
             end
           end
         end
       end
     end
 
+    puts "@order_items_count"
+    puts @order_items_count.to_json
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
@@ -80,6 +89,9 @@ class Origami::HomeController < BaseOrigamiController
                   @order_items.push(item)
                 end
                 accounts = @customer.tax_profiles
+                puts accounts.to_json
+                puts "sssssssssss"
+                puts @customer.tax_profiles
                 @account_arr =[]
                 accounts.each do |acc|
                   account = TaxProfile.find(acc)

app/controllers/origami/orders_controller.rb

@@ -13,9 +13,9 @@ class Origami::OrdersController < BaseOrigamiController
       end
     end
 
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -24,15 +24,21 @@ class Origami::OrdersController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
           end
         else
-          sale = Sale.find(booking.sale_id)
+          if !booking.sale_id.nil?
-          if sale.sale_status !='completed'
+            sale = Sale.find(booking.sale_id)
-            if !@order_items_count.key?(booking.dining_facility_id)
+            if sale.sale_status !='completed'
-              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+              end
             end
           end
         end

app/controllers/origami/rooms_controller.rb

@@ -23,9 +23,9 @@ class Origami::RoomsController < BaseOrigamiController
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     
-    @order_items_count = Hash.new
     bookings = Booking.all
     if !bookings.nil?
+      @order_items_count = Hash.new
       bookings.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           if !booking.booking_orders.empty?
@@ -34,15 +34,21 @@ class Origami::RoomsController < BaseOrigamiController
               if !order.order_items.empty?
                 if !@order_items_count.key?(booking.dining_facility_id)
                   @order_items_count.store(booking.dining_facility_id, order.order_items.count)
+                else
+                  @order_items_count[booking.dining_facility_id] += order.order_items.count
                 end
               end
             end
           end
         else
-          sale = Sale.find(booking.sale_id)
+          if !booking.sale_id.nil?
-          if sale.sale_status !='completed'
+            sale = Sale.find(booking.sale_id)
-            if !@order_items_count.key?(booking.dining_facility_id)
+            if sale.sale_status !='completed'
-              @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              if !@order_items_count.key?(booking.dining_facility_id)
+                @order_items_count.store(booking.dining_facility_id, sale.sale_items.count)
+              else
+                @order_items_count[booking.dining_facility_id] = sale.sale_items.count
+              end
             end
           end
         end

app/controllers/origami/void_controller.rb

@@ -40,16 +40,25 @@ class Origami::VoidController < BaseOrigamiController
       # end
 
       table_avaliable = true
+      table_count = 0
       table = sale.bookings[0].dining_facility
       table.bookings.each do |booking|
-        if !booking.sale.nil? 
+        if booking.booking_status != 'moved'
-          if booking.sale.sale_status == 'new'
+          if booking.sale_id
+            if booking.sale.sale_status != 'completed' && booking.sale.sale_status != 'void' 
+              table_avaliable = false
+              table_count += 1
+            else
+              table_avaliable = true
+            end
+          else
             table_avaliable = false
+            table_count += 1
           end
         end
       end
 
-      if table_avaliable
+      if table_avaliable && table_count == 0
         table.status = 'available'
         table.save
       end

app/controllers/sym_control_controller.rb

@@ -3,7 +3,7 @@ class SymControlController < BaseController
   http_basic_authenticate_with name: "vip", password: "!abcABC01"
 
   def run
-  	sym_path = "/home/yan/symmetric/"
+  	sym_path =  File.expand_path("~/symmetric/")
   	check_sym_proc_str = `#{"sudo service SymmetricDS status"}`
       # Check Sym Installed
       # if sym_install_status[1] == "false"
@@ -12,13 +12,13 @@ class SymControlController < BaseController
 
       if check_sym_proc_str.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
         # Create Sym Table
-        check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables")
+        check_sym_table = system("sudo " + sym_path + "/bin/symadmin --engine sx create-sym-tables")
         if check_sym_table
           sym_sql = Rails.root + "db/sym_master.sql"
           
           if File.exist? (sym_sql)
             # Import Sym Sql to db and start sym
-            run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+            run_sym_sql = system("sudo " + sym_path + "/bin/dbimport --engine sx " + sym_sql.to_s)
             stop_sym = system("sudo service SymmetricDS stop")
             run_sym = system("sudo service SymmetricDS start")
             if run_sym

app/models/license.rb

@@ -1,7 +1,7 @@
 class License
   include HTTParty
 
-  base_uri "provision.zsai.ws/api"
+  base_uri "connect.smartsales.dev/api"
 
   attr_accessor :name, :address_1, :address_2, :township, :city, :country, :email, :phone, :fax, :logo, :subdomain,
   :plan_activation_date, :plan_next_renewal_date, :plan_max_products,:plan_max_customers, :plan_active_connections,
@@ -118,8 +118,11 @@ class License
 
       response =  create_license_file(@activate)
       if(response[:status])
-        sym_path = "/home/yan/symmetric/"
+        #sym_path = "/home/user/symmetric/"
+        sym_path  =  File.expand_path("~/symmetric/")
+
         response = create_symmetric_config(sym_path, db_host, db_schema, db_user, db_password)
+         
         if(response[:status])
           response = run_symmetric(sym_path)
         end
@@ -325,7 +328,7 @@ class License
     if File.directory? (sym_location)
       begin
         # sx properties create
-        f = File.open(sym_location + "engines/sx.properties", "w")
+        f = File.open(sym_location + "/engines/sx.properties", "w")
         f.write("engine.name=sx\n")
         f.write("db.driver=com.mysql.jdbc.Driver\n")
         f.write("db.url=jdbc:mysql://#{db_host}/#{db_schema}?tinyInt1isBit=false\n")
@@ -344,14 +347,15 @@ class License
         f.close 
 
         # read from license file 
-        shop_name = read_license_no_decrypt("shop_name")
+        # shop_name = read_license_no_decrypt("shop_name")
+        shop_name = "cloud"
         dbhost = read_license("dbhost")
         dbschema = read_license("dbschema")
         dbusername = read_license("dbusername")
         dbpassword = read_license("dbpassword")
 
         # shop properties create
-        f = File.open(sym_location + "engines/#{shop_name}.properties", "w")
+        f = File.open(sym_location + "/engines/#{shop_name}.properties", "w")
         f.write("engine.name=#{shop_name}\n")
         f.write("db.driver=com.mysql.jdbc.Driver\n")
         f.write("db.url=jdbc:mysql://#{dbhost}/#{dbschema}?tinyInt1isBit=false\n")
@@ -390,13 +394,13 @@ class License
     sym_run_status = check_sym_running(check_sym_proc_str, sym_path)
     if sym_run_status
       # Create Sym Table
-      check_sym_table = system("sudo " + sym_path + "bin/symadmin --engine sx create-sym-tables")
+      check_sym_table = system("sudo " + sym_path + "/bin/symadmin --engine sx create-sym-tables")
       if check_sym_table
         sym_sql = Rails.root + "db/sym_master.sql"
         
         if File.exist? (sym_sql)
           # Import Sym Sql to db and start sym
-          run_sym_sql = system("sudo " + sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+          run_sym_sql = system("sudo " + sym_path + "/bin/dbimport --engine sx " + sym_sql.to_s)
           stop_sym = system("sudo service SymmetricDS stop")
           run_sym = system("sudo service SymmetricDS start")
           if run_sym

config/license.yml

@@ -1,15 +0,0 @@
-iv_key: Te5NfpxT9IjB5ulefoRdoQ==
-shop_name: bitp7
-email: devops@code2lab.com
-telephone: 9999999
-fax: 99999999
-address: Perl Condo
-dbhost: AAOoOhyuwUXWkBB7cev2vg==
-dbschema: nZtG9/bJ9BoQ3y8RvSsH1w==
-dbusername: Bahz/G6Xbn0kFw5vH/fS+Q==
-dbpassword: T45gSYq8IB2BL9o9spFmIg==
-api_token: DAJQdcHsSwXjxAbcvzWYjXTARdiAskWbw
-app_token: PsVJxxAhQHKjqLFGOnWdIIsBHoLsMdPBhZLpM
-plan_sku: W1evmpMVHjjXvXBLPW+jJA==
-renewable_date: 2bDU6cDr2LRMJpeeCM9ZvQ==
-plan_name: aaVvUh6fGhIbUDWoR3awq4qkDVk3rH2Fuydc0ZuKMqA=

config/shops.json

@@ -1,11 +1,3 @@
 {
-  "data": [
+  "data": []
-    {
-      "lookup": "osaka1-7.zsai.ws",
-      "value": {
-        "key": "wwF9Zx9q/LfxSDqSNHYXvfu1eGsBqFEFXoXqGWrEirA=\n",
-        "iv": "l1rUEZFcPNHrTHWgaODkYQ==\n"
-      }
-    }
-  ]
 }