Skip to content

G
getme
Commit c57eb366 by Adarsh K
Options

Merge branch 'arjunlatest' into 'master'

Arjunlatest See merge request !93
parents a01b6e82 88d20df1
Showing with 90 additions and 49 deletions
src/app/cart/cart.page.html
...@@ -68,8 +68,7 @@ ...@@ -68,8 +68,7 @@
<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">A$ {{service.formatNumber(cartService.cartTotal.toFixed(2))}}
{{service.formatNumber(cartService.cartTotal.toFixed(2))}}
</p> </p>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -114,8 +113,7 @@ ...@@ -114,8 +113,7 @@
<ion-row> <ion-row>
<ion-col class="p0"> <ion-col class="p0">
<h6> <h6>
{{addressService.custAddress.building}},<br /> {{addressService.custAddress.building}},<br /> {{addressService.custAddress.landmark}},
{{addressService.custAddress.landmark}},
<br /> {{addressService.custAddress.address}} <br /> {{addressService.custAddress.address}}
</h6> </h6>
</ion-col> </ion-col>
...@@ -135,8 +133,7 @@ ...@@ -135,8 +133,7 @@
</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()" checked="true" />
(click)="getwaypaypal()" checked="true" />
<label for="paypal"> <label for="paypal">
<p>PayPal</p> <p>PayPal</p>
</label> </label>
...@@ -145,8 +142,7 @@ ...@@ -145,8 +142,7 @@
<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>
...@@ -156,8 +152,7 @@ ...@@ -156,8 +152,7 @@
<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>
...@@ -183,8 +178,7 @@ ...@@ -183,8 +178,7 @@
<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>
...@@ -258,8 +252,7 @@ ...@@ -258,8 +252,7 @@
</div> </div>
<div class="checkout" (click)="next(1)">CHECKOUT</div> <div class="checkout" (click)="next(1)">CHECKOUT</div>
</div> </div>
<div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" <div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" (click)="next(2);">
(click)="next(2);">
PAY PAY
</div> </div>
...@@ -290,9 +283,14 @@ ...@@ -290,9 +283,14 @@
</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 [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
[backgroundColor]="'rgba(29, 27, 130,0.2)'"> <agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]="
<agm-marker [latitude]="lat" [longitude]="lng"></agm-marker> {
url: './assets/pin-2.svg',
scaledSize: {
width: 28,
height: 40
}}"></agm-marker>
</agm-map> </agm-map>
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5> <h5>
...@@ -301,15 +299,12 @@ ...@@ -301,15 +299,12 @@
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<ul *ngIf="addressService.addressList && addressService.addressList.length > 0"> <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" [ngClass]="{'no-devlivery': !address.nearest}">
[ngClass]="{'no-devlivery': !address.nearest}">
<h4 *ngIf="address.nearest === true">DELIVERS TO</h4> <h4 *ngIf="address.nearest === true">DELIVERS TO</h4>
<h4 *ngIf="address.nearest === false">NO DELIVERS TO</h4> <h4 *ngIf="address.nearest === false">NO DELIVERS TO</h4>
<div class="floatLeft"> <div class="floatLeft">
{{address.default}} {{address.default}}
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
(click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType
[checked]="address.defaultVal == 1" />
<label for="styled-checkbox-{{i}}"> {{address.addressType}} </label> <label for="styled-checkbox-{{i}}"> {{address.addressType}} </label>
</div> </div>
<div class="floatLeft"> <div class="floatLeft">
...@@ -320,8 +315,7 @@ ...@@ -320,8 +315,7 @@
<div class="clear"></div> <div class="clear"></div>
</li> </li>
</ul> </ul>
<div class="textCenter" *ngIf="addressService.addressList && addressService.addressList.length === 0">No <div class="textCenter" *ngIf="addressService.addressList && addressService.addressList.length === 0">No Address Found</div>
Address Found</div>
</div> </div>
<!-- <div class="loader" *ngIf="loader"> <!-- <div class="loader" *ngIf="loader">
......
src/app/changeaddress/changeaddress.page.html
...@@ -19,9 +19,12 @@ ...@@ -19,9 +19,12 @@
</ion-header> </ion-header>
<ion-content> <ion-content>
<div class="nearby_map"> <div class="nearby_map">
<div class="map-inner">
<agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'"> <agm-map [latitude]="latitude" [longitude]="longitude" [zoom]="8" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="latitude" [longitude]="longitude" [markerDraggable]="true" (dragEnd)="markerDragEnd($event)"></agm-marker> <agm-marker [markerDraggable]="true" (dragEnd)="markerDragEnd($event)"></agm-marker>
</agm-map> </agm-map>
<span class="map-pin"><img src="../../assets/pin.svg" alt=""></span>
</div>
<form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal"> <form (ngSubmit)="onSubmit(addressForm.value); addressForm.reset()" #addressForm="ngForm" method="post" class="form-horizontal">
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5>DELIVERY</h5> <h5>DELIVERY</h5>
......
src/app/changeaddress/changeaddress.page.scss
.nearby_map { .nearby_map {
width: 100%; width: 100%;
height: 100vh; height: 100vh;
.map-inner {
height: calc(100% - 348px);
position: relative;
.map-pin {
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
width: 20px;
img {
margin-top: -23px;
}
}
}
.overlay { .overlay {
position: absolute; position: absolute;
top: 0px; top: 0px;
...@@ -112,3 +127,23 @@ ...@@ -112,3 +127,23 @@
transform: rotate(45deg); transform: rotate(45deg);
} }
} }
@media only screen and (max-width: 350px) {
.nearby_map {
.add_address_wrapper {
padding: 10px 20px !important;
p {
margin: 2px 0;
}
input {
margin-bottom: 5px;
}
h6 {
margin: 0;
}
}
.map-inner {
height: calc(100% - 235px);
}
}
}
\ No newline at end of file
src/app/home/home.page.html
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'"> <agm-map [zoom]="20" [latitude]="lat" [longitude]="lng" [disableDefaultUI]="false" [zoomControl]="false" [backgroundColor]="'rgba(29, 27, 130,0.2)'">
<agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]=" <agm-marker [latitude]="lat" [longitude]="lng" [iconUrl]="
{ {
url: './assets/pin.svg', url: './assets/pin-2.svg',
scaledSize: { scaledSize: {
width: 28, width: 28,
height: 40 height: 40
......
src/app/nearby/nearby.page.html
...@@ -25,8 +25,8 @@ ...@@ -25,8 +25,8 @@
{ {
url: './assets/pin.svg', url: './assets/pin.svg',
scaledSize: { scaledSize: {
width: 28, width: 100,
height: 40 height: 100
}}"></agm-marker> }}"></agm-marker>
</agm-map> </agm-map>
<span class="map-pin"><img src="../../assets/pin.svg" alt=""></span> <span class="map-pin"><img src="../../assets/pin.svg" alt=""></span>
......
src/app/nearby/nearby.page.scss
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
left: 50%; left: 50%;
-webkit-transform: translate(-50%, -50%); -webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 25px; width: 20px;
img {
margin-top: -23px;
}
} }
} }
.overlay { .overlay {
......
src/assets/pin-2.svg 0 → 100644
<svg xmlns="http://www.w3.org/2000/svg" width="65.564" height="99.014" viewBox="0 0 65.564 99.014">
<g id="Group_6" data-name="Group 6" transform="translate(-19.97 0.014)">
<g id="Group_5" data-name="Group 5" transform="translate(-2.935 1.022)">
<ellipse id="Ellipse_4" data-name="Ellipse 4" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/>
<ellipse id="Ellipse_6" data-name="Ellipse 6" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/>
</g>
<g id="Group_2" data-name="Group 2" transform="translate(3 -3)">
<circle id="Ellipse_1" data-name="Ellipse 1" cx="24.5" cy="24.5" r="24.5" transform="translate(25 11)" fill="#fff"/>
<g id="pin" transform="translate(-0.222 -0.104)">
<path id="Path_1" data-name="Path 1" d="M49.8,96.9c-3.7-4.7-7.4-9.2-10.9-13.9A147.669,147.669,0,0,1,22.5,56.1a55.361,55.361,0,0,1-4.9-15.4,31.919,31.919,0,0,1,7.4-26A31.406,31.406,0,0,1,44.9,3.5,32.726,32.726,0,0,1,82,28.8c1.6,7.1.5,13.9-1.8,20.7A111.792,111.792,0,0,1,67.3,74.2,205.417,205.417,0,0,1,50.7,96,3.74,3.74,0,0,1,49.8,96.9Zm.3-84.6a23.475,23.475,0,1,0,16.66,6.911A23.6,23.6,0,0,0,50.1,12.3Z" fill="#242052"/>
<g id="Group_1" data-name="Group 1">
<path id="Path_2" data-name="Path 2" d="M33.3,45.1V25.6L50,16.1l4.7,2.2L37.6,28l-.1,14.6,12.6,7,12.4-6.9-.2-9.4-7.9,4.5v6.1L50.7,46l-9.4-5.1V29.7l16.2-9.2,4.7,2.2L45.5,32.2v6.1L50.1,41l.1-5.7,16.5-9.4V45.1L50.1,54.5Z" fill="#c9974d"/>
</g>
</g>
</g>
</g>
</svg>
src/assets/pin.svg
<svg xmlns="http://www.w3.org/2000/svg" width="65.533" height="99" viewBox="0 0 65.533 99"> <svg xmlns="http://www.w3.org/2000/svg" width="24" height="50" viewBox="0 0 24 50">
<g id="Group_6" data-name="Group 6" transform="translate(-20 0)"> <g id="Group_1" data-name="Group 1" transform="translate(-38)">
<g id="Group_5" data-name="Group 5" transform="translate(-2.935 1.022)"> <path id="Path_1" data-name="Path 1" d="M0,0H24V50H0Z" transform="translate(38)" fill="#fff" opacity="0"/>
<ellipse id="Ellipse_4" data-name="Ellipse 4" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/> <g id="pin_1_" data-name="pin (1)" transform="translate(38)">
<ellipse id="Ellipse_6" data-name="Ellipse 6" cx="17" cy="6" rx="17" ry="6" transform="translate(38.935 85.978)" fill="#b5b5cd"/> <line id="Line_1" data-name="Line 1" y2="25" transform="translate(12 24)" fill="none" stroke="#556080" stroke-linecap="round" stroke-miterlimit="10" stroke-width="2"/>
</g> <circle id="Ellipse_1" data-name="Ellipse 1" cx="12" cy="12" r="12" fill="#242052"/>
<g id="Group_2" data-name="Group 2" transform="translate(3 -3)"> <ellipse id="Ellipse_2" data-name="Ellipse 2" cx="3" cy="2.5" rx="3" ry="2.5" transform="translate(5 6)" fill="#3d3873"/>
<circle id="Ellipse_1" data-name="Ellipse 1" cx="24.5" cy="24.5" r="24.5" transform="translate(25 11)" fill="#fff"/>
<g id="pin" transform="translate(-0.222 -0.104)">
<path id="Path_1" data-name="Path 1" d="M49.8,96.9c-3.7-4.7-7.4-9.2-10.9-13.9A147.669,147.669,0,0,1,22.5,56.1a55.361,55.361,0,0,1-4.9-15.4,31.919,31.919,0,0,1,7.4-26A31.406,31.406,0,0,1,44.9,3.5,32.726,32.726,0,0,1,82,28.8c1.6,7.1.5,13.9-1.8,20.7A111.792,111.792,0,0,1,67.3,74.2,205.419,205.419,0,0,1,50.7,96,3.74,3.74,0,0,1,49.8,96.9Zm.3-84.6A23.6,23.6,0,1,0,73.6,35.9,23.475,23.475,0,0,0,50.1,12.3Z" fill="#242052"/>
<g id="Group_1" data-name="Group 1">
<path id="Path_2" data-name="Path 2" d="M33.3,45.1V25.6L50,16.1l4.7,2.2L37.6,28l-.1,14.6,12.6,7,12.4-6.9-.2-9.4-7.9,4.5v6.1L50.7,46l-9.4-5.1V29.7l16.2-9.2,4.7,2.2L45.5,32.2v6.1L50.1,41l.1-5.7,16.5-9.4V45.1L50.1,54.5Z" fill="#c9974d"/>
</g>
</g>
</g> </g>
</g> </g>
</svg> </svg>
src/config/auth.service.ts
...@@ -373,11 +373,6 @@ export class AuthService { ...@@ -373,11 +373,6 @@ export class AuthService {
} }
resend() { resend() {
this.service.showToast( this.service.showToast('OTP sent successfully', 'top', 'my-toast', 1000);
'OTP sent successfully',
'top',
'my-toast',
1000
);
} }
} }
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