Yan df06b81b28 Merge branch 'staging'

2017-07-17 15:13:31 +06:30

..

card_payments_controller.rb

payment_setting

2017-06-08 17:57:29 +06:30

cash_ins_controller.rb

shift

2017-06-29 18:59:17 +06:30

cash_mgmt_controller.rb

shift close and payment journal

2017-06-28 10:34:42 +06:30

cash_outs_controller.rb

shift

2017-06-29 18:59:17 +06:30

credit_payments_controller.rb

credit note payment

2017-06-26 17:49:55 +06:30

customers_controller.rb

update print

2017-07-02 11:41:47 +06:30

discounts_controller.rb

update osaka demo bugs

2017-07-14 17:23:40 +06:30

home_controller_bk.rb

shift

2017-06-28 15:29:44 +06:30

home_controller.rb

update osaka demo bugs

2017-07-14 17:23:40 +06:30

jcb_controller.rb

Limit paid amount for JCB, Visa and Master Card

2017-06-14 17:13:43 +06:30

master_controller.rb

Limit paid amount for JCB, Visa and Master Card

2017-06-14 17:13:43 +06:30

moveroom_controller.rb

update authorize

2017-06-23 09:41:48 +06:30

movetable_controller.rb

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

2017-06-26 09:59:16 +06:30

mpu_controller.rb

Limit paid amount for JCB, Visa and Master Card

2017-06-14 17:13:43 +06:30

orders_controller.rb

update osaka demo bugs

2017-07-14 17:23:40 +06:30

other_charges_controller.rb

saturday fixed

2017-07-01 20:02:14 +06:30

others_payments_controller.rb

update control member for osaka

2017-07-12 19:43:56 +06:30

payments_controller.rb

update osaka demo bugs

2017-07-14 17:23:40 +06:30

paypar_payments_controller.rb

For Pull

2017-06-11 13:58:34 +06:30

redeem_payments_controller.rb

Redeem amount bug fic

2017-06-22 13:31:54 +06:30

request_bills_controller.rb

control to req bill and discount ui update

2017-07-08 23:29:31 +06:30

room_invoices_controller.rb

Multiple Invoices Phase 1

2017-06-26 11:10:49 +06:30

rooms_controller.rb

update osaka demo bugs

2017-07-14 17:23:40 +06:30

sale_edit_controller.rb

update edit qty and price and cash and credit div in payment details

2017-07-06 12:54:04 +06:30

sales_controller.rb

update osaka demo bugs

2017-07-14 17:23:40 +06:30

shifts_controller.rb

Merge branch 'staging'

2017-07-17 15:13:31 +06:30

table_invoices_controller.rb

multiple invoice void

2017-06-27 11:35:36 +06:30

visa_controller.rb

Limit paid amount for JCB, Visa and Master Card

2017-06-14 17:13:43 +06:30

void_controller.rb

add req and fix for shift

2017-07-07 17:19:14 +06:30