Skip to content

G
getmiretailer
Commit a5e736da by inspirations
Options

bug fixes

parent 879c02cd
Showing with 126 additions and 111 deletions
.angulardoc.json 0 → 100644
{
"repoId": "531034bf-4923-4de7-83bd-27d59f59b76f",
"lastSync": 0
}
\ No newline at end of file
package.json
...@@ -85,4 +85,4 @@ ...@@ -85,4 +85,4 @@
"android" "android"
] ]
} }
} }
\ No newline at end of file
src/app/forgotpass/forgotpass.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>FORGOT PASSWORD</h4>
<h4>FORGOT PASSWORD</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper"> <div class="login_wrapper">
<div class="login_inner"> <div class="login_inner">
<div class="row"> <div class="row">
......
src/app/home/home.page.html
<ion-content> <div class="home_header">
<div class="home_header"> <div class="shop_image">
<div class="shop_image">
</div>
<div class="shop_detail">
<h4>LULU FASHION STORE</h4>
<p>860, Tasmania, Australia..</p>
</div>
<div class="shop_rating">
<span><img src="../assets/star.png"></span>
<span>4</span>
</div>
<div class="clear"></div>
</div> </div>
<div class="shop_detail">
<h4>LULU FASHION STORE</h4>
<p>860, Tasmania, Australia..</p>
</div>
<div class="shop_rating">
<span><img src="../assets/star.png"></span>
<span>4</span>
</div>
<div class="clear"></div>
</div>
<ion-content>
<div *ngIf="myorder.orders" class="notification new_order" [hidden]="myorder.orders.length == 0"> <div *ngIf="myorder.orders" class="notification new_order" [hidden]="myorder.orders.length == 0">
YOU HAVE NEW ORDER YOU HAVE NEW ORDER
</div> </div>
...@@ -21,12 +22,12 @@ ...@@ -21,12 +22,12 @@
</div> </div>
<div class="incoming_order"> <div class="incoming_order">
<!-- [options]="orderOptions" (ionSlideDidChange)="slideChanged()" [hidden]="currentIndex ==3" #slides--> <!-- [options]="orderOptions" (ionSlideDidChange)="slideChanged()" [hidden]="currentIndex ==3" #slides-->
<ion-slides pager="false"> <ion-slides pager="false">
<ion-slide *ngFor="let order of myorder.orders; let i = index"> <ion-slide *ngFor="let order of myorder.orders; let i = index">
<div class="incoming_order_wrapper"> <div class="incoming_order_wrapper">
<div class="incoming_detail"> <div class="incoming_detail">
<div class="image"> <div class="image">
<img [src]="order.image" /> <img [src]="order.image" />
</div> </div>
<div class="image_detail"> <div class="image_detail">
<h5>{{order.prodName}}</h5> <h5>{{order.prodName}}</h5>
...@@ -50,11 +51,11 @@ ...@@ -50,11 +51,11 @@
<button class="accept" (click)="accept(order.orderId)">ACCEPT</button> <button class="accept" (click)="accept(order.orderId)">ACCEPT</button>
</div> </div>
<div *ngIf="order.shopperState != 0"> <div *ngIf="order.shopperState != 0">
<div class="order_status_banner"> <div class="order_status_banner">
<hr> <hr>
<ul> <ul>
<li class="textLeft" [ngClass]="{'green': order.shopperState >= 1}"><span>Order Accepted</span></li> <li class="textLeft" [ngClass]="{'green': order.shopperState >= 1}"><span>Order Accepted</span></li>
<li class="textCenter" [ngClass]="{'green': order.shopperState >= 2}" ><span>Product Packed</span></li> <li class="textCenter" [ngClass]="{'green': order.shopperState >= 2}"><span>Product Packed</span></li>
<li class="textRight" [ngClass]="{'green': order.shopperState >= 3}"><span>Rider Picked</span></li> <li class="textRight" [ngClass]="{'green': order.shopperState >= 3}"><span>Rider Picked</span></li>
</ul> </ul>
</div> </div>
...@@ -67,8 +68,9 @@ ...@@ -67,8 +68,9 @@
</div> </div>
</div> </div>
</div> </div>
</ion-slide> </ion-slide>
</ion-slides><!-- --> </ion-slides>
<!-- -->
</div> </div>
<div class="order_header"> <div class="order_header">
<h5 class="floatLeft">PAST SALES</h5> <h5 class="floatLeft">PAST SALES</h5>
...@@ -81,7 +83,7 @@ ...@@ -81,7 +83,7 @@
<li *ngFor="let pastorder of myorder.pastOrders"> <li *ngFor="let pastorder of myorder.pastOrders">
<div class="incoming_detail"> <div class="incoming_detail">
<div class="image"> <div class="image">
<img [src]="pastorder.image" /> <img [src]="pastorder.image" />
</div> </div>
<div class="image_detail"> <div class="image_detail">
<h5>{{pastorder.prodName}}</h5> <h5>{{pastorder.prodName}}</h5>
...@@ -90,7 +92,7 @@ ...@@ -90,7 +92,7 @@
<span class="payment floatLeft">Paid</span> <span class="payment floatLeft">Paid</span>
<div class="clear"></div> <div class="clear"></div>
</h6> </h6>
<ion-row *ngIf="pastorder.orderCode"> <ion-row *ngIf="pastorder.orderCode">
<ion-col class="p0" *ngIf="pastorder.orderCode"> <ion-col class="p0" *ngIf="pastorder.orderCode">
<h4>{{pastorder.orderCode}}</h4> <h4>{{pastorder.orderCode}}</h4>
<p>{{ pastorder.bookDate.seconds * 1000 | date:'MMM dd, y' }}</p> <p>{{ pastorder.bookDate.seconds * 1000 | date:'MMM dd, y' }}</p>
......
src/app/login/login.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn floatLeft">
<button class="nav_btn floatLeft"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>RETAILER LOGIN</h4>
<h4>RETAILER LOGIN</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper"> <div class="login_wrapper">
<div class="logo_wrapper"> <div class="logo_wrapper">
<img src="../../assets/[email protected]"> <img src="../../assets/[email protected]">
......
src/app/password/password.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>PASSWORD</h4>
<h4>PASSWORD</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper"> <div class="login_wrapper">
<div class="login_inner"> <div class="login_inner">
<div class="row"> <div class="row">
......
src/app/pastsales/pastsales.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>PAST SALES</h4>
<h4>PAST SALES</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="past_orders"> <div class="past_orders">
<div class="date_head"> <div class="date_head">
<div class="date_btn"></div> <div class="date_btn"></div>
...@@ -15,30 +16,30 @@ ...@@ -15,30 +16,30 @@
</div> </div>
<ul> <ul>
<li *ngFor="let pastorder of myorder.pastOrders"> <li *ngFor="let pastorder of myorder.pastOrders">
<div class="incoming_detail"> <div class="incoming_detail">
<div class="image"> <div class="image">
<img [src]="pastorder.image" /> <img [src]="pastorder.image" />
</div> </div>
<div class="image_detail"> <div class="image_detail">
<h5>{{pastorder.prodName}}</h5> <h5>{{pastorder.prodName}}</h5>
<p>{{pastorder.color}}, {{pastorder.size}} <strong>1</strong></p> <p>{{pastorder.color}}, {{pastorder.size}} <strong>1</strong></p>
<h6><strong class="floatLeft"> {{pastorder.amount}}</strong> <h6><strong class="floatLeft"> {{pastorder.amount}}</strong>
<span class="payment floatLeft">Paid</span> <span class="payment floatLeft">Paid</span>
<div class="clear"></div> <div class="clear"></div>
</h6> </h6>
<ion-row *ngIf="pastorder.orderCode"> <ion-row *ngIf="pastorder.orderCode">
<ion-col class="p0" *ngIf="pastorder.orderCode"> <ion-col class="p0" *ngIf="pastorder.orderCode">
<h4>{{pastorder.orderCode}}</h4> <h4>{{pastorder.orderCode}}</h4>
<p>{{ pastorder.bookDate.seconds * 1000 | date:'MMM dd, y' }}</p> <p>{{ pastorder.bookDate.seconds * 1000 | date:'MMM dd, y' }}</p>
</ion-col> </ion-col>
<ion-col class="p0 textRight"> <ion-col class="p0 textRight">
<button [ngClass]="(pastorder.orderStatus == 8)? 'cancelled': 'finished'">{{orderState(pastorder.orderStatus)}}</button> <button [ngClass]="(pastorder.orderStatus == 8)? 'cancelled': 'finished'">{{orderState(pastorder.orderStatus)}}</button>
</ion-col> </ion-col>
</ion-row> </ion-row>
</div>
</div> </div>
</li> </div>
</li>
</ul> </ul>
</div> </div>
</ion-content> </ion-content>
\ No newline at end of file
src/app/signup/signup.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>RETAILER SIGNUP</h4>
<h4>RETAILER SIGNUP</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper"> <div class="login_wrapper">
<div class="login_inner"> <div class="login_inner">
<div class="row"> <div class="row">
......
src/app/trackorder/trackorder.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>TRACK ORDER</h4>
<h4>TRACK ORDER</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="trackmap_wrapper"> <div class="trackmap_wrapper">
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng"> <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng">
<agm-direction [origin]="origin" [destination]="destination" [renderOptions]="renderOptions" [markerOptions]="markerOptions"> <agm-direction [origin]="origin" [destination]="destination" [renderOptions]="renderOptions" [markerOptions]="markerOptions">
......
src/app/upload/upload.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>DOCUMENTS</h4>
<h4>DOCUMENTS</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="document_upload_wrapper"> <div class="document_upload_wrapper">
<div class="row"> <div class="row">
<div class="document_upload_box"> <div class="document_upload_box">
......
src/app/verification/verification.page.html
<ion-content> <div class="nav_header">
<div class="nav_header"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> </button>
</button> <div class="nav_title floatLeft">
<div class="nav_title floatLeft"> <h4>VERIFICATION</h4>
<h4>VERIFICATION</h4>
</div>
<div class="clear"></div>
</div> </div>
<div class="clear"></div>
</div>
<ion-content>
<div class="login_wrapper"> <div class="login_wrapper">
<div class="login_inner"> <div class="login_inner">
<div class="row"> <div class="row">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment