From ccc23d355dffc28c5bb709e8e5dd8444a7445a24 Mon Sep 17 00:00:00 2001
From: voltan <djvoltan@gmail.com>
Date: Sat, 12 Dec 2015 15:11:14 +0330
Subject: [PATCH] Update module ui / ux

---
 locale/en/admin.mo            | Bin 471 -> 474 bytes
 locale/en/admin.po            |   6 +-
 locale/en/block.mo            | Bin 424 -> 424 bytes
 locale/en/block.po            |   4 +-
 locale/en/default.mo          | Bin 473 -> 473 bytes
 locale/en/default.po          | 352 ++++++++++++++++---------------
 locale/fa/admin.mo            | Bin 12498 -> 12498 bytes
 locale/fa/admin.po            |   4 +-
 locale/fa/block.mo            | Bin 2798 -> 2798 bytes
 locale/fa/block.po            |   4 +-
 locale/fa/default.mo          | Bin 26499 -> 26918 bytes
 locale/fa/default.po          | 380 +++++++++++++++++++---------------
 template/front/checkout.phtml |  13 +-
 13 files changed, 411 insertions(+), 352 deletions(-)

diff --git a/locale/en/admin.mo b/locale/en/admin.mo
index e8b291d45122dbfcafa4975f460c4a80cc05ea65..3cf8b1bd6cfd78e8e941afc30d7598e39a20df33 100644
GIT binary patch
delta 42
ycmcc4e2aO43gd!_ssVh4M!JSZ3Wlau2IkrZ#uJ;}nBzl(C!Q>3G@WeAI12y_PYjy?

