Phyo 0138ae2efa Fix Conflict

2017-08-16 18:38:41 +06:30

..

accounts

update view files

2017-07-27 17:43:07 +06:30

cashier_terminals

…

dining_charges

CalculatePriceInDiningCharges

2017-08-16 10:46:03 +06:30

employees

add Updated_at to Employee Listing

2017-08-14 14:04:39 +06:30

lookups

update lookup

2017-07-31 17:33:06 +06:30

membership_actions

update show detail template of backend

2017-07-05 11:51:43 +06:30

membership_settings

add s in Points

2017-08-09 12:28:46 +06:30

menu_categories

…

menu_item_attributes

…

menu_item_instances

…

menu_item_options

…

menus

…

order_queue_stations

update osaka demo bugs

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

payment_method_settings

…

processing_items

…

products

CRUDforProducts

2017-08-16 18:19:20 +06:30

promotions

Promotion CRUD

2017-08-16 18:36:23 +06:30

rooms

Room Charges Bug Fix

2017-08-14 15:33:13 +06:30

set_menu_items

Instances Name Show

2017-06-14 15:01:36 +06:30

simple_menu_items

Instances Name Show

2017-06-14 15:01:36 +06:30

tables

Room Charges Bug Fix

2017-08-14 15:33:13 +06:30

tax_profiles

…

zones

Zone Created_at Bug Fix

2017-06-19 16:24:44 +06:30