fixed conflit

This commit is contained in:
NyanLinHtut
2019-12-13 10:09:25 +06:30
317 changed files with 17947 additions and 3204 deletions

View File

@@ -107,6 +107,11 @@ units = Lookup.create([{lookup_type:'unit', name: 'PCS', value: 'pcs'},
# Country
countries = Lookup.create({lookup_type:'country', name: 'Japan', value: 'Japan'})
# number formats
number_formats = Lookup.create([{lookup_type: 'number_format', name: 'precision', '2'},
{lookup_type: 'number_format', name: 'delimiter', ','},
{lookup_type: 'number_format', name: 'strip_insignificant_zeros', '0'}])
# Default CUSTOMER
customer = Customer.create({name:"WALK-IN", email: "cus1@customer.com", contact_no:"000000000",card_no:"000", customer_type:"Dinein", tax_profiles:["2", "1"]})
customer2 = Customer.create({name:"TAKEAWAY", email: "cus2@customer.com", contact_no:"111111111",card_no:"111", customer_type:"Takeaway", tax_profiles:["1"]})
@@ -133,7 +138,7 @@ product = Account.create({title: "Product", account_type: "2"})
# YGN BBQ
# person = Account.create({title: "Person", account_type: "3"})
# END
# END
#Default Menu Options
menu_options = MenuItemOption.create([{option_type: "Spicy", name: "Less Spicy", value: "less_spicy"},{option_type: "Spicy", name: "Spicy", value: "spicy"},{option_type: "Spicy", name: "Super Spicy", value: "super_spicy"}])