sainw/fcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
PhyoThandar
2020-10-14 13:56:03 +06:30
parent 4007d20fd2 6c871ea066
commit 7ec9a5a5fa
11 changed files with 481 additions and 519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

265
assets/local/localization_en.json
View File

@@ -32,7 +32,7 @@
"contact.btn":"Contact Us", "contact.btn":"Contact Us",
"contact.title":"Contact Us", "contact.title":"Contact Us",
"contact.phone.title":"Input Phone Number", "contact.phone.title":"Input Phone Number",
"contact.phone":"Phone Number", "contact.phone":"Phone number",
"contact.phone.confim":"Call {0}?", "contact.phone.confim":"Call {0}?",
"contact.phone.empty":"Please enter phone number", "contact.phone.empty":"Please enter phone number",
"contact.email":"Email", "contact.email":"Email",
@@ -44,18 +44,18 @@
"contact.google.empty":"Please enter website url", "contact.google.empty":"Please enter website url",
"contact.confrim":"Confirm update contact?", "contact.confrim":"Confirm update contact?",
"contact.open.confrim":"Open '{0}'?", "contact.open.confrim":"Open '{0}'?",
"contact.bank.accounts":"Bank Accounts Info", "contact.bank.accounts":"Bank accounts info",
"contact.address":"Address", "contact.address":"Address",
"contact.usa.address":"USA Address", "contact.usa.address":"USA address",
"contact.mm.address":"Myanmar Address", "contact.mm.address":"Myanmar address",
"contact.delivery.phone":"Delivery Phone", "contact.delivery.phone":"Delivery phone",
"contact.fcs.email":"FCS Email", "contact.fcs.email":"FCS email",
"contact.callus":"Call Us", "contact.callus":"Call us",
"contact.findus":"Find Us", "contact.findus":"Find us",
"contact.emailus":"Email Us", "contact.emailus":"Email us",
"contact.visitus":"Visit Us", "contact.visitus":"Visit us",
"contact.usa.phone": "USA Phone", "contact.usa.phone": "USA phone",
"contact.mm.phone": "Myanmar Phone", "contact.mm.phone": "Myanmar phone",
"contact.edit.title":"Edit Contact Us", "contact.edit.title":"Edit Contact Us",
"Contact End ================================================================":"", "Contact End ================================================================":"",
@@ -87,9 +87,9 @@
"faq.edit.answer":"Answer", "faq.edit.answer":"Answer",
"faq.edit.sn":"S/N", "faq.edit.sn":"S/N",
"faq.edit.delete.confirm":"Delete this FAQ?", "faq.edit.delete.confirm":"Delete this FAQ?",
"faq.edit.page":"Additional Page", "faq.edit.page":"Additional page",
"faq.edit.page.label.eng":"Page label in English", "faq.edit.page.label.eng":"Page label in english",
"faq.edit.page.label.mm":"Page label in Myanmar", "faq.edit.page.label.mm":"Page label in myanmar",
"FAQ End ================================================================":"", "FAQ End ================================================================":"",
"Home Start ================================================================":"", "Home Start ================================================================":"",
@@ -101,7 +101,7 @@
"Invite Start ================================================================":"", "Invite Start ================================================================":"",
"invite.title":"You need invitation from FCS", "invite.title":"You need invitation from FCS",
"invite.name.enter":"Please enter your name", "invite.name.enter":"Please enter your name",
"invite.request":"Request Invitation", "invite.request":"Request invitation",
"invite.request.successful":"Successfully requested!", "invite.request.successful":"Successfully requested!",
"invite.btn":"Invite", "invite.btn":"Invite",
"Invite End ================================================================":"", "Invite End ================================================================":"",
@@ -119,23 +119,24 @@
"customers.btn": "Customers", "customers.btn": "Customers",
"customer.list.title":"Customers", "customer.list.title":"Customers",
"customer.name":"Name", "customer.name":"Name",
"customer.phone":"Phone Number", "customer.phone":"Phone number",
"customer.status":"Status", "customer.status":"Status",
"customer.fcs.id":"FCS ID", "customer.fcs.id":"FCS ID",
"customer.invitation.request.confirm":"Accept Customer", "customer.invitation.request.confirm":"Accept customer",
"Customer End ================================================================":"", "Customer End ================================================================":"",
"Invitation Start ================================================================":"", "Invitation Start ================================================================":"",
"invitation.list": "Invitations", "invitation.list": "Invitations",
"invitation.edit": "Invitation", "invitation.edit": "Invitation",
"invitation.new": "New Invitation", "invitation.new": "New invitation",
"invitation.form.title":"New Invitation",
"invitation.confirm.delete": "Delete this invitation?", "invitation.confirm.delete": "Delete this invitation?",
"Invitation End ================================================================":"", "Invitation End ================================================================":"",
"Staff Start ================================================================":"", "Staff Start ================================================================":"",
"staff.title":"Staffs", "staff.title":"Staffs",
"staff.list.title":"Staffs", "staff.list.title":"Staffs",
"staff.new":"New Staff", "staff.new":"New staff",
"staff.form.title":"Staff", "staff.form.title":"Staff",
"staff.add":"Add", "staff.add":"Add",
"staff.update":"Update", "staff.update":"Update",
@@ -150,22 +151,22 @@
"profile.phone": "Phone", "profile.phone": "Phone",
"profile.language": "Languages", "profile.language": "Languages",
"profile.logout": "logout", "profile.logout": "logout",
"profile.currency":"Preferred Currency", "profile.currency":"Preferred currency",
"profile.usa.shipping.address": "USA Shipping Address", "profile.usa.shipping.address": "USA shipping address",
"profile.logout.confirm":"Are you sure want to logout?", "profile.logout.confirm":"Are you sure want to logout?",
"profile.devices":"Devices", "profile.devices":"Devices",
"profile.email":"Email", "profile.email":"Email",
"profile.privileges":"Privileges", "profile.privileges":"Privileges",
"profile.default.delivery.address":"Default Delivery Address", "profile.default.delivery.address":"Default delivery address",
"Profile End ================================================================":"", "Profile End ================================================================":"",
"Package Start ================================================================":"", "Package Start ================================================================":"",
"package.btn.name":"Track Packages", "package.btn.name":"Track Packages",
"package.title":"Packages", "package.title":"Packages",
"package.create.title":"New Packages", "package.create.title":"New packages",
"package.create.fcs.id":"FCS ID", "package.create.fcs.id":"FCS ID",
"package.create.name":"Customer Name", "package.create.name":"Customer name",
"package.create.phone":"Phone Number", "package.create.phone":"Phone number",
"package.tracking.id":"Tracking ID", "package.tracking.id":"Tracking ID",
"package.create.packages":"Complete receiving", "package.create.packages":"Complete receiving",
"package.create.market":"Market", "package.create.market":"Market",
@@ -177,97 +178,100 @@
"package.edit.complete.process.btn":"Complete processing", "package.edit.complete.process.btn":"Complete processing",
"package.edit.procseeing":"Processing", "package.edit.procseeing":"Processing",
"package.info.title":"Package", "package.info.title":"Package",
"package.arrival.date":"Arrival Date", "package.arrival.date":"Arrival date",
"package.number":"Box Number", "package.number":"Carton number",
"package.rate":"Rate", "package.rate":"Rate",
"package.weight":"Weight", "package.weight":"Weight",
"package.amount":"Amount", "package.amount":"Amount",
"package.delivery.address":"Delivery Address", "package.delivery.address":"Delivery address",
"package.popupmenu.active":"Active Packages", "package.popupmenu.active":"Active Packages",
"package.popupmenu.delivered":"Delivered Packages", "package.popupmenu.delivered":"Delivered Packages",
"Package End ================================================================":"", "Package End ================================================================":"",
"Market Start ================================================================":"", "Market Start ================================================================":"",
"market.edit.title":"Markets", "market.edit.title":"Markets",
"market.edit.name":"Market Name", "market.edit.name":"Market name",
"market.remove.confirm":"Remove this market?", "market.remove.confirm":"Remove this market?",
"Market End ================================================================":"", "Market End ================================================================":"",
"Buy_Online Start ================================================================":"", "Buy_Online Start ================================================================":"",
"buy_online.title":"Buying instructions", "buy_online.title":"Buying instructions",
"buy_online":"Buying Instructions", "buy_online":"Buying instructions",
"buy_online.buying_instruction":"See below instructions to add USA shipping address while shoping online", "buy_online.buying_instruction":"See below instructions to add USA shipping address while shoping online",
"buy_online.fullname":"With Full Name", "buy_online.fullname":"With full name",
"buy_online.first.last":"With First Name and Last Name", "buy_online.first.last":"With first name and last name",
"Buy_Online End ================================================================":"", "Buy_Online End ================================================================":"",
"Payment Start ================================================================":"", "Payment Start ================================================================":"",
"pm.title":"Payment Methods", "pm.title":"Payment Methods",
"pm.new":"New Payment Method", "pm.new":"New payment method",
"pm.form.new":"New Payment Method",
"pm.update":"Update Payment Method", "pm.update":"Update Payment Method",
"pm.btn":"Payment Methods", "pm.btn":"Payment methods",
"pm.name":"Name", "pm.name":"Name",
"pm.account.name":"Account Name", "pm.account.name":"Account name",
"pm.account.no":"Account Number", "pm.account.no":"Account number",
"pm.phone":"Phone Number", "pm.phone":"Phone number",
"pm.email":"Email Address", "pm.email":"Email address",
"pm.link":"Link", "pm.link":"Link",
"pm.add.btn":"Add Payment Method", "pm.add.btn":"Add payment method",
"pm.save.btn":"Save Payment Method", "pm.save.btn":"Save payment method",
"pm.delete.confirm":"Delete this Payment Method?", "pm.delete.confirm":"Delete this payment method?",
"pm_.title": "PAYMENT", "pm_.title": "PAYMENT",
"pm.date": "Date", "pm.date": "Date",
"pm.amount": "Amount", "pm.amount": "Amount",
"pm.receipt":"Payment Receipt Amount", "pm.receipt":"Payment receipt amount",
"pm.attachment":"Payment Attachment", "pm.attachment":"Payment attachment",
"pm.remaining_balance":"Remaining Balance : ", "pm.remaining_balance":"Remaining balance : ",
"pm.total.amount": "Amount :", "pm.total.amount": "Amount :",
"Payment End ================================================================":"", "Payment End ================================================================":"",
"Message Start ================================================================":"", "Message Start ================================================================":"",
"message.btn":"Notifications", "message.btn":"Notifications",
"message.view.detail":"View Deatil", "message.view.detail":"View deatil",
"message.hint.input":"Type your message...", "message.hint.input":"Type your message...",
"Message End ================================================================":"", "Message End ================================================================":"",
"Boxes Start ================================================================":"", "Boxes Start ================================================================":"",
"boxes.name":"Boxes", "boxes.name":"Cartons",
"boxes.title":"Boxes", "boxes.title":"Cartons",
"boxes.new":"New Box", "boxes.new":"New carton",
"box.edit.title":"Edit Box", "boxes.create.title":"New Carton",
"box.edit.title":"Edit Carton",
"box.package.id":"Package ID", "box.package.id":"Package ID",
"box.package.desc":"Description", "box.package.desc":"Description",
"box.package.market":"Market", "box.package.market":"Market",
"box.add_package":"Add Package", "box.add_package":"Add package",
"box.number":"Box Number", "box.number":"Box number",
"box.length":"Length", "box.length":"Length",
"box.width":"Width", "box.width":"Width",
"box.height":"Height", "box.height":"Height",
"box.shipment_info":"Shipment Information", "box.shipment_info":"Shipment information",
"box.cargo_type":"Cargo Types", "box.cargo_type":"Cargo types",
"box.dimension":"Box Dimension", "box.dimension":"Carton dimension",
"box.delivery_address":"Delivery Address", "box.delivery_address":"Delivery address",
"box.fcs_shipment_num":"FCS Shipment Number", "box.fcs_shipment_num":"FCS shipment number",
"box.fcs.id":"FCS ID", "box.fcs.id":"FCS ID",
"box.name":"Customer Name", "box.name":"Customer name",
"box.phone":"Phone Number", "box.phone":"Phone number",
"box.actual_weight":"Actual Weight", "box.actual_weight":"Actual weight",
"box.add_cargo":"Add Cargo", "box.add_cargo":"Add cargo",
"box.shipment_weight":"Shipment Weight", "box.shipment_weight":"Shipment weight",
"box.change_address":"Change\nAddress", "box.change_address":"Change\naddress",
"box.status":"Status", "box.status":"Status",
"box.create.btn":"Create New Box", "box.create.btn":"Create new carton",
"box.complete.btn":"Complete packing", "box.complete.btn":"Complete packing",
"box.deliver.btn":"Deliver", "box.deliver.btn":"Deliver",
"box.packages":"Packages", "box.packages":"Packages",
"box.tracking.id":"Tracking ID", "box.tracking.id":"Tracking ID",
"box.market":"Market", "box.market":"Market",
"box.cargo.save.btn":"Save", "box.cargo.save.btn":"Save",
"box.type.title":"Carton Types",
"Boxes End ================================================================":"", "Boxes End ================================================================":"",
"Delivery Start ================================================================":"", "Delivery Start ================================================================":"",
"delivery.title":"Deliveries", "delivery.title":"Deliveries",
"delivery":"DELIVERIES", "delivery":"Deliveries",
"Delivery End ================================================================":"", "Delivery End ================================================================":"",
"FCS Shipment Start ================================================================":"", "FCS Shipment Start ================================================================":"",
@@ -275,22 +279,22 @@
"FCSshipment.list.title":"FCS Shipments", "FCSshipment.list.title":"FCS Shipments",
"FCSshipment.add":"New FCS shipment", "FCSshipment.add":"New FCS shipment",
"FCSshipment.form.title":"FCS Shipment", "FCSshipment.form.title":"FCS Shipment",
"FCSshipment.number":"FCS Shipment Number", "FCSshipment.number":"FCS shipment number",
"FCSshipment.cutoff_date":"Cutoff Date", "FCSshipment.cutoff_date":"Cutoff date",
"FCSshipment.ETA":"ETA", "FCSshipment.ETA":"ETA",
"FCSshipment.departure_date":"Departure Date", "FCSshipment.departure_date":"Departure date",
"FCSshipment.shipment_type":"Shipment Type", "FCSshipment.shipment_type":"Shipment type",
"FCSshipment.consignee":"Consignee", "FCSshipment.consignee":"Consignee",
"FCSshipment.port_of_loading":"Port of Loading", "FCSshipment.port_of_loading":"Port of loading",
"FCSshipment.final_destination":"Final Destination", "FCSshipment.final_destination":"Final destination",
"FCSshipment.status":"Status", "FCSshipment.status":"Status",
"FCSshipment.remark":"Remark", "FCSshipment.remark":"Remark",
"FCSshipment.commercial_invoice":"Download Commercial Invoice", "FCSshipment.commercial_invoice":"Download commercial invoice",
"FCSshipment.packing_list":"Download Packing List", "FCSshipment.packing_list":"Download packing list",
"FCSshipment.dms":"Download DMS", "FCSshipment.dms":"Download DMS",
"FCSshipment.cargo_manifest":"Download Cargo Manifest", "FCSshipment.cargo_manifest":"Download cargo manifest",
"FCSshipment.create":"Create FCS Shipment", "FCSshipment.create":"Create FCS shipment",
"FCSshipment.update":"Update FCS Shipment", "FCSshipment.update":"Update FCS shipment",
"FCS Shipment End ================================================================":"", "FCS Shipment End ================================================================":"",
"Shipment Start ================================================================":"", "Shipment Start ================================================================":"",
@@ -306,38 +310,38 @@
"shipment.location": "Pickup address", "shipment.location": "Pickup address",
"shipment.location_time": "Pickup Location / Time", "shipment.location_time": "Pickup Location / Time",
"shipment.information": "Pickup information", "shipment.information": "Pickup information",
"shipment.recipient_information": "Recipient Informations", "shipment.recipient_information": "Recipient informations",
"shipment.from":"Ready time", "shipment.from":"Ready time",
"shipment.to":"Latest time available", "shipment.to":"Latest time available",
"shipment.box.delivery":"Delivery Address", "shipment.box.delivery":"Delivery address",
"shipment.handling.fee":"Handling Fee/Courier Fee", "shipment.handling.fee":"Handling fee/Courier fee",
"shipment.box.cargo.type":"Cargo Types", "shipment.box.cargo.type":"Cargo types",
"shipment.box.dimemsion":"Dimension", "shipment.box.dimemsion":"Dimension",
"shipment.box.shipment.weight":"Shipment weight", "shipment.box.shipment.weight":"Shipment weight",
"shipment.box.length":"Length", "shipment.box.length":"Length",
"shipment.box.width":"Width", "shipment.box.width":"Width",
"shipment.box.height":"Height", "shipment.box.height":"Height",
"shipment.box.add":"Add Box", "shipment.box.add":"Add carton",
"Shipment End ================================================================":"", "Shipment End ================================================================":"",
"Rate Start ================================================================":"", "Rate Start ================================================================":"",
"rate":"Rates", "rate":"Rates",
"rate.title":"RATES", "rate.title":"Rates",
"rate.edit.title":"EDIT RATES", "rate.edit.title":"Edit rates",
"rate.cal.title":"ESTIMATE SHIPPING COST", "rate.cal.title":"Estimate Shipping Cost",
"rate.min_weight":"Min Weight for Free delivery within Yangon", "rate.min_weight":"Min weight for free delivery within yangon",
"rate.delivery_fee":"Delivery fees", "rate.delivery_fee":"Delivery fees",
"rate.volumetric_ratio":"Volumetric Ratio", "rate.volumetric_ratio":"Volumetric ratio",
"rate.custom.form.title":"CUSTOM", "rate.custom.form.title":"CUSTOM",
"rate.cutom.product_type":"Product Type", "rate.cutom.product_type":"Product type",
"rate.custom.fee":"Fee", "rate.custom.fee":"Fee",
"rate.discount.weight":"Weight", "rate.discount.weight":"Weight",
"rate.discount.rate":"Discount Rate", "rate.discount.rate":"Discount rate",
"Rate End ================================================================":"", "Rate End ================================================================":"",
"Cargo Start ================================================================":"", "Cargo Start ================================================================":"",
"cargo.form.title":"Cargo", "cargo.form.title":"Cargo",
"cargo.type":"Cargo Type", "cargo.type":"Cargo type",
"cargo.weight":"Weight", "cargo.weight":"Weight",
"cargo.rate":"Rate", "cargo.rate":"Rate",
"cargo.amount":"Amount", "cargo.amount":"Amount",
@@ -346,34 +350,34 @@
"Invoices Start ================================================================":"", "Invoices Start ================================================================":"",
"invoices.btn": "Invoices", "invoices.btn": "Invoices",
"invoices.title": "INVOICES", "invoices.title": "INVOICES",
"invoices.add":"New Invoice", "invoices.add":"New invoice",
"invoice.form.title":"INVOICE", "invoice.form.title":"INVOICE",
"invoice.payment":"Payment Receipt", "invoice.payment":"Payment receipt",
"invoice.add_box":"Add Box", "invoice.add_box":"Add carton",
"invoice.add_package":"Add Package", "invoice.add_package":"Add package",
"invoice.date":"Invoice Date", "invoice.date":"Invoice date",
"invoice.number":"Invoice Number", "invoice.number":"Invoice number",
"invoice.customer_name":"Customer Name", "invoice.customer_name":"Customer name",
"invoice.status":"Status", "invoice.status":"Status",
"invoice.amount":"Amount", "invoice.amount":"Amount",
"invoice.total":"Total Amount", "invoice.total":"Total amount",
"invoice.balance":"Balance", "invoice.balance":"Balance",
"invoice.handling_fee":"Handling Fee", "invoice.handling_fee":"Handling fee",
"invoice.custom_fee":"Custom Fee", "invoice.custom_fee":"Custom fee",
"invoice.custom_fee_desc":"Custom Fee Description", "invoice.custom_fee_desc":"Custom fee description",
"invoice.discount":"Discount Code", "invoice.discount":"Discount code",
"invoice.payment_method":"Payment Method", "invoice.payment_method":"Payment method",
"invoice.delivery_fee":"Delivery Fee : ", "invoice.delivery_fee":"Delivery fee : ",
"invoice.payment_attachment":"Payment Attachment", "invoice.payment_attachment":"Payment attachment",
"invoice.box_info":"Box Information", "invoice.box_info":"Carton information",
"invoice.cargo_table":"Cargo Table", "invoice.cargo_table":"Cargo table",
"invoice.btn_create":"Create Invoice", "invoice.btn_create":"Create invoice",
"invoice.btn_save":"Save Invoice", "invoice.btn_save":"Save invoice",
"invoice.btn_payment_receipt":"Attachment Payment Receipt", "invoice.btn_payment_receipt":"Attachment payment receipt",
"invoice.description": "Description", "invoice.description": "Description",
"invoice.box.cargo_type": "Cargo Types", "invoice.box.cargo_type": "Cargo types",
"invoice.cargo_type":"Cargo Types", "invoice.cargo_type":"Cargo types",
"invoice.box.number":"Box number", "invoice.box.number":"Carton number",
"invoice.box.length":"Length", "invoice.box.length":"Length",
"invoice.box.width":"Width", "invoice.box.width":"Width",
"invoice.boc.height":"Height", "invoice.boc.height":"Height",
@@ -383,11 +387,11 @@
"Discount Start ================================================================":"", "Discount Start ================================================================":"",
"discount.btn":"Discounts", "discount.btn":"Discounts",
"discount.title":"DISCOUNTS", "discount.title":"Discounts",
"discount.new":"New Discount", "discount.new":"New discount",
"discount.form":"DISCOUNT", "discount.form":"Discount",
"discount.code":"Code", "discount.code":"Code",
"discount.name":"Customer Name", "discount.name":"Customer name",
"discount.amount":"Amount", "discount.amount":"Amount",
"discount.status":"Status", "discount.status":"Status",
"Discount End ================================================================":"", "Discount End ================================================================":"",
@@ -395,30 +399,31 @@
"delivery_addresses Start ================================================================":"", "delivery_addresses Start ================================================================":"",
"delivery_addresses": "Delivery Addresses", "delivery_addresses": "Delivery Addresses",
"delivery_address": "Delivery Address", "delivery_address": "Delivery Address",
"delivery_address.full_name": "Full Name", "delivery_address.full_name": "Full name",
"delivery_address.address_line1": "Address Line 1", "delivery_address.address_line1": "Address line 1",
"delivery_address.address_line2": "Address Line 2", "delivery_address.address_line2": "Address line 2",
"delivery_address.state_region": "State/Region", "delivery_address.state_region": "State/Region",
"delivery_address.city": "City", "delivery_address.city": "City",
"delivery_address.country": "Country", "delivery_address.country": "Country",
"delivery_address.phonenumber": "Phone Number", "delivery_address.phonenumber": "Phone number",
"delivery_address.create": "Create Delivery Address", "delivery_address.create": "Create delivery address",
"delivery_address.update": "Update Delivery Address", "delivery_address.update": "Update delivery address",
"delivery_address.new_address":"Add New\nAddress", "delivery_address.new_address":"Add new\naddress",
"delivery_address.change_address": "Change Address", "delivery_address.change_address": "Change address",
"delivery_address.delete.confirm":"Delete this Delivery Address?", "delivery_address.delete.confirm":"Delete this delivery address?",
"delivery_addresses End ================================================================":"", "delivery_addresses End ================================================================":"",
"Receiving Start ================================================================":"", "Receiving Start ================================================================":"",
"receiving.title":"Receivings", "receiving.title":"Receivings",
"receiving.info":"Receiving", "receiving.info":"Receiving",
"receiving.new":"New Receiving", "receiving.new":"New receiving",
"receiving.create":"New Receiving",
"receiving.update":"Update Reveiving", "receiving.update":"Update Reveiving",
"receiving.tracking.id":"Tracking ID", "receiving.tracking.id":"Tracking ID",
"receiving.remark":"Remark", "receiving.remark":"Remark",
"receiving.fcs.id":"FCS ID", "receiving.fcs.id":"FCS ID",
"receiving.name":"Customer Name", "receiving.name":"Customer name",
"receiving.phone":"Phone Number", "receiving.phone":"Phone number",
"receiving.create_btn":"Complete receiving", "receiving.create_btn":"Complete receiving",
"receiving.update_btn":"Update reveiving", "receiving.update_btn":"Update reveiving",
"receiving.delete.confirm":"Delete this receiving?", "receiving.delete.confirm":"Delete this receiving?",
@@ -428,8 +433,8 @@
"processing.title":"Processing", "processing.title":"Processing",
"processing.info.title":"Processing", "processing.info.title":"Processing",
"processing.tracking.id":"Tracking ID", "processing.tracking.id":"Tracking ID",
"processing.name":"Customer Name", "processing.name":"Customer name",
"processing.phone":"Phone Number", "processing.phone":"Phone number",
"processing.fcs.id":"FCS ID", "processing.fcs.id":"FCS ID",
"processing.market":"Market", "processing.market":"Market",
"processing.status":"Status", "processing.status":"Status",

