git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflictfile

Browse Source
This commit is contained in:
Aung Myo
2017-06-12 15:01:19 +06:30
parent e90178cfdc 105581a7de
commit dc51beae43
30 changed files with 699 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/migrate/20170611084537_create_membership_actions.rb
View File

@@ -8,7 +8,7 @@ class CreateMembershipActions < ActiveRecord::Migration[5.1]
t.string :auth_token
t.string :merchant_account_id
t.string :created_by
t.string :additional_parameter,array: true, :default =>'{}'
t.json :additional_parameter
t.timestamps
end

12
db/seeds.rb
View File

@@ -51,6 +51,10 @@ menu_item_type = Lookup.create([{lookup_type:'menu_item_type', name: 'SIMPLE', v
{lookup_type:'menu_item_type', name: 'Set Menu', value: 'setMenu'},
{lookup_type:'menu_item_type', name: 'DIY', value: 'diy'}])
member_group_type = Lookup.create([{lookup_type:'member_group_type', name: 'Platinum', value: '1'},
{lookup_type:'member_group_type', name: 'Silver', value: '2'}
])
#menu_item_attribute:[size|]
menu_item_attribute_type = Lookup.create([{lookup_type:'menu_item_attribute_type', name: 'Size', value: 'size'}])
# {lookup_type:'menu_item_attribute_type', name: 'Spicy', value: 'spicy'},
@@ -136,15 +140,12 @@ zone_queue_station = OrderQueueProcessByZone.create({order_queue_station: zone_o
#Create Adminstrator employee
admin_employee = Employee.create({name: "Administrator", role: "Administrator", password: "99999", emp_id:"999", created_by: "SYSTEM DEFAULT"})
#Account for Menu Item Type (eg: Food, Beverage)
food = Account.create({title: "Food", account_type: "0"})
beverage = Account.create({title: "Beverage", account_type: "1"})
order_station1=PrintSetting.create({name: "OrderItemPdf", unique_code: "OrderItemPdf", printer_name: "EPSON-TM-T82-S-A"})
order_station2=PrintSetting.create({name: "Order Summary", unique_code: "OrderSummaryPdf", printer_name: "EPSON-TM-T82-S-A"})
request_bill_printer=PrintSetting.create({name: "Receipt Bill", unique_code: "ReceiptBillPdf", printer_name: "EPSON-TM-T82-S-A"})
crm_order_printer=PrintSetting.create({name: "CRM Order", unique_code: "CrmOrderPdf", printer_name: "EPSON-TM-T82-S-A"})
member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "192.168.1."})
member_setting = MembershipSetting.create({membership_type:"paypar_url",gateway_url: "http//192.168.1.47:3006"})
member_actions= MembershipAction.create([{membership_type:"get_account_balance",gateway_url:"/api/membership_campaigns/get_correspond_account_data",additional_parameter:{campaign_type_id:1}},
{membership_type:"redeem",gateway_url:"/api/membership_campaigns/redeem",additional_parameter:{campaign_type_id:1}},
@@ -154,6 +155,7 @@ member_actions= MembershipAction.create([{membership_type:"get_account_balance",
{membership_type:"rebate",gateway_url:"/api/membership_campaigns/rebate",additional_parameter:{campaign_type_id:1}},
{membership_type:"get_all_member_account",gateway_url:"/api/generic_customer/get_membership_data"}
])
payment_methods = PaymentMethodSetting.create({payment_method:"REDEEMREBATE",gateway_url: "http//192.168.1.47:3006"})
# shop = Shop.create(
# {name: "Beauty In The Pot", address: "address", township: "Yangon", city: "Yangon", state: "Yangon",