diff --git a/locale/en/admin.mo b/locale/en/admin.mo
index e8b291d..3cf8b1b 100644
Binary files a/locale/en/admin.mo and b/locale/en/admin.mo differ
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 9942932..1246361 100644
Binary files a/locale/en/block.mo and b/locale/en/block.mo differ
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 d7a678f..bf0354a 100644
Binary files a/locale/en/default.mo and b/locale/en/default.mo differ
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 e5d3640..2193647 100644
Binary files a/locale/fa/admin.mo and b/locale/fa/admin.mo differ
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 22657f2..9c630f6 100644
Binary files a/locale/fa/block.mo and b/locale/fa/block.mo differ
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 cd32e1f..8215de6 100644
Binary files a/locale/fa/default.mo and b/locale/fa/default.mo differ
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 -->