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

db/migrate/20170626191519_create_shift_sales.rb

@@ -0,0 +1,25 @@
+class CreateShiftSales < ActiveRecord::Migration[5.1]
+  def change
+    create_table :shift_sales do |t|
+      t.references :cashier_terminal, foreign_key: true, :null => false
+      t.datetime :shift_started_at
+      t.datetime :shift_closed_at
+      t.references :employee, foreign_key: true #cashier
+      t.decimal :opening_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :closing_balance, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_revenue, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_discounts, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :total_taxes, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :grand_total, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :nett_sales, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :cash_sales, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :credit_sales, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.json :other_sales
+      t.decimal :commercial_taxes, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :cash_in, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :cash_out, :precision => 10, :scale => 2, :null => false, :default => 0.00
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20170627035218_create_payment_journals.rb

@@ -0,0 +1,15 @@
+class CreatePaymentJournals < ActiveRecord::Migration[5.1]
+  def change
+    create_table :payment_journals do |t|
+      t.string :payment_references,:null => false
+      t.string :remark
+      t.decimal :credit_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.decimal :debit_amount, :precision => 10, :scale => 2, :null => false, :default => 0.00
+      t.string :payment_method,:null => false, :default => "CASH"
+      t.string :payment_status,:null => false, :default => "NEW"
+      t.string :payment_method_references
+
+      t.timestamps
+    end
+  end
+end

db/scaffold_structure

@@ -22,3 +22,5 @@ rails generate scaffold_controller Setup/CashierTerminal name:string is_active:b
 rails generate scaffold_controller Settings/OrderQueueStation station_name:string is_active:boolean processing_items:json print_copy:boolean printer_name:string font_size:integer cut_per_item:boolean use_alternate_name:boolean created_by:string --no-migration
 
 rails generate scaffold_controller transactions/Sale cashier:references cashier_name:string requested_by:string requested_at:datetime receipt_no:string receipt_date:datetime customer:references payment_status:string sale_status:string total_amount:decimal total_discount:decimal total_tax:decimal tax_type:string grand_total:decimal rounding_adjustment:decimal amount_received:decimal amount_changed:decimal --no-migration
+
+rails g model shift_sale cashier_terminal:references shift_started_at:datetime shift_closed_at:datetime employee:references opening_balance:decimal closing_balance:decimal total_revenue:decimal total_discounts:decimal total_taxes:decimal grand_total:decimal nett_sales:decimal cash_sales:decimal credit_sales:decimal other_sales:decimal commercial_taxes:decimal cash_in:decimal cash_out:decimal