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

customer and product selection page added to order module

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

+ 6 - 0
src/app/app.module.ts

@@ -24,6 +24,8 @@ import { AboutPage } from "../pages/about/about";
 import { CustomerPage } from "../pages/customer/customer";
 import { ProductPage } from "../pages/product/product";
 import { OrderPage } from "../pages/order/order";
+import { CustomerSelectionPage } from "../pages/order/customer-selection/customer-selection";
+import { ProductSelectionPage } from "../pages/order/product-selection/product-selection";
 import { LeadPage } from "../pages/lead/lead";
 import { PhonecallPage } from "../pages/phonecall/phonecall";
 
@@ -59,6 +61,8 @@ import { DoubleTap } from "../directives/double-tap";
         CustomerPage,
         ProductPage,
         OrderPage,
+        CustomerSelectionPage,
+        ProductSelectionPage,
         LeadPage,
         PhonecallPage,
         // Components
@@ -91,6 +95,8 @@ import { DoubleTap } from "../directives/double-tap";
         CustomerPage,
         ProductPage,
         OrderPage,
+        CustomerSelectionPage,
+        ProductSelectionPage,
         LeadPage,
         PhonecallPage,
         // Other Pages

+ 13 - 2
src/pages/customer/customer.html

@@ -31,8 +31,19 @@
         </ion-item>
     </form>
     <ion-fab right top edge>
-        <button ion-fab mini type="submit" form="details-form" [hidden]="customerForm.invalid">
-            <i class="fa fa-save fa-lg"></i>
+        <button ion-fab mini>
+            <ion-icon name="menu"></ion-icon>
         </button>
+        <ion-fab-list side="bottom">
+            <button ion-fab>
+                <i class="fa fa-camera fa-lg"></i>
+            </button>
+            <button ion-fab>
+                <i class="fa fa-map-marker fa-lg"></i>
+            </button>
+            <button ion-fab color="secondary" type="submit" form="details-form" [hidden]="customerForm.invalid">
+                <i class="fa fa-save fa-lg"></i>
+            </button>
+        </ion-fab-list>
     </ion-fab>
 </ion-content>

+ 0 - 2
src/pages/customer/customer.ts

@@ -52,8 +52,6 @@ export class CustomerPage extends BaseDetailsView<Partner>{
         if (this.customerForm.invalid) {
             return;
         }
-
-        console.log(super.getItem());
         
         super.setItem(Object.assign(super.getItem(), data, { customer: true }));
         super.performSave();

+ 8 - 0
src/pages/order/customer-selection/customer-selection.html

@@ -0,0 +1,8 @@
+<ion-header>
+    <ion-navbar>
+        <ion-title>Seleccione un Cliente</ion-title>
+    </ion-navbar>
+</ion-header>
+<ion-content>
+    <ion-searchbar placeholder="Buscar"></ion-searchbar>
+</ion-content>

+ 13 - 0
src/pages/order/customer-selection/customer-selection.ts

@@ -0,0 +1,13 @@
+import { Component } from "@angular/core";
+import { NavController } from "ionic-angular";
+
+@Component({
+    selector: 'customer-selection',
+    templateUrl: 'customer-selection.html'
+})
+export class CustomerSelectionPage {
+
+    constructor(
+        public navCtrl: NavController
+    ) { }
+}

+ 26 - 15
src/pages/order/order.html

@@ -4,20 +4,31 @@
     </ion-navbar>
 </ion-header>
 <ion-content>
-<ion-fab right top edge>
-    <button ion-fab mini>
-        <ion-icon name="menu"></ion-icon>
-    </button>
-    <ion-fab-list side="bottom">
-        <button ion-fab>
-           <i class="fa fa-user fa-lg"></i>
+    <form>
+        <ion-item-divider color="light">Cliente</ion-item-divider>
+        <ion-item>
+            <ion-input type="text" placeholder="Sin cliente" clearInput></ion-input>
+        </ion-item>
+        <ion-item-divider color="light">Cliente</ion-item-divider>
+    </form>
+
+    <ion-fab right top edge>
+        <button ion-fab mini>
+            <ion-icon name="menu"></ion-icon>
         </button>
-        <button ion-fab>
-            <i class="fa fa-cart-plus fa-lg"></i>
-        </button>
-        <button ion-fab>
-            <i class="fa fa-save fa-lg"></i>
-        </button>
-    </ion-fab-list>
-  </ion-fab>
+        <ion-fab-list side="bottom">
+            <button ion-fab (click)="selectCustomer()">
+                <i class="fa fa-user fa-lg"></i>
+            </button>
+            <button ion-fab (click)="openBarcodeReader()">
+                <i class="fa fa-barcode fa-lg"></i>
+            </button>
+            <button ion-fab (click)="selectProduct()">
+                <i class="fa fa-cart-plus fa-lg"></i>
+            </button>
+            <button ion-fab color="secondary">
+                <i class="fa fa-save fa-lg"></i>
+            </button>
+        </ion-fab-list>
+    </ion-fab>
 </ion-content>

+ 33 - 1
src/pages/order/order.ts

@@ -1,10 +1,13 @@
-import { Component } from '@angular/core';
+import {  Component } from '@angular/core';
 import { NavController, NavParams } from 'ionic-angular';
 
 import { SaleOrder } from "../../odoo/models/sale.order";
 import { SaleOrderLine } from "../../odoo/models/sale.order.line";
 import { BaseDetailsView } from "../../base/base-details-view";
 
+import { CustomerSelectionPage } from "./customer-selection/customer-selection";
+import { ProductSelectionPage } from "./product-selection/product-selection";
+
 @Component({
     selector: 'page-order',
     templateUrl: 'order.html'
@@ -27,4 +30,33 @@ export class OrderPage extends BaseDetailsView<SaleOrder> {
     ionViewDidLoad() {
         console.log('ionViewDidLoad OrderPage');
     }
+
+    /**
+     * 
+     */
+    selectCustomer(): void {
+        this.navCtrl.push(CustomerSelectionPage);
+    }
+
+    /**
+     * 
+     */
+    openBarcodeReader(): void {
+
+    }
+
+    /**
+     * 
+     */
+    selectProduct(): void {
+        this.navCtrl.push(ProductSelectionPage);
+    }
+
+    /**
+     * 
+     * @param data 
+     */
+    submit(data: any) { 
+        console.log(data);
+    }
 }

+ 8 - 0
src/pages/order/product-selection/product-selection.html

@@ -0,0 +1,8 @@
+<ion-header>
+    <ion-navbar>
+        <ion-title>Seleccione un Producto</ion-title>
+    </ion-navbar>
+</ion-header>
+<ion-content>
+    <ion-searchbar placeholder="Buscar"></ion-searchbar>
+</ion-content>

+ 13 - 0
src/pages/order/product-selection/product-selection.ts

@@ -0,0 +1,13 @@
+import { Component } from "@angular/core";
+import { NavController } from "ionic-angular";
+
+@Component({
+    selector: 'product-selection',
+    templateUrl: 'product-selection.html'
+})
+export class ProductSelectionPage {
+
+    constructor(
+        public navCtrl: NavController
+    ) {}
+}

+ 1 - 1
src/pages/product/product.ts

@@ -36,7 +36,7 @@ export class ProductPage extends BaseDetailsView<ProductTemplate>{
         console.log('ionViewDidLoad ProductPage');
     }
 
-     /**
+    /**
      * 
      * @param data 
      */