Skip to content

G
getme
Commit 2623b304 by Arjun
Options

address style fix

parent 7b96db67
Showing with 249 additions and 208 deletions
src/app/cart/cart.page.html
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<ion-row class="no-gutter"> <ion-row class="no-gutter">
<ion-col class="no-gutter" size="2"> <ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back_white floatLeft" (click)="goBack()"> <button class="nav_btn nav_back_white floatLeft" (click)="goBack()">
<img src="../assets/arrow_white.png" /> <img src="../assets/arrow_white.png" />
</button> </button>
</ion-col> </ion-col>
<ion-col class="no-gutter" size="8"> <ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<p class="textLeft">Total Price:</p> <p class="textLeft">Total Price:</p>
</ion-col> </ion-col>
<ion-col> <ion-col>
<p class="textRight">A$ <p class="textRight">
{{service.formatNumber(cartService.cartTotal.toFixed(2))}} A$ {{service.formatNumber(cartService.cartTotal.toFixed(2))}}
</p> </p>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -86,27 +86,31 @@ ...@@ -86,27 +86,31 @@
<h5> <h5>
<span class="floatLeft">ITEMS</span> <span class="floatLeft">ITEMS</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span> {{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span
<div class="clear"></div> >
</h5> <div class="clear"></div>
<ion-grid class="p0" *ngIf="cartService.carts && cartService.carts.length > 0"> </h5>
<ion-row *ngFor="let carts of cartService.carts"> <ion-grid
<ion-col size="6" class="p0"> class="p0"
<h6 class="textLeft">{{unEscape(carts.prodName)}}</h6> *ngIf="cartService.carts && cartService.carts.length > 0"
</ion-col> >
<ion-col size="2" class="p0"> <ion-row *ngFor="let carts of cartService.carts">
<h6 class="textRight"><strong>{{carts.qty}} X</strong></h6> <ion-col size="6" class="p0">
</ion-col> <h6 class="textLeft">{{unEscape(carts.prodName)}}</h6>
<ion-col size="4" class="p0"> </ion-col>
<h6 class="textRight"> <ion-col size="2" class="p0">
<strong>A$ {{service.formatNumber(carts.price)}}</strong> <h6 class="textRight"><strong>{{carts.qty}} X</strong></h6>
</h6> </ion-col>
</ion-col> <ion-col size="4" class="p0">
</ion-row> <h6 class="textRight">
</ion-grid> <strong>A$ {{service.formatNumber(carts.price)}}</strong>
<hr /> </h6>
<h5> </ion-col>
<span class="floatLeft">DELIVERY</span> </ion-row>
</ion-grid>
<hr />
<h5>
<span class="floatLeft">DELIVERY</span>
<span class="floatRight" (click)="istoggle()">CHANGE</span> <span class="floatRight" (click)="istoggle()">CHANGE</span>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
...@@ -114,61 +118,58 @@ ...@@ -114,61 +118,58 @@
<ion-row> <ion-row>
<ion-col class="p0"> <ion-col class="p0">
<h6> <h6>
{{addressService.custAddress.building}},<span {{addressService.custAddress.building}},<span *ngIf="addressService.custAddress.landmark && addressService.custAddress.landmark!==''">{{addressService.custAddress.landmark}},</span
*ngIf="addressService.custAddress.landmark && addressService.custAddress.landmark!==''">{{addressService.custAddress.landmark}},</span> >
<br /> {{addressService.custAddress.address}} <br />
</h6> {{addressService.custAddress.address}}
</ion-col> </h6>
</ion-row> </ion-col>
</ion-grid> </ion-row>
<hr /> </ion-grid>
<h5> <hr />
<span class="floatLeft">PAYMENT</span> <h5>
<!-- <span class="floatRight">CHANGE</span> --> <span class="floatLeft">PAYMENT</span>
<div class="clear"></div> <!-- <span class="floatRight">CHANGE</span> -->
</h5> <div class="clear"></div>
<div class="payment_method"> </h5>
<input type="radio" name="payments" id="cod" name="radio-group" checked="true" <div class="payment_method">
(click)="getwaycod()" /> <input type="radio" name="payments" id="cod" name="radio-group" checked="true" (click)="getwaycod()" />
<label for="cod"> <label for="cod">
<p>Credit Card</p> <p>Credit Card</p>
</label> </label>
</div> </div>
<div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="paypal" name="radio-group" <input type="radio" name="payments" id="paypal" name="radio-group" (click)="getwaypaypal()" />
(click)="getwaypaypal()" /> <label for="paypal">
<label for="paypal"> <p>PayPal</p>
<p>PayPal</p> </label>
</label> </div>
</div> <!-- <div class="card_div" [hidden]="gateway !=1">
<!-- <div class="card_div" [hidden]="gateway !=1">
<input class="card_no borderNone widthFull" placeholder="PayPal ID" /> <input class="card_no borderNone widthFull" placeholder="PayPal ID" />
</div> --> </div> -->
<div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="afterpay" name="radio-group" <input type="radio" name="payments" id="afterpay" name="radio-group" (click)="getwayafterpay()" />
(click)="getwayafterpay()" /> <label for="afterpay">
<label for="afterpay"> <p>AfterPay</p>
<p>AfterPay</p> </label>
</label> </div>
</div> <!-- <div class="card_div" [hidden]="gateway !=2">
<!-- <div class="card_div" [hidden]="gateway !=2">
<input class="card_no" placeholder="**** **** **** 1458" /> <input class="card_no" placeholder="**** **** **** 1458" />
<input class="cv_number" placeholder="CVV" /> <input class="cv_number" placeholder="CVV" />
</div> --> </div> -->
<div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="payk" name="radio-group" <input type="radio" name="payments" id="payk" name="radio-group" (click)="getwaypayk()" />
(click)="getwaypayk()" /> <label for="payk">
<label for="payk"> <p>PayK</p>
<p>PayK</p> </label>
</label> </div>
</div> <!-- <div class="card_div" [hidden]="gateway !=3">
<!-- <div class="card_div" [hidden]="gateway !=3">
<input <input
class="card_no borderNone widthFull" class="card_no borderNone widthFull"
placeholder="PafyK ID" placeholder="PafyK ID"
/> />
</div> --> </div> -->
<!-- <div class="delivery_time"> <!-- <div class="delivery_time">
<ul> <ul>
<li> <li>
Delivery 10 Mnt<br> Delivery 10 Mnt<br>
...@@ -180,163 +181,202 @@ ...@@ -180,163 +181,202 @@
</li> </li>
</ul> </ul>
</div> --> </div> -->
<hr /> <hr />
<div class="coupon_code"> <div class="coupon_code">
<div class="promo-row"> <div class="promo-row">
<input class="" placeholder="COUPON CODE: GET50" #promo /><button <input class="" placeholder="COUPON CODE: GET50" #promo /><button class="add_btn apply_btn" (click)="promoApply(promo.value)">
class="add_btn apply_btn" (click)="promoApply(promo.value)"> APPLY
APPLY </button>
</button> </div>
</div> <span *ngIf="discountApplied == 1" class="promo-success">Promocode applied successfully
<span *ngIf="discountApplied == 1" class="promo-success">Promocode applied successfully </span>
</span> <span *ngIf="discountApplied == 2" class="promo-error">Invalid Promocode</span
<span *ngIf="discountApplied == 2" class="promo-error">Invalid Promocode</span> >
</div> </div>
<br /> <br />
<h6> <h6>
<span class="floatLeft">PRODUCT COST</span> <span class="floatLeft">PRODUCT COST</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span> {{service.formatNumber(cartService.cartTotal.toFixed(2))}}</span
<div class="clear"></div> >
</h6> <div class="clear"></div>
</h6>
<h6> <h6>
<span class="floatLeft">DELIVERY CHARGE</span> <span class="floatLeft">DELIVERY CHARGE</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(getDeliveryCharge(cartService.cartTotal))}}</span> {{service.formatNumber(getDeliveryCharge(cartService.cartTotal))}}</span
<div class="clear"></div> >
</h6> <div class="clear"></div>
<h6> </h6>
<span class="floatLeft">GST/TAX</span> <h6>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatLeft">GST/TAX</span>
{{service.formatNumber(getTax(cartService.cartTotal))}}</span> <span class="floatRight" *ngIf="cartService.cartTotal">A$
<div class="clear"></div> {{service.formatNumber(getTax(cartService.cartTotal))}}</span
</h6> >
<h6 *ngIf="discountApplied"> <div class="clear"></div>
<span class="floatLeft">DISCOUNT</span> </h6>
<span class="floatRight">(-) A$ {{service.formatNumber(discount)}}</span> <h6 *ngIf="discountApplied">
<div class="clear"></div> <span class="floatLeft">DISCOUNT</span>
</h6> <span class="floatRight">(-) A$ {{service.formatNumber(discount)}}</span
<hr /> >
<div class="total_div"> <div class="clear"></div>
<ion-row> </h6>
<ion-col> <hr />
<p class="textLeft">Total Price:</p> <div class="total_div">
</ion-col> <ion-row>
<ion-col> <ion-col>
<p class="textRight" *ngIf="cartService.cartTotal"> <p class="textLeft">Total Price:</p>
A$ {{service.formatNumber(getTotal(cartService.cartTotal))}} </ion-col>
</p> <ion-col>
</ion-col> <p class="textRight" *ngIf="cartService.cartTotal">
</ion-row> A$
</div> {{service.formatNumber(getTotal(cartService.cartTotal))}}
</div> </p>
</ion-slide> </ion-col>
<ion-slide> </ion-row>
<div class="order_placed_div"> </div>
<img src="../assets/Group137@3x.png" />
<h4>Order Placed</h4>
<p>{{bookDate}}</p>
<h3>Your order is due for delivery in</h3>
<h1>{{deliveryTime}}</h1>
<button class="view_order" (click)="goToPage('myorder')">
VIEW ORDERS</button><br />
<button class="home_btn" (click)="goToPage('home')">HOME</button>
</div>
</ion-slide>
</ion-slides>
</div> </div>
</div> </ion-slide>
<ion-slide>
<div class="order_placed_div">
<img src="../assets/Group137@3x.png" />
<h4>Order Placed</h4>
<p>{{bookDate}}</p>
<h3>Your order is due for delivery in</h3>
<h1>{{deliveryTime}}</h1>
<button class="view_order" (click)="goToPage('myorder')">
VIEW ORDERS</button
><br />
<button class="home_btn" (click)="goToPage('home')">HOME</button>
</div>
</ion-slide>
</ion-slides>
</div>
</div> </div>
</div>
</ion-content> </ion-content>
<ion-footer class="hide-on-keyboard-open"> <ion-footer class="hide-on-keyboard-open">
<div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0"> <div
<div class="continue" (click)="goToPage('productlist')"> class="footer_btnbay"
CONTINUE SHOPPING *ngIf="cartService.carts && cartService.carts.length > 0"
</div> [hidden]="currentIndex != 0"
<div class="checkout" (click)="next(1)">CHECKOUT</div> >
</div> <div class="continue" (click)="goToPage('productlist')">
<div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" CONTINUE SHOPPING
(click)="next(2);">
PAY
</div> </div>
<div class="checkout" (click)="next(1)">CHECKOUT</div>
</div>
<div
class="footer_btn"
*ngIf="cartService.carts && cartService.carts.length > 0"
[hidden]="currentIndex != 1"
(click)="next(2);"
>
PAY
</div>
</ion-footer> </ion-footer>
<div class="loader" *ngIf="loader"> <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
</div> </div>
<div *ngIf="isShow" [@slideInOut]> <div *ngIf="isShow" [@slideInOut]>
<div class="nav_header"> <div class="nav_header">
<ion-grid class="no-gutter"> <ion-grid class="no-gutter">
<ion-row class="no-gutter"> <ion-row class="no-gutter">
<ion-col class="no-gutter" size="2"> <ion-col class="no-gutter" size="2">
<button class="nav_btn nav_back floatLeft" (click)="istoggle();"> <button class="nav_btn nav_back floatLeft" (click)="istoggle();">
<img src="../assets/Group17_2.png" /> <img src="../assets/Group17_2.png" />
</button> </button>
</ion-col> </ion-col>
<ion-col class="no-gutter" size="8"> <ion-col class="no-gutter" size="8">
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
<h4>CHANGE LOCATION</h4> <h4>CHANGE LOCATION</h4>
</div> </div>
</ion-col> </ion-col>
<ion-col class="no-gutter" size="2"></ion-col> <ion-col class="no-gutter" size="2"></ion-col>
</ion-row> </ion-row>
</ion-grid> </ion-grid>
</div> </div>
<ion-content class="sort_wrappper"> <ion-content class="sort_wrappper">
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" <agm-map
[backgroundColor]="'rgba(29, 27, 130,0.2)'"> [zoom]="20"
<agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]=" [latitude]="lat"
[longitude]="lng"
[disableDefaultUI]="false"
[zoomControl]="false"
[backgroundColor]="'rgba(29, 27, 130,0.2)'"
>
<agm-marker
[latitude]="lat"
[longitude]="lng"
[iconUrl]="
{ {
url: './assets/pin-2.svg', url: './assets/pin-2.svg',
scaledSize: { scaledSize: {
width: 28, width: 28,
height: 40 height: 40
}}"></agm-marker> }}"
</agm-map> ></agm-marker>
<div class="add_address_wrapper"> </agm-map>
<h5> <div class="add_address_wrapper">
<span class="floatLeft">SELECT ADDRESS</span> <h5>
<span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span> <span class="floatLeft">SELECT ADDRESS</span>
<div class="clear"></div> <span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span
</h5> >
<ul *ngIf="addressService.addressList && addressService.addressList.length > 0"> <div class="clear"></div>
<li *ngFor="let address of addressService.addressList; let i = index" </h5>
[ngClass]="{'no-devlivery': !address.nearest}"> <ul
<h4 *ngIf="address.nearest === true">DELIVERS TO</h4> *ngIf="addressService.addressList && addressService.addressList.length > 0"
<h4 *ngIf="address.nearest === false">DOES NOT DELIVER TO</h4> >
<div class="floatLeft"> <li
{{address.default}} *ngFor="let address of addressService.addressList; let i = index"
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" [ngClass]="{'no-devlivery': !address.nearest}"
(click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType /> >
<label for="styled-checkbox-{{i}}"> {{address.addressType}} </label> <h4 *ngIf="address.nearest === true">DELIVERS TO</h4>
</div> <h4 *ngIf="address.nearest === false">DOES NOT DELIVER TO</h4>
<div class="floatLeft"> <div>
<p> {{address.default}}
{{address.building}}, <span <input
*ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span> class="styled-checkbox"
<!-- {{address.address}} --> name="addressId"
</p> id="styled-checkbox-{{i}}"
</div> type="radio"
<div class="clear"></div> (click)="setDefault(address.addressId, i)"
</li> [value]="address.addressId"
</ul> #addressType
<div class="textCenter" *ngIf="addressService.addressList && addressService.addressList.length === 0">No />
Address Found</div> <label for="styled-checkbox-{{i}}"> {{address.addressType}} </label>
</div>
</div> <div>
<!-- <div class="loader" *ngIf="loader"> <p>
{{address.building}},
<span *ngIf="address.landmark && address.landmark!==''"
>{{address.landmark}},</span
>
<!-- {{address.address}} -->
</p>
</div>
<div class="clear"></div>
</li>
</ul>
<div
class="textCenter"
*ngIf="addressService.addressList && addressService.addressList.length === 0"
>
No Address Found
</div>
</div>
<!-- <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
<div></div> <div></div>
</div> </div>
</div> --> </div> -->
</ion-content> </ion-content>
</div> </div>
\ No newline at end of file
src/app/home/home.page.html
...@@ -157,14 +157,14 @@ ...@@ -157,14 +157,14 @@
<div> <div>
<ul class="address-ul" *ngIf="addressService.addressList && addressService.addressList.length > 0"> <ul class="address-ul" *ngIf="addressService.addressList && addressService.addressList.length > 0">
<li *ngFor="let address of addressService.addressList; let i = index"> <li *ngFor="let address of addressService.addressList; let i = index">
<div class="floatLeft"> <div>
{{address.default}} {{address.default}}
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" /> <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
<label for="styled-checkbox-{{i}}"> <label for="styled-checkbox-{{i}}">
{{address.addressType}} {{address.addressType}}
</label> </label>
</div> </div>
<div class="floatLeft"> <div>
<p> <p>
{{address.building}}, <span *ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span> {{address.building}}, <span *ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span>
<!-- {{address.address}} --> <!-- {{address.address}} -->
......
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