delta 38
ucmcb`e4TlM3gg^~ssVfkmbwNO3Wi2jrk2_UCKH?8CY~u~G@0zcI12#bL<^$;

diff --git a/locale/en/admin.po b/locale/en/admin.po
index 681cbbe..b71d0db 100644
--- a/locale/en/admin.po
+++ b/locale/en/admin.po
@@ -1,15 +1,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi order module\n"
-"POT-Creation-Date: 2015-09-08 12:59+0430\n"
+"POT-Creation-Date: 2015-12-12 15:07+0330\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Pi\n"
-"Language: en\n"
+"Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _a;_t\n"
 "X-Poedit-Basepath: ../..\n"
diff --git a/locale/en/block.mo b/locale/en/block.mo
index 99429329a95d77f6b31e4a4c9c2b06bca3260379..12463617e55ebd3638a92e753f94c24fcdba3742 100644
GIT binary patch
delta 30
lcmZ3%yn=Z`37?^nuAz~Fp{bRDxwe7v#HO8$rju<La{z#G2u}b2

delta 30
lcmZ3%yn=Z`37>(bu7QPup|O>LfwqCk#HO8$CX;O#a{z$c2vGn4

diff --git a/locale/en/block.po b/locale/en/block.po
index b0f2045..cd96bf4 100644
--- a/locale/en/block.po
+++ b/locale/en/block.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi shop module\n"
-"POT-Creation-Date: 2015-09-08 13:00+0430\n"
+"POT-Creation-Date: 2015-12-12 15:07+0330\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Pi\n"
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _b\n"
 "X-Poedit-Basepath: ../..\n"
diff --git a/locale/en/default.mo b/locale/en/default.mo
index d7a678f64014a2be0d53196cfe287fc4e2244e97..bf0354a9e1fc7d145e3979db82d68ab681047262 100644
GIT binary patch
delta 30
mcmcb~e3N-XIiI1CuAz~Fp{bRDxwe7v#MYgRrjzX%X8{0=B?#yM

delta 30
mcmcb~e3N-XIiG>0u7QPup|O>LfwqCk#MYgRCX?+MX8{0=kO=Ak

diff --git a/locale/en/default.po b/locale/en/default.po
index cfe6f5c..50a5c2b 100644
--- a/locale/en/default.po
+++ b/locale/en/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi payment module\n"
-"POT-Creation-Date: 2015-09-08 13:00+0430\n"
+"POT-Creation-Date: 2015-12-12 15:07+0330\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Pi\n"
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e\n"
 "X-Poedit-Basepath: ../..\n"
@@ -28,19 +28,19 @@ msgstr ""
 msgid "Please login for create invoice"
 msgstr ""
 
-#: src/Api/Invoice.php:114 src/Api/Invoice.php:210
+#: src/Api/Invoice.php:116 src/Api/Invoice.php:213
 msgid "Your invoice create successfully"
 msgstr ""
 
-#: src/Api/Invoice.php:231
+#: src/Api/Invoice.php:234
 msgid "Not allowed to create invoice by this user credit"
 msgstr ""
 
-#: src/Api/Invoice.php:380
+#: src/Api/Invoice.php:383
 msgid "Not pay"
 msgstr ""
 
-#: src/Api/Invoice.php:381
+#: src/Api/Invoice.php:384
 msgid "Not canceled"
 msgstr ""
 
@@ -56,9 +56,9 @@ msgstr ""
 msgid "Finished"
 msgstr ""
 
-#: src/Api/Notification.php:175 src/Api/Order.php:133
+#: src/Api/Notification.php:175 src/Api/Order.php:124
 #: src/Form/InvoiceSettingForm.php:66 src/Form/OrderSettingForm.php:63
-#: src/Form/UpdatePaymentForm.php:44 template/admin/invoice-index.phtml:64
+#: src/Form/UpdatePaymentForm.php:44 template/admin/invoice-index.phtml:74
 #: template/admin/invoice-print.phtml:65 template/admin/invoice-view.phtml:10
 #: template/admin/log-index.phtml:63 template/admin/order-view.phtml:209
 #: template/admin/order-view.phtml:310 template/front/detail.phtml:15
@@ -67,7 +67,7 @@ msgstr ""
 msgid "Paid"
 msgstr ""
 
-#: src/Api/Notification.php:184 src/Api/Order.php:150
+#: src/Api/Notification.php:184 src/Api/Order.php:141
 #: src/Form/OrderSettingForm.php:76 src/Form/UpdateDeliveryForm.php:44
 #: template/front/detail.phtml:25 template/front/detail.phtml:29
 #: template/front/detail.phtml:33 template/front/detail.phtml:37
@@ -75,7 +75,7 @@ msgstr ""
 msgid "Packed"
 msgstr ""
 
-#: src/Api/Notification.php:189 src/Api/Order.php:155
+#: src/Api/Notification.php:189 src/Api/Order.php:146
 #: src/Form/OrderSettingForm.php:77 src/Form/UpdateDeliveryForm.php:45
 #: template/front/detail.phtml:26 template/front/detail.phtml:30
 #: template/front/detail.phtml:34 template/front/detail.phtml:38
@@ -83,14 +83,14 @@ msgstr ""
 msgid "Posted"
 msgstr ""
 
-#: src/Api/Notification.php:194 src/Api/Order.php:160
+#: src/Api/Notification.php:194 src/Api/Order.php:151
 #: src/Form/OrderSettingForm.php:78 src/Form/UpdateDeliveryForm.php:46
 #: template/front/detail.phtml:27 template/front/detail.phtml:31
 #: template/front/detail.phtml:35 template/front/detail.phtml:39
 msgid "Delivered"
 msgstr ""
 
-#: src/Api/Notification.php:199 src/Api/Order.php:165
+#: src/Api/Notification.php:199 src/Api/Order.php:156
 #: src/Form/OrderSettingForm.php:79 src/Form/UpdateDeliveryForm.php:47
 #: template/front/detail.phtml:43
 msgid "Back eaten"
@@ -106,77 +106,77 @@ msgstr ""
 msgid "Dear %s %s, Your order by %s ID %s"
 msgstr ""
 
-#: src/Api/Order.php:86 src/Api/Order.php:145 src/Form/OrderSettingForm.php:44
+#: src/Api/Order.php:77 src/Api/Order.php:136 src/Form/OrderSettingForm.php:44
 #: src/Form/OrderSettingForm.php:75 src/Form/UpdateDeliveryForm.php:43
 #: src/Form/UpdateOrderForm.php:43
 msgid "Not processed"
 msgstr ""
 
-#: src/Api/Order.php:91 src/Form/OrderSettingForm.php:45
+#: src/Api/Order.php:82 src/Form/OrderSettingForm.php:45
 #: src/Form/UpdateOrderForm.php:44
 msgid "Orders validated"
 msgstr ""
 
-#: src/Api/Order.php:96 src/Form/OrderSettingForm.php:46
+#: src/Api/Order.php:87 src/Form/OrderSettingForm.php:46
 #: src/Form/UpdateOrderForm.php:45
 msgid "Orders pending"
 msgstr ""
 
-#: src/Api/Order.php:101 src/Form/OrderSettingForm.php:47
+#: src/Api/Order.php:92 src/Form/OrderSettingForm.php:47
 #: src/Form/UpdateOrderForm.php:46
 msgid "Orders failed"
 msgstr ""
 
-#: src/Api/Order.php:106 src/Form/OrderSettingForm.php:48
+#: src/Api/Order.php:97 src/Form/OrderSettingForm.php:48
 #: src/Form/UpdateOrderForm.php:47
 msgid "Orders cancelled"
 msgstr ""
 
-#: src/Api/Order.php:111 src/Form/OrderSettingForm.php:49
+#: src/Api/Order.php:102 src/Form/OrderSettingForm.php:49
 #: src/Form/UpdateOrderForm.php:48
 msgid "Fraudulent orders"
 msgstr ""
 
-#: src/Api/Order.php:116 src/Form/OrderSettingForm.php:50
+#: src/Api/Order.php:107 src/Form/OrderSettingForm.php:50
 #: src/Form/UpdateOrderForm.php:49
 msgid "Orders finished"
 msgstr ""
 
-#: src/Api/Order.php:128 src/Form/InvoiceSettingForm.php:67
+#: src/Api/Order.php:119 src/Form/InvoiceSettingForm.php:67
 #: src/Form/OrderSettingForm.php:62 src/Form/UpdatePaymentForm.php:43
 #: template/front/detail.phtml:17
 msgid "UnPaid"
 msgstr ""
 
-#: src/Api/Order.php:133
+#: src/Api/Order.php:124
 msgid "Paid perpayment"
 msgstr ""
 
-#: src/Api/Order.php:182 src/Controller/Admin/OrderController.php:287
+#: src/Api/Order.php:173 src/Controller/Admin/OrderController.php:287
 msgid "Not Paid"
 msgstr ""
 
-#: src/Api/Order.php:184 src/Controller/Admin/OrderController.php:334
+#: src/Api/Order.php:175 src/Controller/Admin/OrderController.php:334
 msgid "Not Delivery"
 msgstr ""
 
-#: src/Api/Order.php:186 src/Controller/Admin/OrderController.php:236
+#: src/Api/Order.php:177 src/Controller/Admin/OrderController.php:236
 msgid "Not Finish"
 msgstr ""
 
-#: src/Api/Order.php:188
+#: src/Api/Order.php:179
 msgid "Not Start"
 msgstr ""
 
-#: src/Api/Order.php:190
+#: src/Api/Order.php:181
 msgid "Not End"
 msgstr ""
 
-#: src/Controller/Admin/DeliveryController.php:94
+#: src/Controller/Admin/DeliveryController.php:101
 msgid "Delivery data saved successfully."
 msgstr ""
 
-#: src/Controller/Admin/DeliveryController.php:114
+#: src/Controller/Admin/DeliveryController.php:119
 msgid "Add a delivery"
 msgstr ""
 
@@ -239,22 +239,22 @@ msgstr ""
 msgid "Update delivery"
 msgstr ""
 
-#: src/Controller/Front/CheckoutController.php:34
-#: src/Controller/Front/CheckoutController.php:337
+#: src/Controller/Front/CheckoutController.php:36
+#: src/Controller/Front/CheckoutController.php:393
 msgid "Your cart is empty."
 msgstr ""
 
-#: src/Controller/Front/CheckoutController.php:39
-#: src/Controller/Front/CheckoutController.php:342
+#: src/Controller/Front/CheckoutController.php:41
+#: src/Controller/Front/CheckoutController.php:398
 msgid "So sorry, At this moment order is inactive"
 msgstr ""
 
-#: src/Controller/Front/CheckoutController.php:353
+#: src/Controller/Front/CheckoutController.php:409
 msgid ""
 "Your installment plan save, please complete your information and payment."
 msgstr ""
 
-#: src/Controller/Front/CheckoutController.php:469
+#: src/Controller/Front/CheckoutController.php:532
 #: src/Form/Element/Gateway.php:28
 msgid "Offline"
 msgstr ""
@@ -348,7 +348,7 @@ msgstr ""
 
 #: src/Form/DeliveryForm.php:61 src/Form/LocationForm.php:72
 #: template/admin/invoice-print.phtml:63 template/admin/invoice-view.phtml:8
-#: template/admin/invoice-view.phtml:128 template/admin/order-index.phtml:17
+#: template/admin/invoice-view.phtml:128 template/admin/order-index.phtml:30
 #: template/admin/order-view.phtml:157 template/admin/order-view.phtml:171
 #: template/admin/order-view.phtml:185 template/front/invoice-print.phtml:63
 #: template/front/invoice.phtml:44
@@ -371,10 +371,11 @@ msgstr ""
 msgid "Private"
 msgstr ""
 
-#: src/Form/DeliveryForm.php:75 src/Form/OrderForm.php:316
-#: src/Form/OrderForm.php:343 src/Form/OrderForm.php:374
-#: src/Form/UpdatePaymentForm.php:53 template/admin/log-index.phtml:9
-#: template/admin/order-view.phtml:177
+#: src/Form/DeliveryForm.php:75 src/Form/OrderForm.php:330
+#: src/Form/OrderForm.php:358 src/Form/OrderForm.php:388
+#: src/Form/OrderSimpleForm.php:293 src/Form/OrderSimpleForm.php:321
+#: src/Form/OrderSimpleForm.php:351 src/Form/UpdatePaymentForm.php:53
+#: template/admin/log-index.phtml:9 template/admin/order-view.phtml:177
 msgid "Adapter"
 msgstr ""
 
@@ -383,6 +384,25 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
+#: src/Form/Element/Delivery.php:36 src/Form/LocationForm.php:106
+#: template/admin/invoice-print.phtml:134 template/admin/order-view.phtml:197
+#: template/admin/order-view.phtml:199 template/admin/order-view.phtml:222
+#: template/admin/order-view.phtml:265 template/front/checkout.phtml:198
+#: template/front/detail.phtml:179 template/front/detail.phtml:221
+#: template/front/invoice-print.phtml:134 template/front/invoice.phtml:112
+#: template/front/list.phtml:82 template/front/list.phtml:104
+msgid "Price"
+msgstr ""
+
+#: src/Form/Element/Delivery.php:38 template/admin/order-view.phtml:161
+#: template/admin/order-view.phtml:175 template/admin/order-view.phtml:189
+msgid "Time"
+msgstr ""
+
+#: src/Form/Element/Delivery.php:40 template/front/checkout.phtml:82
+msgid "Days"
+msgstr ""
+
 #: src/Form/InvoiceForm.php:40 template/admin/invoice-update.phtml:96
 #: template/admin/invoice-view.phtml:27 template/admin/order-view.phtml:110
 #: template/front/detail.phtml:148
@@ -401,20 +421,24 @@ msgstr ""
 msgid "Packing price"
 msgstr ""
 
-#: src/Form/InvoiceForm.php:73 template/admin/invoice-update.phtml:108
+#: src/Form/InvoiceForm.php:73
+msgid "Setup price"
+msgstr ""
+
+#: src/Form/InvoiceForm.php:84 template/admin/invoice-update.phtml:108
 #: template/admin/invoice-view.phtml:39 template/admin/order-view.phtml:122
 #: template/front/detail.phtml:160
 msgid "Vat price"
 msgstr ""
 
-#: src/Form/InvoiceForm.php:85 template/admin/invoice-index.phtml:16
+#: src/Form/InvoiceForm.php:96 template/admin/invoice-index.phtml:26
 #: template/admin/invoice-print.phtml:70 template/admin/order-view.phtml:267
 #: template/front/detail.phtml:223 template/front/invoice-print.phtml:70
 #: template/front/invoice.phtml:50 template/front/list.phtml:106
 msgid "Due date"
 msgstr ""
 
-#: src/Form/InvoiceForm.php:100
+#: src/Form/InvoiceForm.php:111
 msgid "Save"
 msgstr ""
 
@@ -462,29 +486,22 @@ msgstr ""
 msgid "Is active %s ?"
 msgstr ""
 
-#: src/Form/LocationForm.php:106 template/admin/invoice-print.phtml:134
-#: template/admin/order-view.phtml:197 template/admin/order-view.phtml:199
-#: template/admin/order-view.phtml:222 template/admin/order-view.phtml:265
-#: template/front/detail.phtml:179 template/front/detail.phtml:221
-#: template/front/invoice-print.phtml:134 template/front/invoice.phtml:112
-#: template/front/list.phtml:82 template/front/list.phtml:104
-msgid "Price"
-msgstr ""
-
 #: src/Form/LocationForm.php:117
 msgid "Time ( days )"
 msgstr ""
 
 #: src/Form/OrderForm.php:52 src/Form/OrderSettingForm.php:153
+#: src/Form/OrderSimpleForm.php:51
 msgid "First name"
 msgstr ""
 
 #: src/Form/OrderForm.php:64 src/Form/OrderSettingForm.php:164
+#: src/Form/OrderSimpleForm.php:62
 msgid "Last name"
 msgstr ""
 
 #: src/Form/OrderForm.php:78 src/Form/OrderSettingForm.php:142
-#: template/admin/invoice-print.phtml:84
+#: src/Form/OrderSimpleForm.php:75 template/admin/invoice-print.phtml:84
 #: template/admin/invoice-update.phtml:13 template/admin/invoice-view.phtml:58
 #: template/admin/order-print.phtml:42 template/admin/order-view.phtml:27
 #: template/front/detail.phtml:65 template/front/invoice-print.phtml:84
@@ -493,7 +510,7 @@ msgid "ID number"
 msgstr ""
 
 #: src/Form/OrderForm.php:92 src/Form/OrderSettingForm.php:109
-#: template/admin/invoice-print.phtml:96
+#: src/Form/OrderSimpleForm.php:88 template/admin/invoice-print.phtml:96
 #: template/admin/invoice-update.phtml:41 template/admin/invoice-view.phtml:86
 #: template/admin/order-print.phtml:52 template/admin/order-view.phtml:55
 #: template/admin/order-view.phtml:146 template/front/detail.phtml:93
@@ -502,51 +519,53 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: src/Form/OrderForm.php:106 template/admin/invoice-print.phtml:88
-#: template/admin/invoice-update.phtml:45 template/admin/invoice-view.phtml:90
-#: template/admin/order-print.phtml:56 template/admin/order-view.phtml:59
+#: src/Form/OrderForm.php:106 src/Form/OrderSimpleForm.php:101
+#: template/admin/invoice-print.phtml:88 template/admin/invoice-update.phtml:45
+#: template/admin/invoice-view.phtml:90 template/admin/order-print.phtml:56
+#: template/admin/order-view.phtml:59 template/front/checkout.phtml:137
 #: template/front/detail.phtml:97 template/front/invoice-print.phtml:88
 #: template/front/invoice.phtml:67 template/front/list.phtml:45
 msgid "Phone"
 msgstr ""
 
 #: src/Form/OrderForm.php:120 src/Form/OrderSettingForm.php:98
-#: template/admin/invoice-print.phtml:92
+#: src/Form/OrderSimpleForm.php:113 template/admin/invoice-print.phtml:92
 #: template/admin/invoice-update.phtml:49 template/admin/invoice-view.phtml:94
 #: template/admin/order-print.phtml:60 template/admin/order-view.phtml:63
-#: template/front/detail.phtml:101 template/front/invoice-print.phtml:92
-#: template/front/invoice.phtml:71 template/front/list.phtml:49
+#: template/front/checkout.phtml:138 template/front/detail.phtml:101
+#: template/front/invoice-print.phtml:92 template/front/invoice.phtml:71
+#: template/front/list.phtml:49
 msgid "Mobile"
 msgstr ""
 
 #: src/Form/OrderForm.php:135 src/Form/OrderSettingForm.php:186
-#: template/admin/invoice-update.phtml:53 template/admin/order-print.phtml:46
-#: template/admin/order-view.phtml:67 template/front/detail.phtml:105
-#: template/front/list.phtml:53
+#: src/Form/OrderSimpleForm.php:127 template/admin/invoice-update.phtml:53
+#: template/admin/order-print.phtml:46 template/admin/order-view.phtml:67
+#: template/front/detail.phtml:105 template/front/list.phtml:53
 msgid "Company"
 msgstr ""
 
-#: src/Form/OrderForm.php:149
+#: src/Form/OrderForm.php:149 src/Form/OrderSimpleForm.php:140
 msgid "Company id"
 msgstr ""
 
-#: src/Form/OrderForm.php:160
+#: src/Form/OrderForm.php:160 src/Form/OrderSimpleForm.php:150
 msgid "Company vat"
 msgstr ""
 
-#: src/Form/OrderForm.php:173
+#: src/Form/OrderForm.php:173 src/Form/OrderSimpleForm.php:162
 msgid "Delivery address"
 msgstr ""
 
-#: src/Form/OrderForm.php:187 template/admin/invoice-update.phtml:21
-#: template/admin/invoice-view.phtml:66 template/admin/order-print.phtml:87
-#: template/admin/order-view.phtml:35 template/front/detail.phtml:73
-#: template/front/list.phtml:71
+#: src/Form/OrderForm.php:187 src/Form/OrderSimpleForm.php:175
+#: template/admin/invoice-update.phtml:21 template/admin/invoice-view.phtml:66
+#: template/admin/order-print.phtml:87 template/admin/order-view.phtml:35
+#: template/front/detail.phtml:73 template/front/list.phtml:71
 msgid "Address 2"
 msgstr ""
 
 #: src/Form/OrderForm.php:208 src/Form/OrderForm.php:216
-#: template/admin/invoice-print.phtml:117
+#: src/Form/OrderSimpleForm.php:187 template/admin/invoice-print.phtml:117
 #: template/admin/invoice-update.phtml:33 template/admin/invoice-view.phtml:78
 #: template/admin/order-print.phtml:75 template/admin/order-view.phtml:47
 #: template/front/detail.phtml:85 template/front/invoice-print.phtml:117
@@ -554,76 +573,79 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: src/Form/OrderForm.php:230 template/admin/invoice-print.phtml:113
+#: src/Form/OrderForm.php:230 src/Form/OrderSimpleForm.php:199
+#: template/admin/invoice-print.phtml:113
 #: template/admin/invoice-update.phtml:29 template/admin/invoice-view.phtml:74
 #: template/admin/order-print.phtml:71 template/admin/order-view.phtml:43
-#: template/front/detail.phtml:81 template/front/invoice-print.phtml:113
-#: template/front/invoice.phtml:92 template/front/list.phtml:27
+#: template/front/checkout.phtml:129 template/front/detail.phtml:81
+#: template/front/invoice-print.phtml:113 template/front/invoice.phtml:92
+#: template/front/list.phtml:27
 msgid "State"
 msgstr ""
 
 #: src/Form/OrderForm.php:244 src/Form/OrderSettingForm.php:120
-#: template/admin/invoice-print.phtml:109
+#: src/Form/OrderSimpleForm.php:211 template/admin/invoice-print.phtml:109
 #: template/admin/invoice-update.phtml:25 template/admin/invoice-view.phtml:70
 #: template/admin/order-print.phtml:67 template/admin/order-view.phtml:39
-#: template/front/detail.phtml:77 template/front/invoice-print.phtml:109
-#: template/front/invoice.phtml:88 template/front/list.phtml:23
+#: template/front/checkout.phtml:130 template/front/detail.phtml:77
+#: template/front/invoice-print.phtml:109 template/front/invoice.phtml:88
+#: template/front/list.phtml:23
 msgid "City"
 msgstr ""
 
 #: src/Form/OrderForm.php:258 src/Form/OrderSettingForm.php:175
-#: template/admin/invoice-print.phtml:121
+#: src/Form/OrderSimpleForm.php:223 template/admin/invoice-print.phtml:121
 #: template/admin/invoice-update.phtml:37 template/admin/invoice-view.phtml:82
 #: template/admin/order-print.phtml:79 template/admin/order-view.phtml:51
-#: template/front/detail.phtml:89 template/front/invoice-print.phtml:121
-#: template/front/invoice.phtml:100 template/front/list.phtml:35
+#: template/front/checkout.phtml:134 template/front/detail.phtml:89
+#: template/front/invoice-print.phtml:121 template/front/invoice.phtml:100
+#: template/front/list.phtml:35
 msgid "Zip code"
 msgstr ""
 
-#: src/Form/OrderForm.php:273 template/admin/order-view.phtml:193
-#: template/admin/order-view.phtml:205 template/admin/order-view.phtml:224
-#: template/front/detail.phtml:181
+#: src/Form/OrderForm.php:273 src/Form/OrderSimpleForm.php:237
+#: template/admin/order-view.phtml:193 template/admin/order-view.phtml:205
+#: template/admin/order-view.phtml:224 template/front/detail.phtml:181
 msgid "Packing"
 msgstr ""
 
-#: src/Form/OrderForm.php:289 template/front/checkout.phtml:194
+#: src/Form/OrderForm.php:290 src/Form/OrderSimpleForm.php:253
 msgid "Location"
 msgstr ""
 
-#: src/Form/OrderForm.php:302 src/Form/OrderSettingForm.php:72
-#: src/Form/UpdateDeliveryForm.php:41 template/admin/order-index.phtml:19
-#: template/admin/order-view.phtml:183 template/front/checkout.phtml:196
-msgid "Delivery"
+#: src/Form/OrderForm.php:303 src/Form/OrderSimpleForm.php:265
+msgid "Delivery methods"
 msgstr ""
 
-#: src/Form/OrderForm.php:391 template/admin/invoice-update.phtml:122
-#: template/admin/order-view.phtml:136
+#: src/Form/OrderForm.php:405 src/Form/OrderSimpleForm.php:368
+#: template/admin/invoice-update.phtml:122 template/admin/order-view.phtml:136
 msgid "User note"
 msgstr ""
 
-#: src/Form/OrderForm.php:407
+#: src/Form/OrderForm.php:421
 msgid "Update your profile by this informations?"
 msgstr ""
 
-#: src/Form/OrderForm.php:419
+#: src/Form/OrderForm.php:433 src/Form/OrderSimpleForm.php:383
 msgid "Promo"
 msgstr ""
 
-#: src/Form/OrderForm.php:429
+#: src/Form/OrderForm.php:443 src/Form/OrderSimpleForm.php:393
 msgid "Terms & Conditions"
 msgstr ""
 
-#: src/Form/OrderForm.php:430
+#: src/Form/OrderForm.php:444 src/Form/OrderSimpleForm.php:394
 #, php-format
 msgid "Accept %s"
 msgstr ""
 
-#: src/Form/OrderForm.php:445 template/front/invoice.phtml:194
-#: template/front/invoice.phtml:196
+#: src/Form/OrderForm.php:459 src/Form/OrderSimpleForm.php:409
+#: template/front/invoice.phtml:194 template/front/invoice.phtml:196
 msgid "Pay"
 msgstr ""
 
-#: src/Form/OrderForm.php:447
+#: src/Form/OrderForm.php:461 src/Form/OrderSimpleForm.php:411
+#: template/front/checkout.phtml:143
 msgid "Save order"
 msgstr ""
 
@@ -635,12 +657,16 @@ msgid "Order"
 msgstr ""
 
 #: src/Form/OrderSettingForm.php:59 src/Form/UpdatePaymentForm.php:41
-#: template/admin/order-index.phtml:18 template/admin/order-view.phtml:169
-#: template/front/checkout.phtml:198
+#: template/admin/order-index.phtml:31 template/admin/order-view.phtml:169
 msgid "Payment"
 msgstr ""
 
-#: src/Form/OrderSettingForm.php:87 template/admin/order-index.phtml:14
+#: src/Form/OrderSettingForm.php:72 src/Form/UpdateDeliveryForm.php:41
+#: template/admin/order-index.phtml:32 template/admin/order-view.phtml:183
+msgid "Delivery"
+msgstr ""
+
+#: src/Form/OrderSettingForm.php:87 template/admin/order-index.phtml:27
 msgid "Code"
 msgstr ""
 
@@ -941,28 +967,25 @@ msgstr ""
 msgid "List of Delivery methods"
 msgstr ""
 
-#: template/admin/delivery-index.phtml:13
-#: template/admin/invoice-index.phtml:13
+#: template/admin/delivery-index.phtml:13 template/admin/invoice-index.phtml:23
 #: template/admin/location-index.phtml:13 template/admin/log-index.phtml:7
-#: template/admin/order-index.phtml:13 template/admin/order-view.phtml:144
+#: template/admin/order-index.phtml:26 template/admin/order-view.phtml:144
 #: template/admin/order-view.phtml:264 template/front/detail.phtml:220
 #: template/front/list.phtml:80 template/front/list.phtml:103
 msgid "ID"
 msgstr ""
 
-#: template/admin/delivery-index.phtml:15
-#: template/admin/invoice-index.phtml:18
-#: template/admin/location-index.phtml:15 template/admin/order-index.phtml:20
+#: template/admin/delivery-index.phtml:15 template/admin/invoice-index.phtml:28
+#: template/admin/location-index.phtml:15 template/admin/order-index.phtml:33
 #: template/admin/order-view.phtml:269 template/front/detail.phtml:225
 #: template/front/list.phtml:84 template/front/list.phtml:108
 msgid "Action"
 msgstr ""
 
 #: template/admin/delivery-index.phtml:31
-#: template/admin/delivery-index.phtml:33
-#: template/admin/gateway-index.phtml:32 template/admin/gateway-index.phtml:33
-#: template/admin/gateway-index.phtml:40 template/admin/gateway-index.phtml:41
-#: template/admin/location-index.phtml:31
+#: template/admin/delivery-index.phtml:33 template/admin/gateway-index.phtml:32
+#: template/admin/gateway-index.phtml:33 template/admin/gateway-index.phtml:40
+#: template/admin/gateway-index.phtml:41 template/admin/location-index.phtml:31
 #: template/admin/location-index.phtml:33
 msgid "Edit"
 msgstr ""
@@ -971,28 +994,28 @@ msgstr ""
 msgid "No delivery methods is not created yet"
 msgstr ""
 
-#: template/admin/delivery-index.phtml:41
-#: template/admin/invoice-index.phtml:71
+#: template/admin/delivery-index.phtml:41 template/admin/invoice-index.phtml:81
 #: template/admin/location-index.phtml:41 template/admin/log-index.phtml:70
+#: template/admin/order-index.phtml:85
 msgid "Todo list for fist time"
 msgstr ""
 
-#: template/admin/delivery-index.phtml:43
-#: template/admin/invoice-index.phtml:73
+#: template/admin/delivery-index.phtml:43 template/admin/invoice-index.phtml:83
 #: template/admin/location-index.phtml:43 template/admin/log-index.phtml:72
-msgid "1- Setup payment gateway from gateway tap"
+#: template/admin/order-index.phtml:87
+msgid "Setup payment gateway from gateway tap"
 msgstr ""
 
-#: template/admin/delivery-index.phtml:44
-#: template/admin/invoice-index.phtml:74
+#: template/admin/delivery-index.phtml:44 template/admin/invoice-index.phtml:84
 #: template/admin/location-index.phtml:44 template/admin/log-index.phtml:73
-msgid "2- Setup delivery method from delivery tap"
+#: template/admin/order-index.phtml:88
+msgid "Setup delivery method from delivery tap"
 msgstr ""
 
-#: template/admin/delivery-index.phtml:45
-#: template/admin/invoice-index.phtml:75
+#: template/admin/delivery-index.phtml:45 template/admin/invoice-index.phtml:85
 #: template/admin/location-index.phtml:45 template/admin/log-index.phtml:74
-msgid "3- Setup location from location tap"
+#: template/admin/order-index.phtml:89
+msgid "Setup location from location tap"
 msgstr ""
 
 #: template/admin/gateway-index.phtml:3
@@ -1036,50 +1059,49 @@ msgstr ""
 msgid "Install"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:6
+#: template/admin/invoice-index.phtml:8
 msgid "Filter invoices"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:9
+#: template/admin/invoice-index.phtml:19
 msgid "List of invoices"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:14
-#: template/admin/invoice-print.phtml:179
+#: template/admin/invoice-index.phtml:24 template/admin/invoice-print.phtml:179
 #: template/admin/invoice-view.phtml:124 template/admin/log-index.phtml:10
 #: template/front/invoice-print.phtml:179 template/front/invoice.phtml:160
 msgid "Amount"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:15 template/admin/log-index.phtml:12
+#: template/admin/invoice-index.phtml:25 template/admin/log-index.phtml:12
 #: template/admin/order-view.phtml:266 template/front/detail.phtml:222
 #: template/front/list.phtml:105
 msgid "Time Create"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:17 template/admin/order-view.phtml:268
+#: template/admin/invoice-index.phtml:27 template/admin/order-view.phtml:268
 #: template/front/detail.phtml:224 template/front/list.phtml:107
 msgid "Time pay"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:49 template/admin/invoice-index.phtml:51
-#: template/admin/order-index.phtml:61 template/admin/order-index.phtml:63
+#: template/admin/invoice-index.phtml:59 template/admin/invoice-index.phtml:61
+#: template/admin/order-index.phtml:74 template/admin/order-index.phtml:76
 #: template/admin/order-view.phtml:299 template/admin/order-view.phtml:301
 #: template/front/list.phtml:93 template/front/list.phtml:95
 msgid "View"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:52 template/admin/invoice-index.phtml:54
+#: template/admin/invoice-index.phtml:62 template/admin/invoice-index.phtml:64
 #: template/admin/invoice-view.phtml:99 template/admin/invoice-view.phtml:101
 msgid "View order"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:55 template/admin/invoice-index.phtml:57
+#: template/admin/invoice-index.phtml:65 template/admin/invoice-index.phtml:67
 #: template/front/invoice.phtml:186 template/front/invoice.phtml:188
 msgid "Print invoice"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:65 template/admin/invoice-print.phtml:69
+#: template/admin/invoice-index.phtml:75 template/admin/invoice-print.phtml:69
 #: template/admin/invoice-view.phtml:12 template/admin/log-index.phtml:64
 #: template/admin/order-view.phtml:311 template/front/detail.phtml:264
 #: template/front/invoice-print.phtml:69 template/front/invoice.phtml:49
@@ -1087,14 +1109,14 @@ msgstr ""
 msgid "Unpaid"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:66 template/admin/invoice-print.phtml:73
+#: template/admin/invoice-index.phtml:76 template/admin/invoice-print.phtml:73
 #: template/admin/invoice-view.phtml:14 template/admin/order-view.phtml:312
 #: template/front/detail.phtml:265 template/front/invoice-print.phtml:73
 #: template/front/invoice.phtml:53 template/front/list.phtml:148
 msgid "Canceled"
 msgstr ""
 
-#: template/admin/invoice-index.phtml:69
+#: template/admin/invoice-index.phtml:79
 msgid "No invoice is not created yet"
 msgstr ""
 
@@ -1128,7 +1150,7 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: template/admin/invoice-print.phtml:101
+#: template/admin/invoice-print.phtml:101 template/front/checkout.phtml:133
 #: template/front/invoice-print.phtml:101 template/front/invoice.phtml:80
 msgid "Address"
 msgstr ""
@@ -1286,15 +1308,14 @@ msgstr ""
 msgid "Gateway"
 msgstr ""
 
-#: template/admin/invoice-update.phtml:112
-#: template/admin/invoice-view.phtml:43 template/admin/order-index.phtml:16
-#: template/admin/order-view.phtml:126 template/front/detail.phtml:164
+#: template/admin/invoice-update.phtml:112 template/admin/invoice-view.phtml:43
+#: template/admin/order-index.phtml:29 template/admin/order-view.phtml:126
+#: template/front/detail.phtml:164
 msgid "Total price"
 msgstr ""
 
-#: template/admin/invoice-update.phtml:116
-#: template/admin/invoice-view.phtml:47 template/admin/order-view.phtml:130
-#: template/front/detail.phtml:168
+#: template/admin/invoice-update.phtml:116 template/admin/invoice-view.phtml:47
+#: template/admin/order-view.phtml:130 template/front/detail.phtml:168
 msgid "Paid price"
 msgstr ""
 
@@ -1369,18 +1390,22 @@ msgstr ""
 msgid "No invoice is not set yet"
 msgstr ""
 
-#: template/admin/order-index.phtml:7
+#: template/admin/order-index.phtml:11
 msgid "Filter orders"
 msgstr ""
 
-#: template/admin/order-index.phtml:10
+#: template/admin/order-index.phtml:22
 msgid "List of orders"
 msgstr ""
 
-#: template/admin/order-index.phtml:15
+#: template/admin/order-index.phtml:28
 msgid "Customer"
 msgstr ""
 
+#: template/admin/order-index.phtml:83
+msgid "No order is not created yet"
+msgstr ""
+
 #: template/admin/order-print.phtml:31
 msgid "Order invoice"
 msgstr ""
@@ -1483,11 +1508,6 @@ msgstr ""
 msgid "Identity"
 msgstr ""
 
-#: template/admin/order-view.phtml:161 template/admin/order-view.phtml:175
-#: template/admin/order-view.phtml:189
-msgid "Time"
-msgstr ""
-
 #: template/admin/order-view.phtml:163
 msgid "Finish"
 msgstr ""
@@ -1530,54 +1550,54 @@ msgstr ""
 msgid "Time : "
 msgstr ""
 
-#: template/front/checkout.phtml:82
-msgid "Days"
-msgstr ""
-
-#: template/front/checkout.phtml:91 template/front/checkout.phtml:152
+#: template/front/checkout.phtml:90
 msgid "Checkout"
 msgstr ""
 
-#: template/front/checkout.phtml:102 template/front/checkout.phtml:157
+#: template/front/checkout.phtml:94
 msgid "Terms of payment"
 msgstr ""
 
-#: template/front/checkout.phtml:104 template/front/checkout.phtml:159
+#: template/front/checkout.phtml:95
 #, php-format
 msgid ""
 "You buy products on %s installment by %s payment on each installment and %s "
 "per payment"
 msgstr ""
 
-#: template/front/checkout.phtml:107
-msgid "Select your invoicing address for your order"
+#: template/front/checkout.phtml:105
+msgid "Use current address"
+msgstr ""
+
+#: template/front/checkout.phtml:108
+msgid "Add new address"
 msgstr ""
 
-#: template/front/checkout.phtml:137
-msgid "Add a new invoicing address"
+#: template/front/checkout.phtml:152
+msgid "Close"
 msgstr ""
 
-#: template/front/checkout.phtml:171
-msgid "Pre Invoice"
+#: template/front/checkout.phtml:179
+msgid "Your products or services"
 msgstr ""
 
-#: template/front/checkout.phtml:174
+#: template/front/checkout.phtml:206
 msgid "Total Price"
 msgstr ""
 
-#: template/front/checkout.phtml:178
+#: template/front/checkout.phtml:210
 msgid "Total Discount"
 msgstr ""
 
-#: template/front/checkout.phtml:182
+#: template/front/checkout.phtml:214
 msgid "Total Shipping"
 msgstr ""
 
-#: template/front/checkout.phtml:186
+#: template/front/checkout.phtml:218
 msgid "Total Vat"
 msgstr ""
 
-#: template/front/checkout.phtml:190
+#: template/front/checkout.phtml:222
 msgid "Final Price"
 msgstr ""
 
diff --git a/locale/fa/admin.mo b/locale/fa/admin.mo
index e5d36400d02023d60870facdfa290b53cd1905eb..21936475bdcc8d7ea1ee5107986a0c609433f5f4 100644
GIT binary patch
delta 33
pcmcbVcqws%uq2<Mk*=YUf}yFEfrYk#@nl8Gos6cNZ%cj`0|2k~3TglV

delta 33
pcmcbVcqws%uq2;>rLKX6f}ydMfq}Mx$z(;zos1@%Z%cj`0|2mB3TprW

diff --git a/locale/fa/admin.po b/locale/fa/admin.po
index 393be71..2e18536 100644
--- a/locale/fa/admin.po
+++ b/locale/fa/admin.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi payment module\n"
-"POT-Creation-Date: 2015-09-08 13:00+0430\n"
+"POT-Creation-Date: 2015-12-12 15:08+0330\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Pi\n"
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _a;_t\n"
 "X-Poedit-Basepath: ../..\n"
diff --git a/locale/fa/block.mo b/locale/fa/block.mo
index 22657f26e3b96f4eb57f148f597ceaddd69b3fb0..9c630f6f4e742edbfc6beb5895dd5d48aa914f58 100644
GIT binary patch
delta 33
pcmaDS`c8BM4;!DMk*=YUf}yFEfrYk#@nk8sos6cNudqq6005r12+aTh