5
assets/local/localization_mu.json
View File

@@ -129,6 +129,7 @@
"invitation.list": "ဖိတ်ကြားမှုများ", "invitation.list": "ဖိတ်ကြားမှုများ",
"invitation.edit": "ဖိတ်ကြားမှု", "invitation.edit": "ဖိတ်ကြားမှု",
"invitation.new": "ဖိတ်ကြားမှု အသစ်", "invitation.new": "ဖိတ်ကြားမှု အသစ်",
"invitation.form.title":"ဖိတ်ကြားမှု အသစ်",
"invitation.confirm.delete": "ဖိတ်ကြားမှု ဖျက်မလား?", "invitation.confirm.delete": "ဖိတ်ကြားမှု ဖျက်မလား?",
"Invitation End ================================================================":"", "Invitation End ================================================================":"",
@@ -204,6 +205,7 @@
"Payment Start ================================================================":"", "Payment Start ================================================================":"",
"pm.title":"ငွေပေးချေစနစ်များ", "pm.title":"ငွေပေးချေစနစ်များ",
"pm.new":"ငွေပေးချေစနစ် အသစ်", "pm.new":"ငွေပေးချေစနစ် အသစ်",
"pm.form.new":"ငွေပေးချေစနစ် အသစ်",
"pm.update":"ငွေပေးချေစနစ် ပြင်ဆင်ခြင်း", "pm.update":"ငွေပေးချေစနစ် ပြင်ဆင်ခြင်း",
"pm.btn":"ငွေပေးချေစနစ်များ", "pm.btn":"ငွေပေးချေစနစ်များ",
"pm.name":"အမည်", "pm.name":"အမည်",
@@ -234,6 +236,7 @@
"boxes.name":"သေတ္တာများ", "boxes.name":"သေတ္တာများ",
"boxes.title":"Boxes", "boxes.title":"Boxes",
"boxes.new":"သေတ္တာ အသစ်", "boxes.new":"သေတ္တာ အသစ်",
"boxes.create.title":"သေတ္တာ အသစ်",
"box.edit.title":"သေတ္တာ ပြင်ဆင်ခြင်း", "box.edit.title":"သေတ္တာ ပြင်ဆင်ခြင်း",
"box.package.id":"Package ID", "box.package.id":"Package ID",
"box.package.desc":"Description", "box.package.desc":"Description",
@@ -263,6 +266,7 @@
"box.tracking.id":"Tracking ID", "box.tracking.id":"Tracking ID",
"box.market":"အွန်လိုင်စျေးဆိုင်", "box.market":"အွန်လိုင်စျေးဆိုင်",
"box.cargo.save.btn":"သိမ်းဆည်းမည်", "box.cargo.save.btn":"သိမ်းဆည်းမည်",
"box.type.title":"သေတ္တာအမျိုးအစားများ",
"Boxes End ================================================================":"", "Boxes End ================================================================":"",
"Delivery Start ================================================================":"", "Delivery Start ================================================================":"",
@@ -413,6 +417,7 @@
"receiving.title":"လက်ခံခြင်းများ", "receiving.title":"လက်ခံခြင်းများ",
"receiving.info":"လက်ခံခြင်း", "receiving.info":"လက်ခံခြင်း",
"receiving.new":"လက်ခံခြင်း အသစ်", "receiving.new":"လက်ခံခြင်း အသစ်",
"receiving.create":"လက်ခံခြင်း အသစ်",
"receiving.update":"လက်ခံခြင်း ပြင်ဆင်ခြင်း", "receiving.update":"လက်ခံခြင်း ပြင်ဆင်ခြင်း",
"receiving.tracking.id":"Tracking ID", "receiving.tracking.id":"Tracking ID",
"receiving.remark":"မှတ်ချက်", "receiving.remark":"မှတ်ချက်",

