Рефактор. Изменена разметка Счет фактуры

chefe996 · Apr 10, 2019 · ed5075f · ed5075f
1 parent eab35a9
commit ed5075f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/src/www/app/pages/doc/order.php b/src/www/app/pages/doc/order.php
@@ -69,8 +69,8 @@ public function __construct($docid = 0, $basedocid = 0) {
 
         $this->docform->add(new DropDownChoice('delivery', array(
             1 => 'Самовывоз', 
-            2 => 'Курьер', 
-            3 => 'Почта')
+            2 => 'Курьер по городу', 
+            3 => 'Транспортная компания')
         ))->onChange($this, 'OnDelivery');
 
         $this->docform->add(new TextInput('email'));

diff --git a/src/www/templates/pages/doc/order.html b/src/www/templates/pages/doc/order.html
@@ -24,11 +24,6 @@ <h3>Счет фактура</h3>
                         <label for="email"  >Email</label>
                         <input zippy="email"   class="form-control" >
                     </div>  
-
-                    <div class="form-group  ">
-                        <label for="notes" >Комментарий </label>
-                        <textarea class="form-control"  zippy="notes"></textarea>
-                    </div> 
                 </div>
                 <div class="col-12 col-md-3">
                     <div class="form-group">
@@ -41,27 +36,38 @@ <h3>Счет фактура</h3>
                         </select>
                     </div>
                     <div class="form-group  ">
-                        <label for="pricetype" >Тип  цены</label>
+                        <label for="pricetype" >Тип цены</label>
                         <select class="form-control" zippy="pricetype">
                         </select>
                     </div> 
 
-                    <div class="form-group  ">
-                        <label for="delivery"  >Доставка</label>
-                        <select  class="form-control" zippy="delivery">
-                            <option value="0">Выбрать</option>
-                        </select>
-                    </div>
+
                     <div class="form-group  ">
                         <label for="state" >Статус</label>
                         <select zippy="state" class="form-control">
 
                         </select>
+                    </div>       
+                </div>
+                <div class="col-md-3">
+                    <div class="form-group  ">
+                        <label for="delivery"  >Доставка</label>
+                        <select  class="form-control" zippy="delivery">
+                            <option value="0">Выбрать</option>
+                        </select>
                     </div>
                     <div class="form-group  ">
-                        <label data-label="address" for="address"  >Адрес</label>
+                        <label data-label="address" for="address"  >Адрес получения заказа</label>
                         <input zippy="address"    class="form-control" >
-                    </div>           
+                    </div>  
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-12">
+                    <div class="form-group  ">
+                        <label for="notes" >Комментарий </label>
+                        <textarea class="form-control"  zippy="notes"></textarea>
+                    </div> 
                 </div>
             </div>
             <div class="row">