Просмотр исходного кода

form style move to all application and bug fixed on total order

robert2206 8 лет назад
Родитель
Сommit
5f8cef8494

+ 26 - 3
src/app/app.scss

@@ -38,14 +38,37 @@ p {
     white-space: normal;
 }
 
+form > ion-item {
+    padding-left: 5px !important;
+}
+
+form > ion-item > div {
+    padding-right: 5px !important;
+    box-shadow: 0 0 0 #fff !important;
+}
+
+form > ion-item > div, form > ion-item-divider {
+    border-bottom: 0 !important;
+}
+
+ion-input {
+    border: 1px solid #d3d3d3;
+    border-radius: 2px;
+}
+
+ion-input > input {
+    margin: 8px !important;
+    font-size: 10pt;
+}
+
 .selected-item {
-    background: $selected-color;
-    border-radius: 30px 0px;
+    background: #f4f4f4;
+    border-radius: 10px 0px;
 }
 
 .selected-menu {
     background-color: #f4f4f4;
-    border-radius: 15px 0px 0px 15px;
+    border-radius: 10px 0px 0px 10px;
     border-right: 1px solid #dedede;
 }
 

+ 6 - 6
src/pages/customer/customer.html

@@ -11,27 +11,27 @@
 <ion-content>
     <form id="details-form" [formGroup]="customerForm" (ngSubmit)="submit(customerForm.value)">
         <ion-item>
-            <ion-label floating>Nombre</ion-label>
+            <ion-label stacked>Nombre</ion-label>
             <ion-input type="text" formControlName="name"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>Ciudad</ion-label>
+            <ion-label stacked>Ciudad</ion-label>
             <ion-input type="text" formControlName="city"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>Dirección</ion-label>
+            <ion-label stacked>Dirección</ion-label>
             <ion-input type="text" formControlName="street"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>Celular</ion-label>
+            <ion-label stacked>Celular</ion-label>
             <ion-input type="text" formControlName="mobile"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>Teléfono</ion-label>
+            <ion-label stacked>Teléfono</ion-label>
             <ion-input type="text" formControlName="phone"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>Email</ion-label>
+            <ion-label stacked>Email</ion-label>
             <ion-input type="text" formControlName="email"></ion-input>
         </ion-item>
     </form>

+ 1 - 1
src/pages/order/models/cart.ts

@@ -15,7 +15,7 @@ export class Cart {
     ) { 
         this.customer = customer;
         this.items = items ? items : [];
-        this.total = total;
+        this.total = total ? total : 0;
     }
 
     /**

+ 1 - 22
src/pages/order/order.scss

@@ -19,19 +19,6 @@ page-order {
         flex-grow: 1;
     }
 
-    ion-item {
-        padding-left: 5px !important;
-    }
-
-    form > ion-item > div {
-        padding-right: 5px !important;
-        box-shadow: 0 0 0 #fff !important;
-    }
-
-    form > ion-item > div, form > ion-item-divider {
-        border-bottom: 0 !important;
-    }
-
     ion-list > ion-item > div > div:nth-child(2) {
         display: flex !important;
         flex-direction: column !important;
@@ -52,21 +39,13 @@ page-order {
         margin: 13px 8px 10px 0 !important;
     }
 
-    ion-list, ion-input {
+    ion-list {
         border: 1px solid #d3d3d3;
         border-radius: 2px;
-    }
-
-    ion-list {
         margin: 0 5px !important;
         padding: 2px;
     }
 
-    ion-input > input {
-        margin: 8px !important;
-        font-size: 10pt;
-    }
-
     form > ion-item:nth-last-child(1) {
         padding-right: 65px;
     }

+ 3 - 3
src/pages/product/product.html

@@ -11,15 +11,15 @@
 <ion-content>
     <form id="details-form" [formGroup]="productForm" (ngSubmit)="submit(productForm.value)">
         <ion-item>
-            <ion-label floating>Nombre</ion-label>
+            <ion-label stacked>Nombre</ion-label>
             <ion-input type="text" formControlName="name"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>EAN13</ion-label>
+            <ion-label stacked>Código de Barras</ion-label>
             <ion-input type="text" formControlName="ean13"></ion-input>
         </ion-item>
         <ion-item>
-            <ion-label floating>Referencia interna</ion-label>
+            <ion-label stacked>Referencia Interna</ion-label>
             <ion-input type="text" formControlName="defaultCode"></ion-input>
         </ion-item>
     </form>