13
lib/domain/constants.dart
View File

@@ -50,7 +50,12 @@ const privilege_processing = "pr";
const privilege_receiving = "rc"; const privilege_receiving = "rc";
// Pickup types // Pickup types
const shipment_local_pickup = "Local Pickup"; const shipment_local_pickup = "Local pickup";
const shipment_courier_pickup = "Courier Pickup"; const shipment_courier_pickup = "Courier pickup";
const shipment_local_dropoff = "Local Drop-off"; const shipment_local_dropoff = "Local drop-off";
const shipment_courier_dropoff = "Courier Drop-off"; const shipment_courier_dropoff = "Courier drop-off";
//Carton types
const carton_from_packages = "From packages";
const carton_from_shipments = "From shipments";
const carton_mix_box = "Mix box";

403
lib/pages/box/box_editor.dart
View File

@@ -19,7 +19,9 @@ import 'package:fcs/pages/widgets/delivery_address_selection.dart';
import 'package:fcs/pages/widgets/display_text.dart'; import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/fcs_id_icon.dart'; import 'package:fcs/pages/widgets/fcs_id_icon.dart';
import 'package:fcs/pages/widgets/input_text.dart'; import 'package:fcs/pages/widgets/input_text.dart';
import 'package:fcs/pages/widgets/local_radio_buttons.dart';
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/my_data_table.dart'; import 'package:fcs/pages/widgets/my_data_table.dart';
import 'package:fcs/pages/widgets/progress.dart'; import 'package:fcs/pages/widgets/progress.dart';
import 'package:fcs/pages/widgets/title_with_add_button.dart'; import 'package:fcs/pages/widgets/title_with_add_button.dart';
@@ -33,6 +35,7 @@ import 'package:timeline_list/timeline.dart';
import 'package:timeline_list/timeline_model.dart'; import 'package:timeline_list/timeline_model.dart';
import 'cargo_type_editor.dart'; import 'cargo_type_editor.dart';
import 'model/box_model.dart';
class BoxEditor extends StatefulWidget { class BoxEditor extends StatefulWidget {
final Box box; final Box box;
@@ -53,7 +56,8 @@ class _BoxEditorState extends State<BoxEditor> {
bool isMixBox = false; bool isMixBox = false;
DeliveryAddress _deliveryAddress = new DeliveryAddress(); DeliveryAddress _deliveryAddress = new DeliveryAddress();
User user; User user;
String selectShipmentNumber; String _selectShipmentNumber;
String _selectedCartonType;
List<Package> _packages = []; List<Package> _packages = [];
List<Cargo> _cargoTypes = []; List<Cargo> _cargoTypes = [];
double volumetricRatio = 0; double volumetricRatio = 0;
@@ -80,7 +84,7 @@ class _BoxEditorState extends State<BoxEditor> {
_box = widget.box; _box = widget.box;
_deliveryAddress = _box.shippingAddress; _deliveryAddress = _box.shippingAddress;
_cargoTypes = _box.cargoTypes; _cargoTypes = _box.cargoTypes;
selectShipmentNumber = _box.shipmentNumber; _selectShipmentNumber = _box.shipmentNumber;
_widthController.text = _box.width.toString(); _widthController.text = _box.width.toString();
_heightController.text = _box.height.toString(); _heightController.text = _box.height.toString();
_lengthController.text = _box.length.toString(); _lengthController.text = _box.length.toString();
@@ -156,38 +160,35 @@ class _BoxEditorState extends State<BoxEditor> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var languageModel = Provider.of<LanguageModel>(context); var languageModel = Provider.of<LanguageModel>(context);
var boxModel = Provider.of<BoxModel>(context);
var shipmentBox = Container( var shipmentBox = Container(
child: Padding( child: DropdownButtonFormField(
padding: const EdgeInsets.only(left: 10.0, right: 10), value: _selectShipmentNumber,
child: DropdownButtonFormField( decoration: InputDecoration(
value: selectShipmentNumber, fillColor: Colors.white,
decoration: InputDecoration( labelText: AppTranslations.of(context).text("box.fcs_shipment_num"),
fillColor: Colors.white, labelStyle: languageModel.isEng
labelText: ? TextStyle(fontWeight: FontWeight.w500)
AppTranslations.of(context).text("box.fcs_shipment_num"), : TextStyle(fontWeight: FontWeight.w500, fontFamily: "Myanmar3"),
labelStyle: languageModel.isEng icon: Icon(
? TextStyle(fontWeight: FontWeight.w500) Ionicons.ios_airplane,
: TextStyle( color: primaryColor,
fontWeight: FontWeight.w500, fontFamily: "Myanmar3"), )),
icon: Icon( items: ["A102", "A103", "A201", "A202"]
Ionicons.ios_airplane, .map((e) => DropdownMenuItem(
color: primaryColor, child: Text(
)), e,
items: ["A102", "A103", "A201", "A202"] style: TextStyle(color: primaryColor),
.map((e) => DropdownMenuItem( ),
child: Text( value: e))
e, .toList(),
style: TextStyle(color: primaryColor), onChanged: (value) {
), setState(() {
value: e)) _selectShipmentNumber = value;
.toList(), });
onChanged: (value) { },
setState(() { ));
selectShipmentNumber = value;
});
},
)));
final mixBox = Container( final mixBox = Container(
child: new Row( child: new Row(
@@ -216,41 +217,35 @@ class _BoxEditorState extends State<BoxEditor> {
), ),
); );
final fcsIDBox = Container( final fcsIDBox = Row(
padding: EdgeInsets.only(left: 10), children: <Widget>[
child: Row( Expanded(
children: <Widget>[ child: DisplayText(
Expanded( text: user != null ? user.fcsID : "",
child: DisplayText( labelTextKey: "box.fcs.id",
text: user != null ? user.fcsID : "", icon: FcsIDIcon(),
labelTextKey: "box.fcs.id", )),
icon: FcsIDIcon(), IconButton(
)), icon: Icon(Icons.search, color: primaryColor),
IconButton( onPressed: () => searchUser(context, callbackUserSelect: (u) {
icon: Icon(Icons.search, color: primaryColor), setState(() {
onPressed: () => searchUser(context, callbackUserSelect: (u) { this.user = u;
setState(() { });
this.user = u; })),
}); ],
})), );
],
));
final phoneNumberBox = Container( final phoneNumberBox = DisplayText(
padding: EdgeInsets.only(left: 10), text: user != null ? user.phoneNumber : "",
child: DisplayText( labelTextKey: "box.phone",
text: user != null ? user.phoneNumber : "", iconData: Icons.phone,
labelTextKey: "box.phone", );
iconData: Icons.phone,
));
final namebox = Container( final namebox = DisplayText(
padding: EdgeInsets.only(left: 10), text: user != null ? user.name : "",
child: DisplayText( labelTextKey: "box.name",
text: user != null ? user.name : "", iconData: Icons.person,
labelTextKey: "box.name", );
iconData: Icons.person,
));
final packageTitle = Container( final packageTitle = Container(
padding: EdgeInsets.only(right: 10.0, top: 20), padding: EdgeInsets.only(right: 10.0, top: 20),
@@ -485,7 +480,7 @@ class _BoxEditorState extends State<BoxEditor> {
title: widget.box == null title: widget.box == null
? LocalText( ? LocalText(
context, context,
"boxes.new", "boxes.create.title",
fontSize: 20, fontSize: 20,
color: primaryColor, color: primaryColor,
) )
@@ -496,44 +491,36 @@ class _BoxEditorState extends State<BoxEditor> {
color: primaryColor, color: primaryColor,
), ),
), ),
body: ListView( body: Padding(
shrinkWrap: true, padding: const EdgeInsets.all(10.0),
children: [ child: ListView(
widget.box == null shrinkWrap: true,
? Container() children: [
: Center(child: nameWidget(_box.packageNumber)), widget.box == null
Container( ? Container()
padding: EdgeInsets.only(top: 10), : Center(child: nameWidget(_box.packageNumber)),
child: TitleWithAddButton( SizedBox(
titleKey: "box.shipment_info", height: 10,
), ),
), LocalTitle(textKey: "box.type.title"),
Column( LocalRadioButtons(
children: [ values: boxModel.cartonTypes,
shipmentBox, selectedValue: _selectedCartonType,
SizedBox( callback: (v) {
height: 10, print(v);
), setState(() {
fcsIDBox, _selectedCartonType = v;
phoneNumberBox, });
namebox, }),
mixBox, LocalTitle(textKey: "box.shipment_info"),
SizedBox( shipmentBox,
height: 10, SizedBox(
), height: 10,
],
),
Divider(),
Container(
padding: EdgeInsets.only(top: 10, left: 10),
child: TitleWithAddButton(
iconData: Octicons.package,
titleKey: "box.packages",
), ),
), fcsIDBox,
Container( namebox,
padding: EdgeInsets.only(left: 10, right: 10), LocalTitle(textKey: "box.packages"),
child: Column( Column(
children: [ children: [
packageTitle, packageTitle,
Divider( Divider(
@@ -545,117 +532,111 @@ class _BoxEditorState extends State<BoxEditor> {
SizedBox(height: 10), SizedBox(height: 10),
], ],
), ),
), Divider(),
Divider(), Container(
Container( padding: EdgeInsets.only(left: 10),
padding: EdgeInsets.only(left: 10), child: TitleWithAddButton(
child: TitleWithAddButton( iconData: MaterialCommunityIcons.briefcase_check,
iconData: MaterialCommunityIcons.briefcase_check, titleKey: "box.cargo_type",
titleKey: "box.cargo_type", onTap: () async {
onTap: () async { Cargo cargo = await Navigator.push<Cargo>(
Cargo cargo = await Navigator.push<Cargo>( context, BottomUpPageRoute(CargoTypeEditor()));
context, if (cargo != null) {
CupertinoPageRoute( setState(() {
builder: (context) => CargoTypeEditor())); _box.cargoTypes.add(cargo);
if (cargo != null) { });
setState(() { }
_box.cargoTypes.add(cargo); }),
});
}
}),
),
Container(
padding: EdgeInsets.only(left: 10, right: 10),
child: Column(
children: [
cargoTitle,
Divider(
color: Colors.grey[400],
),
Column(
children: getCargoRowList(),
),
SizedBox(height: 10),
],
), ),
), Container(
Divider(), padding: EdgeInsets.only(left: 10, right: 10),
SizedBox( child: Column(
height: 10, children: [
), cargoTitle,
TitleWithAddButton( Divider(
titleKey: "box.dimension", color: Colors.grey[400],
), ),
Column( Column(
children: [ children: getCargoRowList(),
shipmentWeightBox, ),
widthBox, SizedBox(height: 10),
heightBox, ],
lengthBox, ),
SizedBox(height: 25), ),
], Divider(),
), SizedBox(
Divider(), height: 10,
Container( ),
padding: EdgeInsets.only(left: 10, right: 10), TitleWithAddButton(
child: DefaultDeliveryAddress( titleKey: "box.dimension",
deliveryAddress: _deliveryAddress, ),
onTap: () async { shipmentWeightBox,
DeliveryAddress d = await Navigator.push<DeliveryAddress>( widthBox,
context, heightBox,
CupertinoPageRoute( lengthBox,
builder: (context) => DeliveryAddressSelection( SizedBox(height: 25),
deliveryAddress: _deliveryAddress, Divider(),
)), Container(
); padding: EdgeInsets.only(left: 10, right: 10),
if (d == null) return; child: DefaultDeliveryAddress(
setState(() { deliveryAddress: _deliveryAddress,
this._deliveryAddress = d; labelKey: "box.delivery_address",
}); onTap: () async {
}), DeliveryAddress d = await Navigator.push<DeliveryAddress>(
), context,
SizedBox(height: 15), BottomUpPageRoute(DeliveryAddressSelection(
Divider(), deliveryAddress: _deliveryAddress,
isNew )),
? Container() );
: Column( if (d == null) return;
children: [ setState(() {
Padding( this._deliveryAddress = d;
padding: EdgeInsets.only(top: 10), });
child: TitleWithAddButton( }),
titleKey: "box.status", ),
SizedBox(height: 15),
Divider(),
isNew
? Container()
: Column(
children: [
Padding(
padding: EdgeInsets.only(top: 10),
child: TitleWithAddButton(
titleKey: "box.status",
),
), ),
), Container(
Container( height: 230,
height: 230, padding: EdgeInsets.only(left: 10),
padding: EdgeInsets.only(left: 10), child: isNew
child: isNew ? Container()
? Container() : Timeline(
: Timeline( children: _models(),
children: _models(), position: TimelinePosition.Left),
position: TimelinePosition.Left), ),
), ],
], ),
), isNew ? Container() : Divider(),
isNew ? Container() : Divider(), SizedBox(
SizedBox( height: 10,
height: 10, ),
), widget.box == null
widget.box == null ? createBtn
? createBtn : Container(
: Container( child: Column(
child: Column( children: <Widget>[
children: <Widget>[ completeBtn,
completeBtn, widget.box.status == 'Arrived'
widget.box.status == 'Arrived' ? deliveryBtn
? deliveryBtn : Container(),
: Container(), ],
], )),
)), SizedBox(
SizedBox( height: 20,
height: 20, ),
), ],
], ),
), ),
), ),
); );

7
lib/pages/box/model/box_model.dart
View File

@@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:fcs/domain/constants.dart';
import 'package:fcs/domain/entities/box.dart'; import 'package:fcs/domain/entities/box.dart';
import 'package:fcs/domain/entities/cargo.dart'; import 'package:fcs/domain/entities/cargo.dart';
import 'package:fcs/domain/entities/package.dart'; import 'package:fcs/domain/entities/package.dart';
@@ -295,6 +296,12 @@ class BoxModel extends BaseModel {
}); });
} }
List<String> cartonTypes = [
carton_from_packages,
carton_from_shipments,
carton_mix_box
];
void initUser(user) { void initUser(user) {
super.initUser(user); super.initUser(user);
} }