delta 33
pcmaDS`c8BM4;!C>rLKX6f}ydMfq}Mx$z&<Eos1@%udqq6005sD2+jZi

diff --git a/locale/fa/block.po b/locale/fa/block.po
index cb929cb..0390435 100644
--- a/locale/fa/block.po
+++ b/locale/fa/block.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi shop module\n"
-"POT-Creation-Date: 2015-09-08 13:00+0430\n"
+"POT-Creation-Date: 2015-12-12 15:08+0330\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Pi\n"
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _b\n"
 "X-Poedit-Basepath: ../..\n"
diff --git a/locale/fa/default.mo b/locale/fa/default.mo
index cd32e1f18475cb37b7a3bacd4e15130f2135d093..8215de63e6427a94c97402a65c2fb029e6fa718d 100644
GIT binary patch
delta 8291
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

delta 7900
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

diff --git a/locale/fa/default.po b/locale/fa/default.po
index 2136f4c..1a7e87a 100644
--- a/locale/fa/default.po
+++ b/locale/fa/default.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Pi payment module\n"
-"POT-Creation-Date: 2015-09-08 13:00+0430\n"
+"POT-Creation-Date: 2015-12-12 15:08+0330\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: Pi\n"
@@ -9,7 +9,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.4\n"
+"X-Generator: Poedit 1.8.5\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: __;_e\n"
 "X-Poedit-Basepath: ../..\n"
@@ -27,19 +27,19 @@ msgstr "خرید نقدی"
 msgid "Please login for create invoice"
 msgstr "لطفا برای ایجاد فاکتور به سایت وارد شوید"
 
-#: src/Api/Invoice.php:114 src/Api/Invoice.php:210
+#: src/Api/Invoice.php:116 src/Api/Invoice.php:213
 msgid "Your invoice create successfully"
 msgstr "فاکتور شما با موفقیت ایجاد شد"
 
-#: src/Api/Invoice.php:231
+#: src/Api/Invoice.php:234
 msgid "Not allowed to create invoice by this user credit"
 msgstr "با توجه به میزان اعتبار کاربر امکان ایجاد فاکتور وجود ندارد"
 
-#: src/Api/Invoice.php:380
+#: src/Api/Invoice.php:383
 msgid "Not pay"
 msgstr "پرداخت نشده"
 
-#: src/Api/Invoice.php:381
+#: src/Api/Invoice.php:384
 msgid "Not canceled"
 msgstr "لغو نشده"
 
@@ -55,9 +55,9 @@ msgstr "در انتظار تایید است"
 msgid "Finished"
 msgstr "تکمیل شد"
 
-#: src/Api/Notification.php:175 src/Api/Order.php:133
+#: src/Api/Notification.php:175 src/Api/Order.php:124
 #: src/Form/InvoiceSettingForm.php:66 src/Form/OrderSettingForm.php:63
-#: src/Form/UpdatePaymentForm.php:44 template/admin/invoice-index.phtml:64
+#: src/Form/UpdatePaymentForm.php:44 template/admin/invoice-index.phtml:74
 #: template/admin/invoice-print.phtml:65 template/admin/invoice-view.phtml:10
 #: template/admin/log-index.phtml:63 template/admin/order-view.phtml:209
 #: template/admin/order-view.phtml:310 template/front/detail.phtml:15
@@ -66,7 +66,7 @@ msgstr "تکمیل شد"
 msgid "Paid"
 msgstr "پرداخت شده"
 
-#: src/Api/Notification.php:184 src/Api/Order.php:150
+#: src/Api/Notification.php:184 src/Api/Order.php:141
 #: src/Form/OrderSettingForm.php:76 src/Form/UpdateDeliveryForm.php:44
 #: template/front/detail.phtml:25 template/front/detail.phtml:29
 #: template/front/detail.phtml:33 template/front/detail.phtml:37
@@ -74,7 +74,7 @@ msgstr "پرداخت شده"
 msgid "Packed"
 msgstr "بسته بندی شده"
 
-#: src/Api/Notification.php:189 src/Api/Order.php:155
+#: src/Api/Notification.php:189 src/Api/Order.php:146
 #: src/Form/OrderSettingForm.php:77 src/Form/UpdateDeliveryForm.php:45
 #: template/front/detail.phtml:26 template/front/detail.phtml:30
 #: template/front/detail.phtml:34 template/front/detail.phtml:38
@@ -82,14 +82,14 @@ msgstr "بسته بندی شده"
 msgid "Posted"
 msgstr "ارسال شده"
 
-#: src/Api/Notification.php:194 src/Api/Order.php:160
+#: src/Api/Notification.php:194 src/Api/Order.php:151
 #: src/Form/OrderSettingForm.php:78 src/Form/UpdateDeliveryForm.php:46
 #: template/front/detail.phtml:27 template/front/detail.phtml:31
 #: template/front/detail.phtml:35 template/front/detail.phtml:39
 msgid "Delivered"
 msgstr "تحویل شده"
 
-#: src/Api/Notification.php:199 src/Api/Order.php:165
+#: src/Api/Notification.php:199 src/Api/Order.php:156
 #: src/Form/OrderSettingForm.php:79 src/Form/UpdateDeliveryForm.php:47
 #: template/front/detail.phtml:43
 msgid "Back eaten"
@@ -105,77 +105,77 @@ msgstr "سفارش شما با شناسه %s در وب سایت %s ، %s"
 msgid "Dear %s %s, Your order by %s ID %s"
 msgstr "%s %s عزیز، سفارش شما با شماره %s %s"
 
-#: src/Api/Order.php:86 src/Api/Order.php:145 src/Form/OrderSettingForm.php:44
+#: src/Api/Order.php:77 src/Api/Order.php:136 src/Form/OrderSettingForm.php:44
 #: src/Form/OrderSettingForm.php:75 src/Form/UpdateDeliveryForm.php:43
 #: src/Form/UpdateOrderForm.php:43
 msgid "Not processed"
 msgstr "پردازش نشده"
 
-#: src/Api/Order.php:91 src/Form/OrderSettingForm.php:45
+#: src/Api/Order.php:82 src/Form/OrderSettingForm.php:45
 #: src/Form/UpdateOrderForm.php:44
 msgid "Orders validated"
 msgstr "سفارش های تایید شده"
 
-#: src/Api/Order.php:96 src/Form/OrderSettingForm.php:46
+#: src/Api/Order.php:87 src/Form/OrderSettingForm.php:46
 #: src/Form/UpdateOrderForm.php:45
 msgid "Orders pending"
 msgstr "سفارش های در انتظار تایید"
 
-#: src/Api/Order.php:101 src/Form/OrderSettingForm.php:47
+#: src/Api/Order.php:92 src/Form/OrderSettingForm.php:47
 #: src/Form/UpdateOrderForm.php:46
 msgid "Orders failed"
 msgstr "سفارش های خراب"
 
-#: src/Api/Order.php:106 src/Form/OrderSettingForm.php:48
+#: src/Api/Order.php:97 src/Form/OrderSettingForm.php:48
 #: src/Form/UpdateOrderForm.php:47
 msgid "Orders cancelled"
 msgstr "سفارش های لغو شده"
 
-#: src/Api/Order.php:111 src/Form/OrderSettingForm.php:49
+#: src/Api/Order.php:102 src/Form/OrderSettingForm.php:49
 #: src/Form/UpdateOrderForm.php:48
 msgid "Fraudulent orders"
 msgstr "سفارش های فریب آمیز"
 
-#: src/Api/Order.php:116 src/Form/OrderSettingForm.php:50
+#: src/Api/Order.php:107 src/Form/OrderSettingForm.php:50
 #: src/Form/UpdateOrderForm.php:49
 msgid "Orders finished"
 msgstr "سفارش های تکمیل شده"
 
-#: src/Api/Order.php:128 src/Form/InvoiceSettingForm.php:67
+#: src/Api/Order.php:119 src/Form/InvoiceSettingForm.php:67
 #: src/Form/OrderSettingForm.php:62 src/Form/UpdatePaymentForm.php:43
 #: template/front/detail.phtml:17
 msgid "UnPaid"
 msgstr "پرداخت نشده"
 
-#: src/Api/Order.php:133
+#: src/Api/Order.php:124
 msgid "Paid perpayment"
 msgstr "پیش فاکتور پرداخت شده است"
 
-#: src/Api/Order.php:182 src/Controller/Admin/OrderController.php:287
+#: src/Api/Order.php:173 src/Controller/Admin/OrderController.php:287
 msgid "Not Paid"
 msgstr "پرداخت نشده"
 
-#: src/Api/Order.php:184 src/Controller/Admin/OrderController.php:334
+#: src/Api/Order.php:175 src/Controller/Admin/OrderController.php:334
 msgid "Not Delivery"
 msgstr "تحویل نشده"
 
-#: src/Api/Order.php:186 src/Controller/Admin/OrderController.php:236
+#: src/Api/Order.php:177 src/Controller/Admin/OrderController.php:236
 msgid "Not Finish"
 msgstr "تکمیل نشده"
 
-#: src/Api/Order.php:188
+#: src/Api/Order.php:179
 msgid "Not Start"
 msgstr "شروع نشده"
 
-#: src/Api/Order.php:190
+#: src/Api/Order.php:181
 msgid "Not End"
 msgstr "پایان نیافته"
 
-#: src/Controller/Admin/DeliveryController.php:94
+#: src/Controller/Admin/DeliveryController.php:101
 msgid "Delivery data saved successfully."
 msgstr "اطلاعات روش تحویل با موفقیت ذخیره شد"
 
-#: src/Controller/Admin/DeliveryController.php:114
+#: src/Controller/Admin/DeliveryController.php:119
 msgid "Add a delivery"
 msgstr "روش تحویل جدید"
 
@@ -238,24 +238,24 @@ msgstr "به روز رسانی پرداخت"
 msgid "Update delivery"
 msgstr "به روز رسانی تحویل"
 
-#: src/Controller/Front/CheckoutController.php:34
-#: src/Controller/Front/CheckoutController.php:337
+#: src/Controller/Front/CheckoutController.php:36
+#: src/Controller/Front/CheckoutController.php:393
 msgid "Your cart is empty."
 msgstr "سبد خرید شما خالی است"
 
-#: src/Controller/Front/CheckoutController.php:39
-#: src/Controller/Front/CheckoutController.php:342
+#: src/Controller/Front/CheckoutController.php:41
+#: src/Controller/Front/CheckoutController.php:398
 msgid "So sorry, At this moment order is inactive"
 msgstr "متاسفانه در این لحظه امکان ثبت سفارش وجود ندارد"
 
-#: src/Controller/Front/CheckoutController.php:353
+#: src/Controller/Front/CheckoutController.php:409
 msgid ""
 "Your installment plan save, please complete your information and payment."
 msgstr ""
 "پلن قسطی سفارش شما با موفقت ذخیره شد، لطفا اطلاعات مورد نیاز را تکمیل "
 "فرمایید و بعد از آن پیش قسط مربوط به این سفارش را پرداخت نمایید."
 
-#: src/Controller/Front/CheckoutController.php:469
+#: src/Controller/Front/CheckoutController.php:532
 #: src/Form/Element/Gateway.php:28
 msgid "Offline"
 msgstr "آفلاین"
@@ -350,7 +350,7 @@ msgstr "عنوان"
 
 #: src/Form/DeliveryForm.php:61 src/Form/LocationForm.php:72
 #: template/admin/invoice-print.phtml:63 template/admin/invoice-view.phtml:8
-#: template/admin/invoice-view.phtml:128 template/admin/order-index.phtml:17
+#: template/admin/invoice-view.phtml:128 template/admin/order-index.phtml:30
 #: template/admin/order-view.phtml:157 template/admin/order-view.phtml:171
 #: template/admin/order-view.phtml:185 template/front/invoice-print.phtml:63
 #: template/front/invoice.phtml:44
@@ -373,10 +373,11 @@ msgstr "پیش نویس"
 msgid "Private"
 msgstr "خصوصی"
 
-#: src/Form/DeliveryForm.php:75 src/Form/OrderForm.php:316
-#: src/Form/OrderForm.php:343 src/Form/OrderForm.php:374
-#: src/Form/UpdatePaymentForm.php:53 template/admin/log-index.phtml:9
-#: template/admin/order-view.phtml:177
+#: src/Form/DeliveryForm.php:75 src/Form/OrderForm.php:330
+#: src/Form/OrderForm.php:358 src/Form/OrderForm.php:388
+#: src/Form/OrderSimpleForm.php:293 src/Form/OrderSimpleForm.php:321
+#: src/Form/OrderSimpleForm.php:351 src/Form/UpdatePaymentForm.php:53
+#: template/admin/log-index.phtml:9 template/admin/order-view.phtml:177
 msgid "Adapter"
 msgstr "پایانه پرداخت"
 
@@ -385,6 +386,25 @@ msgstr "پایانه پرداخت"
 msgid "Submit"
 msgstr "ارسال"
 
+#: src/Form/Element/Delivery.php:36 src/Form/LocationForm.php:106
+#: template/admin/invoice-print.phtml:134 template/admin/order-view.phtml:197
+#: template/admin/order-view.phtml:199 template/admin/order-view.phtml:222
+#: template/admin/order-view.phtml:265 template/front/checkout.phtml:198
+#: template/front/detail.phtml:179 template/front/detail.phtml:221
+#: template/front/invoice-print.phtml:134 template/front/invoice.phtml:112
+#: template/front/list.phtml:82 template/front/list.phtml:104
+msgid "Price"
+msgstr "قیمت"
+
+#: src/Form/Element/Delivery.php:38 template/admin/order-view.phtml:161
+#: template/admin/order-view.phtml:175 template/admin/order-view.phtml:189
+msgid "Time"
+msgstr "زمان"
+
+#: src/Form/Element/Delivery.php:40 template/front/checkout.phtml:82
+msgid "Days"
+msgstr "روز"
+
 #: src/Form/InvoiceForm.php:40 template/admin/invoice-update.phtml:96
 #: template/admin/invoice-view.phtml:27 template/admin/order-view.phtml:110
 #: template/front/detail.phtml:148
@@ -403,20 +423,24 @@ msgstr "هزینه ارسال"
 msgid "Packing price"
 msgstr "هزینه بسته بندی"
 
-#: src/Form/InvoiceForm.php:73 template/admin/invoice-update.phtml:108
+#: src/Form/InvoiceForm.php:73
+msgid "Setup price"
+msgstr "هزینه راه اندازی"
+
+#: src/Form/InvoiceForm.php:84 template/admin/invoice-update.phtml:108
 #: template/admin/invoice-view.phtml:39 template/admin/order-view.phtml:122
 #: template/front/detail.phtml:160
 msgid "Vat price"
 msgstr "مالیات"
 
-#: src/Form/InvoiceForm.php:85 template/admin/invoice-index.phtml:16
+#: src/Form/InvoiceForm.php:96 template/admin/invoice-index.phtml:26
 #: template/admin/invoice-print.phtml:70 template/admin/order-view.phtml:267
 #: template/front/detail.phtml:223 template/front/invoice-print.phtml:70
 #: template/front/invoice.phtml:50 template/front/list.phtml:106
 msgid "Due date"
 msgstr "سررسید پرداخت"
 
-#: src/Form/InvoiceForm.php:100
+#: src/Form/InvoiceForm.php:111
 msgid "Save"
 msgstr "ذخیره"
 
@@ -464,29 +488,22 @@ msgstr "والد"
 msgid "Is active %s ?"
 msgstr "آیا %s فعال باشد؟"
 
-#: src/Form/LocationForm.php:106 template/admin/invoice-print.phtml:134
-#: template/admin/order-view.phtml:197 template/admin/order-view.phtml:199
-#: template/admin/order-view.phtml:222 template/admin/order-view.phtml:265
-#: template/front/detail.phtml:179 template/front/detail.phtml:221
-#: template/front/invoice-print.phtml:134 template/front/invoice.phtml:112
-#: template/front/list.phtml:82 template/front/list.phtml:104
-msgid "Price"
-msgstr "قیمت"
-
 #: src/Form/LocationForm.php:117
 msgid "Time ( days )"
 msgstr "زمان ( روز )"
 
 #: src/Form/OrderForm.php:52 src/Form/OrderSettingForm.php:153
+#: src/Form/OrderSimpleForm.php:51
 msgid "First name"
 msgstr "نام"
 
 #: src/Form/OrderForm.php:64 src/Form/OrderSettingForm.php:164
+#: src/Form/OrderSimpleForm.php:62
 msgid "Last name"
 msgstr "نام خانوادگی"
 
 #: src/Form/OrderForm.php:78 src/Form/OrderSettingForm.php:142
-#: template/admin/invoice-print.phtml:84
+#: src/Form/OrderSimpleForm.php:75 template/admin/invoice-print.phtml:84
 #: template/admin/invoice-update.phtml:13 template/admin/invoice-view.phtml:58
 #: template/admin/order-print.phtml:42 template/admin/order-view.phtml:27
 #: template/front/detail.phtml:65 template/front/invoice-print.phtml:84
@@ -495,7 +512,7 @@ msgid "ID number"
 msgstr "کد ملی"
 
 #: src/Form/OrderForm.php:92 src/Form/OrderSettingForm.php:109
-#: template/admin/invoice-print.phtml:96
+#: src/Form/OrderSimpleForm.php:88 template/admin/invoice-print.phtml:96
 #: template/admin/invoice-update.phtml:41 template/admin/invoice-view.phtml:86
 #: template/admin/order-print.phtml:52 template/admin/order-view.phtml:55
 #: template/admin/order-view.phtml:146 template/front/detail.phtml:93
@@ -504,51 +521,53 @@ msgstr "کد ملی"
 msgid "Email"
 msgstr "ایمیل"
 
-#: src/Form/OrderForm.php:106 template/admin/invoice-print.phtml:88
-#: template/admin/invoice-update.phtml:45 template/admin/invoice-view.phtml:90
-#: template/admin/order-print.phtml:56 template/admin/order-view.phtml:59
+#: src/Form/OrderForm.php:106 src/Form/OrderSimpleForm.php:101
+#: template/admin/invoice-print.phtml:88 template/admin/invoice-update.phtml:45
+#: template/admin/invoice-view.phtml:90 template/admin/order-print.phtml:56
+#: template/admin/order-view.phtml:59 template/front/checkout.phtml:137
 #: template/front/detail.phtml:97 template/front/invoice-print.phtml:88
 #: template/front/invoice.phtml:67 template/front/list.phtml:45
 msgid "Phone"
 msgstr "تلفن"
 
 #: src/Form/OrderForm.php:120 src/Form/OrderSettingForm.php:98
-#: template/admin/invoice-print.phtml:92
+#: src/Form/OrderSimpleForm.php:113 template/admin/invoice-print.phtml:92
 #: template/admin/invoice-update.phtml:49 template/admin/invoice-view.phtml:94
 #: template/admin/order-print.phtml:60 template/admin/order-view.phtml:63
-#: template/front/detail.phtml:101 template/front/invoice-print.phtml:92
-#: template/front/invoice.phtml:71 template/front/list.phtml:49
+#: template/front/checkout.phtml:138 template/front/detail.phtml:101
+#: template/front/invoice-print.phtml:92 template/front/invoice.phtml:71
+#: template/front/list.phtml:49
 msgid "Mobile"
 msgstr "موبایل"
 
 #: src/Form/OrderForm.php:135 src/Form/OrderSettingForm.php:186
-#: template/admin/invoice-update.phtml:53 template/admin/order-print.phtml:46
-#: template/admin/order-view.phtml:67 template/front/detail.phtml:105
-#: template/front/list.phtml:53
+#: src/Form/OrderSimpleForm.php:127 template/admin/invoice-update.phtml:53
+#: template/admin/order-print.phtml:46 template/admin/order-view.phtml:67
+#: template/front/detail.phtml:105 template/front/list.phtml:53
 msgid "Company"
 msgstr "شرکت"
 
-#: src/Form/OrderForm.php:149
+#: src/Form/OrderForm.php:149 src/Form/OrderSimpleForm.php:140
 msgid "Company id"
 msgstr "کد اقتصادی"
 
-#: src/Form/OrderForm.php:160
+#: src/Form/OrderForm.php:160 src/Form/OrderSimpleForm.php:150
 msgid "Company vat"
 msgstr "کد مالیات"
 
-#: src/Form/OrderForm.php:173
+#: src/Form/OrderForm.php:173 src/Form/OrderSimpleForm.php:162
 msgid "Delivery address"
 msgstr "آدرس تحویل"
 
-#: src/Form/OrderForm.php:187 template/admin/invoice-update.phtml:21
-#: template/admin/invoice-view.phtml:66 template/admin/order-print.phtml:87
-#: template/admin/order-view.phtml:35 template/front/detail.phtml:73
-#: template/front/list.phtml:71
+#: src/Form/OrderForm.php:187 src/Form/OrderSimpleForm.php:175
+#: template/admin/invoice-update.phtml:21 template/admin/invoice-view.phtml:66
+#: template/admin/order-print.phtml:87 template/admin/order-view.phtml:35
+#: template/front/detail.phtml:73 template/front/list.phtml:71
 msgid "Address 2"
 msgstr "آدرس ۲"
 
 #: src/Form/OrderForm.php:208 src/Form/OrderForm.php:216
-#: template/admin/invoice-print.phtml:117
+#: src/Form/OrderSimpleForm.php:187 template/admin/invoice-print.phtml:117
 #: template/admin/invoice-update.phtml:33 template/admin/invoice-view.phtml:78
 #: template/admin/order-print.phtml:75 template/admin/order-view.phtml:47
 #: template/front/detail.phtml:85 template/front/invoice-print.phtml:117
@@ -556,76 +575,79 @@ msgstr "آدرس ۲"
 msgid "Country"
 msgstr "کشور"
 
-#: src/Form/OrderForm.php:230 template/admin/invoice-print.phtml:113
+#: src/Form/OrderForm.php:230 src/Form/OrderSimpleForm.php:199
+#: template/admin/invoice-print.phtml:113
 #: template/admin/invoice-update.phtml:29 template/admin/invoice-view.phtml:74
 #: template/admin/order-print.phtml:71 template/admin/order-view.phtml:43
-#: template/front/detail.phtml:81 template/front/invoice-print.phtml:113
-#: template/front/invoice.phtml:92 template/front/list.phtml:27
+#: template/front/checkout.phtml:129 template/front/detail.phtml:81
+#: template/front/invoice-print.phtml:113 template/front/invoice.phtml:92
+#: template/front/list.phtml:27
 msgid "State"
 msgstr "استان"
 
 #: src/Form/OrderForm.php:244 src/Form/OrderSettingForm.php:120
-#: template/admin/invoice-print.phtml:109
+#: src/Form/OrderSimpleForm.php:211 template/admin/invoice-print.phtml:109
 #: template/admin/invoice-update.phtml:25 template/admin/invoice-view.phtml:70
 #: template/admin/order-print.phtml:67 template/admin/order-view.phtml:39
-#: template/front/detail.phtml:77 template/front/invoice-print.phtml:109
-#: template/front/invoice.phtml:88 template/front/list.phtml:23
+#: template/front/checkout.phtml:130 template/front/detail.phtml:77
+#: template/front/invoice-print.phtml:109 template/front/invoice.phtml:88
+#: template/front/list.phtml:23
 msgid "City"
 msgstr "شهر"
 
 #: src/Form/OrderForm.php:258 src/Form/OrderSettingForm.php:175
-#: template/admin/invoice-print.phtml:121
+#: src/Form/OrderSimpleForm.php:223 template/admin/invoice-print.phtml:121
 #: template/admin/invoice-update.phtml:37 template/admin/invoice-view.phtml:82
 #: template/admin/order-print.phtml:79 template/admin/order-view.phtml:51
-#: template/front/detail.phtml:89 template/front/invoice-print.phtml:121
-#: template/front/invoice.phtml:100 template/front/list.phtml:35
+#: template/front/checkout.phtml:134 template/front/detail.phtml:89
+#: template/front/invoice-print.phtml:121 template/front/invoice.phtml:100
+#: template/front/list.phtml:35
 msgid "Zip code"
 msgstr "کد پستی"
 
-#: src/Form/OrderForm.php:273 template/admin/order-view.phtml:193
-#: template/admin/order-view.phtml:205 template/admin/order-view.phtml:224
-#: template/front/detail.phtml:181
+#: src/Form/OrderForm.php:273 src/Form/OrderSimpleForm.php:237
+#: template/admin/order-view.phtml:193 template/admin/order-view.phtml:205
+#: template/admin/order-view.phtml:224 template/front/detail.phtml:181
 msgid "Packing"
 msgstr "بسته بندی"
 
-#: src/Form/OrderForm.php:289 template/front/checkout.phtml:194
+#: src/Form/OrderForm.php:290 src/Form/OrderSimpleForm.php:253
 msgid "Location"
 msgstr "مکان"
 
-#: src/Form/OrderForm.php:302 src/Form/OrderSettingForm.php:72
-#: src/Form/UpdateDeliveryForm.php:41 template/admin/order-index.phtml:19
-#: template/admin/order-view.phtml:183 template/front/checkout.phtml:196
-msgid "Delivery"
+#: src/Form/OrderForm.php:303 src/Form/OrderSimpleForm.php:265
+msgid "Delivery methods"
 msgstr "روش تحویل"
 
-#: src/Form/OrderForm.php:391 template/admin/invoice-update.phtml:122
-#: template/admin/order-view.phtml:136
+#: src/Form/OrderForm.php:405 src/Form/OrderSimpleForm.php:368
+#: template/admin/invoice-update.phtml:122 template/admin/order-view.phtml:136
 msgid "User note"
 msgstr "توضیح مشتری"
 
-#: src/Form/OrderForm.php:407
+#: src/Form/OrderForm.php:421
 msgid "Update your profile by this informations?"
 msgstr "حساب کاربری شما با اطلاعات وارد شده در این فرم به روز شود؟"
 
-#: src/Form/OrderForm.php:419
+#: src/Form/OrderForm.php:433 src/Form/OrderSimpleForm.php:383
 msgid "Promo"
 msgstr "کد تخفیف"
 
-#: src/Form/OrderForm.php:429
+#: src/Form/OrderForm.php:443 src/Form/OrderSimpleForm.php:393
 msgid "Terms & Conditions"
 msgstr "شرایط و مقررات"
 
-#: src/Form/OrderForm.php:430
+#: src/Form/OrderForm.php:444 src/Form/OrderSimpleForm.php:394
 #, php-format
 msgid "Accept %s"
 msgstr "تایید %s"
 
-#: src/Form/OrderForm.php:445 template/front/invoice.phtml:194
-#: template/front/invoice.phtml:196
+#: src/Form/OrderForm.php:459 src/Form/OrderSimpleForm.php:409
+#: template/front/invoice.phtml:194 template/front/invoice.phtml:196
 msgid "Pay"
 msgstr "پرداخت"
 
-#: src/Form/OrderForm.php:447
+#: src/Form/OrderForm.php:461 src/Form/OrderSimpleForm.php:411
+#: template/front/checkout.phtml:143
 msgid "Save order"
 msgstr "ثبت سفارش"
 
@@ -637,12 +659,16 @@ msgid "Order"
 msgstr "سفارش"
 
 #: src/Form/OrderSettingForm.php:59 src/Form/UpdatePaymentForm.php:41
-#: template/admin/order-index.phtml:18 template/admin/order-view.phtml:169
-#: template/front/checkout.phtml:198
+#: template/admin/order-index.phtml:31 template/admin/order-view.phtml:169
 msgid "Payment"
 msgstr "پرداخت"
 
-#: src/Form/OrderSettingForm.php:87 template/admin/order-index.phtml:14
+#: src/Form/OrderSettingForm.php:72 src/Form/UpdateDeliveryForm.php:41
+#: template/admin/order-index.phtml:32 template/admin/order-view.phtml:183
+msgid "Delivery"
+msgstr "روش تحویل"
+
+#: src/Form/OrderSettingForm.php:87 template/admin/order-index.phtml:27
 msgid "Code"
 msgstr "کد"
 
@@ -950,28 +976,25 @@ msgstr "درج روش تحویل"
 msgid "List of Delivery methods"
 msgstr "فهرست روش های تحویل"
 
-#: template/admin/delivery-index.phtml:13
-#: template/admin/invoice-index.phtml:13
+#: template/admin/delivery-index.phtml:13 template/admin/invoice-index.phtml:23
 #: template/admin/location-index.phtml:13 template/admin/log-index.phtml:7
-#: template/admin/order-index.phtml:13 template/admin/order-view.phtml:144
+#: template/admin/order-index.phtml:26 template/admin/order-view.phtml:144
 #: template/admin/order-view.phtml:264 template/front/detail.phtml:220
 #: template/front/list.phtml:80 template/front/list.phtml:103
 msgid "ID"
 msgstr "شناسه"
 
-#: template/admin/delivery-index.phtml:15
-#: template/admin/invoice-index.phtml:18
-#: template/admin/location-index.phtml:15 template/admin/order-index.phtml:20
+#: template/admin/delivery-index.phtml:15 template/admin/invoice-index.phtml:28
+#: template/admin/location-index.phtml:15 template/admin/order-index.phtml:33
 #: template/admin/order-view.phtml:269 template/front/detail.phtml:225
 #: template/front/list.phtml:84 template/front/list.phtml:108
 msgid "Action"
 msgstr "عملکرد"
 
 #: template/admin/delivery-index.phtml:31
-#: template/admin/delivery-index.phtml:33
-#: template/admin/gateway-index.phtml:32 template/admin/gateway-index.phtml:33
-#: template/admin/gateway-index.phtml:40 template/admin/gateway-index.phtml:41
-#: template/admin/location-index.phtml:31
+#: template/admin/delivery-index.phtml:33 template/admin/gateway-index.phtml:32
+#: template/admin/gateway-index.phtml:33 template/admin/gateway-index.phtml:40
+#: template/admin/gateway-index.phtml:41 template/admin/location-index.phtml:31
 #: template/admin/location-index.phtml:33
 msgid "Edit"
 msgstr "ویرایش"
@@ -980,29 +1003,29 @@ msgstr "ویرایش"
 msgid "No delivery methods is not created yet"
 msgstr "هیچ روش تحویلی هنوز ایجاد نشده است"
 
-#: template/admin/delivery-index.phtml:41
-#: template/admin/invoice-index.phtml:71
+#: template/admin/delivery-index.phtml:41 template/admin/invoice-index.phtml:81
 #: template/admin/location-index.phtml:41 template/admin/log-index.phtml:70
+#: template/admin/order-index.phtml:85
 msgid "Todo list for fist time"
 msgstr "فهرست موارد لازم الجرا برای اولین استفاده"
 
-#: template/admin/delivery-index.phtml:43
-#: template/admin/invoice-index.phtml:73
+#: template/admin/delivery-index.phtml:43 template/admin/invoice-index.phtml:83
 #: template/admin/location-index.phtml:43 template/admin/log-index.phtml:72
-msgid "1- Setup payment gateway from gateway tap"
-msgstr "۱- تنظیم اطلاعات دروازه پرداخت"
+#: template/admin/order-index.phtml:87
+msgid "Setup payment gateway from gateway tap"
+msgstr "از تب دروازه پرداخت ، دروازه های پرداخت مورد نظر خود را نصب کنید"
 
-#: template/admin/delivery-index.phtml:44
-#: template/admin/invoice-index.phtml:74
+#: template/admin/delivery-index.phtml:44 template/admin/invoice-index.phtml:84
 #: template/admin/location-index.phtml:44 template/admin/log-index.phtml:73
-msgid "2- Setup delivery method from delivery tap"
-msgstr "۲- تنظیم روش تحویل"
+#: template/admin/order-index.phtml:88
+msgid "Setup delivery method from delivery tap"
+msgstr "از تب روش تحویل ، روش های تحویل مورد نظر خود را وارد کنید"
 
-#: template/admin/delivery-index.phtml:45
-#: template/admin/invoice-index.phtml:75
+#: template/admin/delivery-index.phtml:45 template/admin/invoice-index.phtml:85
 #: template/admin/location-index.phtml:45 template/admin/log-index.phtml:74
-msgid "3- Setup location from location tap"
-msgstr "۳- تنظیم مکان"
+#: template/admin/order-index.phtml:89
+msgid "Setup location from location tap"
+msgstr "از تب مکان ، مکان های مورد نظر خود را وارد کنید"
 
 #: template/admin/gateway-index.phtml:3
 msgid "List of all available gateways"
@@ -1045,50 +1068,49 @@ msgstr "فعال"
 msgid "Install"
 msgstr "نصب"
 
-#: template/admin/invoice-index.phtml:6
+#: template/admin/invoice-index.phtml:8
 msgid "Filter invoices"
 msgstr "فیلتر کردن فاکتور ها"
 
-#: template/admin/invoice-index.phtml:9
+#: template/admin/invoice-index.phtml:19
 msgid "List of invoices"
 msgstr "فهرست فاکتور ها"
 
-#: template/admin/invoice-index.phtml:14
-#: template/admin/invoice-print.phtml:179
+#: template/admin/invoice-index.phtml:24 template/admin/invoice-print.phtml:179
 #: template/admin/invoice-view.phtml:124 template/admin/log-index.phtml:10
 #: template/front/invoice-print.phtml:179 template/front/invoice.phtml:160
 msgid "Amount"
 msgstr "مقدار"
 
-#: template/admin/invoice-index.phtml:15 template/admin/log-index.phtml:12
+#: template/admin/invoice-index.phtml:25 template/admin/log-index.phtml:12
 #: template/admin/order-view.phtml:266 template/front/detail.phtml:222
 #: template/front/list.phtml:105
 msgid "Time Create"
 msgstr "زمان ایجاد"
 
-#: template/admin/invoice-index.phtml:17 template/admin/order-view.phtml:268
+#: template/admin/invoice-index.phtml:27 template/admin/order-view.phtml:268
 #: template/front/detail.phtml:224 template/front/list.phtml:107
 msgid "Time pay"
 msgstr "زمان پرداخت"
 
-#: template/admin/invoice-index.phtml:49 template/admin/invoice-index.phtml:51
-#: template/admin/order-index.phtml:61 template/admin/order-index.phtml:63
+#: template/admin/invoice-index.phtml:59 template/admin/invoice-index.phtml:61
+#: template/admin/order-index.phtml:74 template/admin/order-index.phtml:76
 #: template/admin/order-view.phtml:299 template/admin/order-view.phtml:301
 #: template/front/list.phtml:93 template/front/list.phtml:95
 msgid "View"
 msgstr "مشاهده"
 
-#: template/admin/invoice-index.phtml:52 template/admin/invoice-index.phtml:54
+#: template/admin/invoice-index.phtml:62 template/admin/invoice-index.phtml:64
 #: template/admin/invoice-view.phtml:99 template/admin/invoice-view.phtml:101
 msgid "View order"
 msgstr "نمایش سفارش"
 
-#: template/admin/invoice-index.phtml:55 template/admin/invoice-index.phtml:57
+#: template/admin/invoice-index.phtml:65 template/admin/invoice-index.phtml:67
 #: template/front/invoice.phtml:186 template/front/invoice.phtml:188
 msgid "Print invoice"
 msgstr "چاپ فاکتور"
 
-#: template/admin/invoice-index.phtml:65 template/admin/invoice-print.phtml:69
+#: template/admin/invoice-index.phtml:75 template/admin/invoice-print.phtml:69
 #: template/admin/invoice-view.phtml:12 template/admin/log-index.phtml:64
 #: template/admin/order-view.phtml:311 template/front/detail.phtml:264
 #: template/front/invoice-print.phtml:69 template/front/invoice.phtml:49
@@ -1096,14 +1118,14 @@ msgstr "چاپ فاکتور"
 msgid "Unpaid"
 msgstr "پرداخت نشده"
 
-#: template/admin/invoice-index.phtml:66 template/admin/invoice-print.phtml:73
+#: template/admin/invoice-index.phtml:76 template/admin/invoice-print.phtml:73
 #: template/admin/invoice-view.phtml:14 template/admin/order-view.phtml:312
 #: template/front/detail.phtml:265 template/front/invoice-print.phtml:73
 #: template/front/invoice.phtml:53 template/front/list.phtml:148
 msgid "Canceled"
 msgstr "لغو شده"
 
-#: template/admin/invoice-index.phtml:69
+#: template/admin/invoice-index.phtml:79
 msgid "No invoice is not created yet"
 msgstr "هنوز هیچ فاکتوری ایجاد نشده است"
 
@@ -1137,7 +1159,7 @@ msgstr "در"
 msgid "Name"
 msgstr "نام"
 
-#: template/admin/invoice-print.phtml:101
+#: template/admin/invoice-print.phtml:101 template/front/checkout.phtml:133
 #: template/front/invoice-print.phtml:101 template/front/invoice.phtml:80
 msgid "Address"
 msgstr "آدرس"
@@ -1295,15 +1317,14 @@ msgstr "تاریخ پایان"
 msgid "Gateway"
 msgstr "دروازه"
 
-#: template/admin/invoice-update.phtml:112
-#: template/admin/invoice-view.phtml:43 template/admin/order-index.phtml:16
-#: template/admin/order-view.phtml:126 template/front/detail.phtml:164
+#: template/admin/invoice-update.phtml:112 template/admin/invoice-view.phtml:43
+#: template/admin/order-index.phtml:29 template/admin/order-view.phtml:126
+#: template/front/detail.phtml:164
 msgid "Total price"
 msgstr "مجموع قیمت"
 
-#: template/admin/invoice-update.phtml:116
-#: template/admin/invoice-view.phtml:47 template/admin/order-view.phtml:130
-#: template/front/detail.phtml:168
+#: template/admin/invoice-update.phtml:116 template/admin/invoice-view.phtml:47
+#: template/admin/order-view.phtml:130 template/front/detail.phtml:168
 msgid "Paid price"
 msgstr "مبلغ پرداخت شده"
 
@@ -1378,18 +1399,22 @@ msgstr "جزئیات گزارش"
 msgid "No invoice is not set yet"
 msgstr "هنوز هیچ فاکتوری ایجاد نشده است"
 
-#: template/admin/order-index.phtml:7
+#: template/admin/order-index.phtml:11
 msgid "Filter orders"
 msgstr "فیلتر کردن سفارش ها"
 
-#: template/admin/order-index.phtml:10
+#: template/admin/order-index.phtml:22
 msgid "List of orders"
 msgstr "فهرست سفارش ها"
 
-#: template/admin/order-index.phtml:15
+#: template/admin/order-index.phtml:28
 msgid "Customer"
 msgstr "مشتری"
 
+#: template/admin/order-index.phtml:83
+msgid "No order is not created yet"
+msgstr "هیچ سفارشی هنوز ثبت نشده است"
+
 #: template/admin/order-print.phtml:31
 msgid "Order invoice"
 msgstr "فاکتور فروش"
@@ -1492,11 +1517,6 @@ msgstr "اطلاعات"
 msgid "Identity"
 msgstr "هویت"
 
-#: template/admin/order-view.phtml:161 template/admin/order-view.phtml:175
-#: template/admin/order-view.phtml:189
-msgid "Time"
-msgstr "زمان"
-
 #: template/admin/order-view.phtml:163
 msgid "Finish"
 msgstr "پایان"
@@ -1542,19 +1562,15 @@ msgstr "مبلغ : "
 msgid "Time : "
 msgstr "زمان : "
 
-#: template/front/checkout.phtml:82
-msgid "Days"
-msgstr "روز"
-
-#: template/front/checkout.phtml:91 template/front/checkout.phtml:152
+#: template/front/checkout.phtml:90
 msgid "Checkout"
 msgstr "تسویه حساب"
 
-#: template/front/checkout.phtml:102 template/front/checkout.phtml:157
+#: template/front/checkout.phtml:94
 msgid "Terms of payment"
 msgstr "شرایط پرداخت"
 
-#: template/front/checkout.phtml:104 template/front/checkout.phtml:159
+#: template/front/checkout.phtml:95
 #, php-format
 msgid ""
 "You buy products on %s installment by %s payment on each installment and %s "
@@ -1563,35 +1579,39 @@ msgstr ""
 "شما کالای خود را در تعداد %s قسط  به مبلغ %s و پیش پرداخت %s خریداری کرده "
 "اید."
 
-#: template/front/checkout.phtml:107
-msgid "Select your invoicing address for your order"
-msgstr "انتخاب آدرس تحویل برای ثبت سفارش"
+#: template/front/checkout.phtml:105
+msgid "Use current address"
+msgstr "استفاده از آدرس های قبلی"
 
-#: template/front/checkout.phtml:137
-msgid "Add a new invoicing address"
+#: template/front/checkout.phtml:108
+msgid "Add new address"
 msgstr "درج آدرس جدید"
 
-#: template/front/checkout.phtml:171
-msgid "Pre Invoice"
-msgstr "پیش فاکتور"
+#: template/front/checkout.phtml:152
+msgid "Close"
+msgstr "بستن"
+
+#: template/front/checkout.phtml:179
+msgid "Your products or services"
+msgstr "محصولات و خدمات شما"
 
-#: template/front/checkout.phtml:174
+#: template/front/checkout.phtml:206
 msgid "Total Price"
 msgstr "مجموع قیمت"
 
-#: template/front/checkout.phtml:178
+#: template/front/checkout.phtml:210
 msgid "Total Discount"
 msgstr "مجموع تخفیف"
 
-#: template/front/checkout.phtml:182
+#: template/front/checkout.phtml:214
 msgid "Total Shipping"
 msgstr "مجموع هزینه ارسال"
 
-#: template/front/checkout.phtml:186
+#: template/front/checkout.phtml:218
 msgid "Total Vat"
 msgstr "مجموع مالیات"
 
-#: template/front/checkout.phtml:190
+#: template/front/checkout.phtml:222
 msgid "Final Price"
 msgstr "قیمت نهایی"
 
@@ -1688,6 +1708,24 @@ msgstr "فهرست سفارش های شما"
 msgid "List of your invoice"
 msgstr "فهرست فاکتور های شما"
 
+#~ msgid "1- Setup payment gateway from gateway tap"
+#~ msgstr "۱- تنظیم اطلاعات دروازه پرداخت"
+
+#~ msgid "2- Setup delivery method from delivery tap"
+#~ msgstr "۲- تنظیم روش تحویل"
+
+#~ msgid "3- Setup location from location tap"
+#~ msgstr "۳- تنظیم مکان"
+
+#~ msgid "Select your invoicing address for your order"
+#~ msgstr "انتخاب آدرس تحویل برای ثبت سفارش"
+
+#~ msgid "Add a new invoicing address"
+#~ msgstr "درج آدرس جدید"
+
+#~ msgid "Pre Invoice"
+#~ msgstr "پیش فاکتور"
+
 #~ msgid "Accept Terms & Conditions"
 #~ msgstr "تایید شرایط و مقررات"
 
diff --git a/template/front/checkout.phtml b/template/front/checkout.phtml
index 373023a..5b45b8f 100644
--- a/template/front/checkout.phtml
+++ b/template/front/checkout.phtml
@@ -113,19 +113,16 @@ $this->footScript()->appendScript($script);
                             <div role="tabpanel" class="tab-pane active" id="customer-list-tab">
                                 <div class="customer-list">
                                     <?php foreach ($customers as $customer) { ?>
-                                        <div class="customer-single">
-                                            <table class="table table-bordered">
+                                        <div class="customer-single table-responsive">
+                                            <table class="table table-bordered table-condensed table-striped">
                                                 <tr>
-                                                    <td colspan="2" class="col-md-9">
+                                                    <td colspan="3" class="col-md-12">
                                                         <strong>
                                                             <?php echo $this->escape($customer['first_name']); ?>
                                                             <?php echo $this->escape($customer['last_name']); ?>
                                                             ( <?php echo $this->escape($customer['email']); ?> )
                                                         </strong>
                                                     </td>
-                                                    <td class="col-md-3 text-center">
-                                                        <button type="button" class="btn btn-success" data-toggle="modal" data-target="#customerModal<?php echo $customer['id']; ?>"><?php _e('Save order'); ?></button>
-                                                    </td>
                                                 </tr>
                                                 <tr>
                                                     <td class="col-md-3">
@@ -141,6 +138,10 @@ $this->footScript()->appendScript($script);
                                                         <p><strong><?php _e('Mobile'); ?></strong> : <?php echo $this->escape($customer['mobile']); ?></p>
                                                     </td>
                                                 </tr>
+                                                <td colspan="2" class="col-md-9"></td>
+                                                <td colspan="1" class="col-md-3 text-center">
+                                                    <button type="button" class="btn btn-success" data-toggle="modal" data-target="#customerModal<?php echo $customer['id']; ?>"><?php _e('Save order'); ?></button>
+                                                </td>
                                             </table>
                                         </div>
                                         <!-- Modal -->