2
lib/pages/customer/invitation_create.dart
View File

@@ -55,7 +55,7 @@ class _InvitationCreateState extends State<InvitationCreate> {
), ),
title: LocalText( title: LocalText(
context, context,
"invitation.new", "invitation.form.title",
fontSize: 20, fontSize: 20,
color: primaryColor, color: primaryColor,
), ),

297
lib/pages/invoice/invoice_editor.dart
View File

@@ -18,6 +18,7 @@ import 'package:fcs/pages/widgets/display_text.dart';
import 'package:fcs/pages/widgets/input_text.dart'; import 'package:fcs/pages/widgets/input_text.dart';
import 'package:fcs/pages/widgets/local_dropdown.dart'; import 'package:fcs/pages/widgets/local_dropdown.dart';
import 'package:fcs/pages/widgets/local_text.dart'; import 'package:fcs/pages/widgets/local_text.dart';
import 'package:fcs/pages/widgets/local_title.dart';
import 'package:fcs/pages/widgets/multi_img_controller.dart'; import 'package:fcs/pages/widgets/multi_img_controller.dart';
import 'package:fcs/pages/widgets/multi_img_file.dart'; import 'package:fcs/pages/widgets/multi_img_file.dart';
import 'package:fcs/pages/widgets/my_data_table.dart'; import 'package:fcs/pages/widgets/my_data_table.dart';
@@ -197,181 +198,141 @@ class _InvoiceEditorState extends State<InvoiceEditor> {
title: LocalText(context, 'invoice.form.title', title: LocalText(context, 'invoice.form.title',
color: primaryColor, fontSize: 20), color: primaryColor, fontSize: 20),
), ),
body: Card( body: Padding(
child: Column( padding: const EdgeInsets.all(8.0),
child: ListView(
children: <Widget>[ children: <Widget>[
Expanded( LocalTitle(textKey: "package.create.name"),
child: Padding( DisplayText(
padding: const EdgeInsets.all(10.0), labelTextKey: 'invoice.date',
child: ListView(children: <Widget>[ iconData: Icons.date_range,
DisplayText( text: _dateController.text),
labelTextKey: 'invoice.date', widget.invoice == null
iconData: Icons.date_range, ? Container()
text: _dateController.text), : DisplayText(
widget.invoice == null labelTextKey: 'invoice.number',
? Container() iconData: FontAwesomeIcons.fileInvoice,
: DisplayText( text: _invoiceNumberController.text),
labelTextKey: 'invoice.number', widget.invoice == null
iconData: FontAwesomeIcons.fileInvoice, ? Row(
text: _invoiceNumberController.text),
widget.invoice == null
? Row(
children: <Widget>[
Expanded(
child: DisplayText(
text: user != null ? user.name : "",
labelTextKey: "invoice.customer_name",
iconData: Feather.user,
)),
IconButton(
icon: Icon(Icons.search, color: primaryColor),
onPressed: () => searchUser(context,
callbackUserSelect: (u) {
setState(() {
this.user = u;
});
})),
],
)
: DisplayText(
text: _nameController.text,
iconData: Feather.user,
labelTextKey: 'invoice.customer_name'),
InputText(
controller: _handlingFeeController,
iconData: FontAwesomeIcons.moneyBill,
labelTextKey: 'invoice.handling_fee'),
SizedBox(height: 15),
discountBox,
widget.invoice == null
? Container()
: DisplayText(
text: _statusController.text,
iconData: Icons.av_timer,
labelTextKey: 'invoice.status'),
SizedBox(height: 30),
Container(
child: Row(
children: [
Icon(MaterialCommunityIcons.package,
color: primaryColor),
SizedBox(width: 10),
LocalText(
context,
"invoice.box_info",
color: Colors.grey,
fontSize: 20,
fontWeight: FontWeight.w700,
),
],
),
),
Container(
padding: const EdgeInsets.only(top: 15),
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: MyDataTable(
headingRowHeight: 40,
columnSpacing: 20,
columns: [
MyDataColumn(
label: Text(''),
),
MyDataColumn(
label: LocalText(
context,
"invoice.box.number",
color: Colors.grey,
),
),
MyDataColumn(
label: Text(
getLocalString(context, "invoice.box.length") +
' x ' +
getLocalString(context, "invoice.box.width") +
' x ' +
getLocalString(context, "invoice.box.height"),
),
),
],
rows: getBoxRow(context),
),
),
),
SizedBox(height: 40),
Container(
child: Row(
children: [
Icon(MaterialCommunityIcons.briefcase_check,
color: primaryColor),
SizedBox(width: 10),
LocalText(
context,
"invoice.cargo_type",
color: Colors.grey,
fontSize: 20,
fontWeight: FontWeight.w700,
),
],
),
),
Container(
padding: const EdgeInsets.only(top: 10),
child: Column(children: getCargoTableByBox(context)),
),
SizedBox(height: 20),
Container(
padding: EdgeInsets.only(top: 5, left: 18),
child: Row(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: LocalText(context, 'invoice.payment_method', child: DisplayText(
fontSize: 16, text: user != null ? user.name : "",
color: Colors.grey, labelTextKey: "invoice.customer_name",
fontWeight: FontWeight.bold), iconData: Feather.user,
), )),
IconButton(
icon: Icon(Icons.search, color: primaryColor),
onPressed: () =>
searchUser(context, callbackUserSelect: (u) {
setState(() {
this.user = u;
});
})),
],
)
: DisplayText(
text: _nameController.text,
iconData: Feather.user,
labelTextKey: 'invoice.customer_name'),
InputText(
controller: _handlingFeeController,
iconData: FontAwesomeIcons.moneyBill,
labelTextKey: 'invoice.handling_fee'),
SizedBox(height: 15),
discountBox,
widget.invoice == null
? Container()
: DisplayText(
text: _statusController.text,
iconData: Icons.av_timer,
labelTextKey: 'invoice.status'),
SizedBox(height: 30),
LocalTitle(textKey: "invoice.box_info"),
SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: MyDataTable(
headingRowHeight: 40,
// columnSpacing: 20,
columns: [
MyDataColumn(
label: Text(''),
),
MyDataColumn(
label: LocalText(
context,
"invoice.box.number",
color: Colors.grey,
),
),
MyDataColumn(
label: Text(
getLocalString(context, "invoice.box.length") +
' x ' +
getLocalString(context, "invoice.box.width") +
' x ' +
getLocalString(context, "invoice.box.height"),
),
),
],
rows: getBoxRow(context),
),
),
SizedBox(height: 40),
LocalTitle(textKey: "invoice.cargo_type"),
Column(children: getCargoTableByBox(context)),
SizedBox(height: 20),
Container(
padding: EdgeInsets.only(top: 5, left: 18),
child: Row(
children: <Widget>[
Expanded(
child: LocalText(context, 'invoice.payment_method',
fontSize: 16,
color: Colors.grey,
fontWeight: FontWeight.bold),
),
Container(
width: 150.0,
child: DropdownButtonFormField(
icon: Icon(Icons.edit),
value: paymentMethod,
items: paymentMethodModel.paymentMethods
.map((e) => DropdownMenuItem(
child: Text(e.name), value: e.name))
.toList(),
onChanged: (selected) => {},
),
),
],
),
),
SizedBox(height: 30),
!isNew
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container( Container(
width: 150.0, child: Row(
child: DropdownButtonFormField( children: [
icon: Icon(Icons.edit), Icon(Icons.receipt, color: primaryColor),
value: paymentMethod, SizedBox(width: 10),
items: paymentMethodModel.paymentMethods LocalText(
.map((e) => DropdownMenuItem( context,
child: Text(e.name), value: e.name)) "invoice.payment_attachment",
.toList(), color: Colors.grey,
onChanged: (selected) => {}, fontSize: 20,
fontWeight: FontWeight.w700,
),
],
), ),
), ),
Spacer(),
Icon(Icons.add, color: primaryColor),
], ],
), )
), : Container(),
SizedBox(height: 30),
!isNew
? Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Container(
child: Row(
children: [
Icon(Icons.receipt, color: primaryColor),
SizedBox(width: 10),
LocalText(
context,
"invoice.payment_attachment",
color: Colors.grey,
fontSize: 20,
fontWeight: FontWeight.w700,
),
],
),
),
Spacer(),
Icon(Icons.add, color: primaryColor),
],
)
: Container()
]),
)),
widget.invoice == null widget.invoice == null
? fcsButton( ? fcsButton(
context, getLocalString(context, 'invoice.btn_create')) context, getLocalString(context, 'invoice.btn_create'))

2
lib/pages/payment_methods/payment_method_editor.dart
View File

@@ -64,7 +64,7 @@ class _PaymentMethodEditorState extends State<PaymentMethodEditor> {
), ),
title: LocalText( title: LocalText(
context, context,
isNew ? "pm.new" : "pm.update", isNew ? "pm.form.new" : "pm.update",
fontSize: 20, fontSize: 20,
color: primaryColor, color: primaryColor,
), ),

2
lib/pages/receiving/receiving_editor.dart
View File

@@ -144,7 +144,7 @@ class _ReceivingEditorState extends State<ReceivingEditor> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
title: LocalText( title: LocalText(
context, context,
_isNew ? "receiving.new" : "receiving.update", _isNew ? "receiving.create" : "receiving.update",
fontSize: 20, fontSize: 20,
color: primaryColor, color: primaryColor,
), ),

3
lib/pages/shipment/shipment_box_editor.dart
View File

@@ -72,7 +72,6 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
double l = double.parse(_lengthCtl.text, (s) => 0); double l = double.parse(_lengthCtl.text, (s) => 0);
double w = double.parse(_widthCtl.text, (s) => 0); double w = double.parse(_widthCtl.text, (s) => 0);
double h = double.parse(_heightCtl.text, (s) => 0); double h = double.parse(_heightCtl.text, (s) => 0);
print("$l $w $h");
setState(() { setState(() {
shipmentWeight = l * w * h / volumetricRatio; shipmentWeight = l * w * h / volumetricRatio;
}); });
@@ -129,7 +128,7 @@ class _ShipmentBoxEditorState extends State<ShipmentBoxEditor> {
backgroundColor: Colors.white, backgroundColor: Colors.white,
title: LocalText( title: LocalText(
context, context,
_isNew ? "boxes.new" : "box.edit.title", _isNew ? "boxes.create.title" : "box.edit.title",
fontSize: 20, fontSize: 20,
color: primaryColor, color: primaryColor,
), ),

1
lib/pages/shipment/shipment_editor.dart
View File

@@ -242,7 +242,6 @@ class _ShipmentEditorState extends State<ShipmentEditor> {
}, },
), ),
), ),
Column( Column(
children: getBoxList(context, boxModel.boxes), children: getBoxList(context, boxModel.boxes),
), ),