Skip to content

G
getme
Commit 5b3e5c67 by Adarsh K
Options

Merge branch 'arjunlatest' into 'master'

Arjunlatest See merge request !105
parents 003e409a 2623b304
Showing with 102 additions and 98 deletions
src/app/cart/cart.page.html
...@@ -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,10 +86,14 @@ ...@@ -86,10 +86,14 @@
<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> <div class="clear"></div>
</h5> </h5>
<ion-grid class="p0" *ngIf="cartService.carts && cartService.carts.length > 0"> <ion-grid
class="p0"
*ngIf="cartService.carts && cartService.carts.length > 0"
>
<ion-row *ngFor="let carts of cartService.carts"> <ion-row *ngFor="let carts of cartService.carts">
<ion-col size="6" class="p0"> <ion-col size="6" class="p0">
<h6 class="textLeft">{{unEscape(carts.prodName)}}</h6> <h6 class="textLeft">{{unEscape(carts.prodName)}}</h6>
...@@ -114,9 +118,10 @@ ...@@ -114,9 +118,10 @@
<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 />
{{addressService.custAddress.address}}
</h6> </h6>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -128,15 +133,13 @@ ...@@ -128,15 +133,13 @@
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<div class="payment_method"> <div class="payment_method">
<input type="radio" name="payments" id="cod" name="radio-group" checked="true" <input type="radio" name="payments" id="cod" name="radio-group" checked="true" (click)="getwaycod()" />
(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>
...@@ -145,8 +148,7 @@ ...@@ -145,8 +148,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 +158,7 @@ ...@@ -156,8 +158,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,14 +184,14 @@ ...@@ -183,14 +184,14 @@
<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 />
...@@ -198,25 +199,29 @@ ...@@ -198,25 +199,29 @@
<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> <div class="clear"></div>
</h6> </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> <div class="clear"></div>
</h6> </h6>
<h6> <h6>
<span class="floatLeft">GST/TAX</span> <span class="floatLeft">GST/TAX</span>
<span class="floatRight" *ngIf="cartService.cartTotal">A$ <span class="floatRight" *ngIf="cartService.cartTotal">A$
{{service.formatNumber(getTax(cartService.cartTotal))}}</span> {{service.formatNumber(getTax(cartService.cartTotal))}}</span
>
<div class="clear"></div> <div class="clear"></div>
</h6> </h6>
<h6 *ngIf="discountApplied"> <h6 *ngIf="discountApplied">
<span class="floatLeft">DISCOUNT</span> <span class="floatLeft">DISCOUNT</span>
<span class="floatRight">(-) A$ {{service.formatNumber(discount)}}</span> <span class="floatRight">(-) A$ {{service.formatNumber(discount)}}</span
>
<div class="clear"></div> <div class="clear"></div>
</h6> </h6>
<hr /> <hr />
...@@ -227,7 +232,8 @@ ...@@ -227,7 +232,8 @@
</ion-col> </ion-col>
<ion-col> <ion-col>
<p class="textRight" *ngIf="cartService.cartTotal"> <p class="textRight" *ngIf="cartService.cartTotal">
A$ {{service.formatNumber(getTotal(cartService.cartTotal))}} A$
{{service.formatNumber(getTotal(cartService.cartTotal))}}
</p> </p>
</ion-col> </ion-col>
</ion-row> </ion-row>
...@@ -242,7 +248,8 @@ ...@@ -242,7 +248,8 @@
<h3>Your order is due for delivery in</h3> <h3>Your order is due for delivery in</h3>
<h1>{{deliveryTime}}</h1> <h1>{{deliveryTime}}</h1>
<button class="view_order" (click)="goToPage('myorder')"> <button class="view_order" (click)="goToPage('myorder')">
VIEW ORDERS</button><br /> VIEW ORDERS</button
><br />
<button class="home_btn" (click)="goToPage('home')">HOME</button> <button class="home_btn" (click)="goToPage('home')">HOME</button>
</div> </div>
</ion-slide> </ion-slide>
...@@ -252,17 +259,24 @@ ...@@ -252,17 +259,24 @@
</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
class="footer_btnbay"
*ngIf="cartService.carts && cartService.carts.length > 0"
[hidden]="currentIndex != 0"
>
<div class="continue" (click)="goToPage('productlist')"> <div class="continue" (click)="goToPage('productlist')">
CONTINUE SHOPPING CONTINUE SHOPPING
</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
(click)="next(2);"> class="footer_btn"
*ngIf="cartService.carts && cartService.carts.length > 0"
[hidden]="currentIndex != 1"
(click)="next(2);"
>
PAY PAY
</div> </div>
</ion-footer> </ion-footer>
<div class="loader" *ngIf="loader"> <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
...@@ -290,46 +304,73 @@ ...@@ -290,46 +304,73 @@
</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-marker>
</agm-map> </agm-map>
<div class="add_address_wrapper"> <div class="add_address_wrapper">
<h5> <h5>
<span class="floatLeft">SELECT ADDRESS</span> <span class="floatLeft">SELECT ADDRESS</span>
<span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span> <span class="floatRight" (click)="istoggle(); goToPage('nearby')">ADD NEW</span
>
<div class="clear"></div> <div class="clear"></div>
</h5> </h5>
<ul *ngIf="addressService.addressList && addressService.addressList.length > 0"> <ul
<li *ngFor="let address of addressService.addressList; let i = index" *ngIf="addressService.addressList && addressService.addressList.length > 0"
[ngClass]="{'no-devlivery': !address.nearest}"> >
<li
*ngFor="let address of addressService.addressList; let i = index"
[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">DOES NOT DELIVER TO</h4> <h4 *ngIf="address.nearest === false">DOES NOT DELIVER TO</h4>
<div class="floatLeft"> <div>
{{address.default}} {{address.default}}
<input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" <input
(click)="setDefault(address.addressId, i)" [value]="address.addressId" #addressType /> class="styled-checkbox"
name="addressId"
id="styled-checkbox-{{i}}"
type="radio"
(click)="setDefault(address.addressId, i)"
[value]="address.addressId"
#addressType
/>
<label for="styled-checkbox-{{i}}"> {{address.addressType}} </label> <label for="styled-checkbox-{{i}}"> {{address.addressType}} </label>
</div> </div>
<div class="floatLeft"> <div>
<p> <p>
{{address.building}}, <span {{address.building}},
*ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span> <span *ngIf="address.landmark && address.landmark!==''"
>{{address.landmark}},</span
>
<!-- {{address.address}} --> <!-- {{address.address}} -->
</p> </p>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</li> </li>
</ul> </ul>
<div class="textCenter" *ngIf="addressService.addressList && addressService.addressList.length === 0">No <div
Address Found</div> class="textCenter"
*ngIf="addressService.addressList && addressService.addressList.length === 0"
>
No Address Found
</div>
</div> </div>
<!-- <div class="loader" *ngIf="loader"> <!-- <div class="loader" *ngIf="loader">
<div class="lds-ripple"> <div class="lds-ripple">
...@@ -338,5 +379,4 @@ ...@@ -338,5 +379,4 @@
</div> </div>
</div> --> </div> -->
</ion-content> </ion-content>
</div> </div>
\ No newline at end of file
src/app/home/home.page.html
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
</div> </div>
</div> </div>
<div class="search-sctn"> <div class="search-sctn">
<button class="nav_btn nav_search floatRight" *ngIf="!searchShow" <button class="nav_btn nav_search floatRight" *ngIf="!searchShow" (click)="goToPage('searchmodal')"></button>
(click)="goToPage('searchmodal')"></button>
<button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button> <button class="nav_btn nav_close floatRight" *ngIf="searchShow" (click)="searchClose()"></button>
</div> </div>
</div> </div>
...@@ -43,8 +42,7 @@ ...@@ -43,8 +42,7 @@
<h5>{{center.centerName}}</h5> <h5>{{center.centerName}}</h5>
<p>{{center.description}}</p> <p>{{center.description}}</p>
</div> </div>
<img [src]="center.centerImg" <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
onerror="this.src='./../../assets/getmi_malls/mall_banner/mall_4.png'" />
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</div> </div>
...@@ -52,12 +50,10 @@ ...@@ -52,12 +50,10 @@
Featured Stores Featured Stores
</div> </div>
<div class="featured_slider"> <div class="featured_slider">
<ion-slides pager="false" [options]="slideOpts" <ion-slides pager="false" [options]="slideOpts" *ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
*ngIf="shopperService.activeshoppers && shopperService.activeshoppers.length > 0">
<ion-slide *ngFor="let shopper of shopperService.activeshoppers"> <ion-slide *ngFor="let shopper of shopperService.activeshoppers">
<div class="feature_product" (click)="goToPage('productlist', shopper)"> <div class="feature_product" (click)="goToPage('productlist', shopper)">
<img [src]="shopper.featuredImage" <img [src]="shopper.featuredImage" onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
onerror="this.src='./../../assets/getmi_malls/featured/featured1.png'" />
<div class="feature_overlay"> <div class="feature_overlay">
<h5>{{shopper.name}}</h5> <h5>{{shopper.name}}</h5>
<p>{{shopper.caption}}</p> <p>{{shopper.caption}}</p>
...@@ -86,8 +82,7 @@ ...@@ -86,8 +82,7 @@
<ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0"> <ul *ngIf="centerService.nearcenters && centerService.nearcenters.length > 0">
<li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)"> <li *ngFor="let center of centerService.nearcenters" (click)="goToPage('storelist', center)">
<div class="nearby_image"> <div class="nearby_image">
<img [src]="center.centerImg" <img [src]="center.centerImg" onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
onerror="this.src='./../../assets/getmi_malls/mall_298/mall2.png'" />
</div> </div>
<div class="nearby_detail"> <div class="nearby_detail">
<h5> <h5>
...@@ -108,10 +103,8 @@ ...@@ -108,10 +103,8 @@
</div> </div>
<div class="featured_catagory_list"> <div class="featured_catagory_list">
<ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0"> <ul *ngIf="categoriesService.activecategories && categoriesService.activecategories.length > 0">
<li *ngFor="let categories of categoriesService.activecategories" <li *ngFor="let categories of categoriesService.activecategories" (click)="goToPage('catstorelist', categories)">
(click)="goToPage('catstorelist', categories)"> <img [src]="categories.catImage" onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<img [src]="categories.catImage"
onerror="this.src='../assets/handsome-man-outdoors-drinking-coffee-with-sunglasses-guy-with-beard-instagram-effect_1212-818@3x.png'" />
<div class="featured_overlay"> <div class="featured_overlay">
<h4>{{categories.catName}}</h4> <h4>{{categories.catName}}</h4>
</div> </div>
...@@ -143,12 +136,10 @@ ...@@ -143,12 +136,10 @@
<ion-content class="sort_wrappper"> <ion-content class="sort_wrappper">
<div class="location-finder"> <div class="location-finder">
<input type="text" placeholder="Search for location" (keydown.enter)="$event.preventDefault()" <input type="text" placeholder="Search for location" (keydown.enter)="$event.preventDefault()" autocorrect="off" autocapitalize="off" spellcheck="off" type="text" #building>
autocorrect="off" autocapitalize="off" spellcheck="off" type="text" #building>
</div> </div>
<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" [iconUrl]="
{ {
url: './assets/pin-2.svg', url: './assets/pin-2.svg',
...@@ -166,19 +157,16 @@ ...@@ -166,19 +157,16 @@
<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" <input class="styled-checkbox" name="addressId" id="styled-checkbox-{{i}}" type="radio" (click)="setDefault(address)" [value]="address.addressId" #addressType [checked]="address.defaultVal == 1" />
(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 {{address.building}}, <span *ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span>
*ngIf="address.landmark && address.landmark!==''">{{address.landmark}},</span>
<!-- {{address.address}} --> <!-- {{address.address}} -->
</p> </p>
</div> </div>
......
src/app/home/home.page.scss
...@@ -256,41 +256,23 @@ ...@@ -256,41 +256,23 @@
bottom: 0px; bottom: 0px;
z-index: 99; z-index: 99;
.location-finder { .location-finder {
position: absolute; position: absolute;
top: 15px; top: 15px;
left: 0; left: 0;
right: 0; right: 0;
padding: 0 20px; padding: 0 20px;
z-index: 1; z-index: 1;
input { input {
width: 100%; width: 100%;
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
outline: none; outline: none;
padding: 8px 15px 8px 35px; padding: 8px 15px 8px 35px;
border-radius: 25px; border-radius: 25px;
background-image: url('/assets/search_2.png'); background-image: url('/assets/search_2.png');
background-position: 15px; background-position: 15px;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 15px; background-size: 15px;
} }
} }
agm-map { agm-map {
width: 100%; width: 100%;
...@@ -399,5 +381,4 @@ ...@@ -399,5 +381,4 @@
white-space: nowrap; white-space: nowrap;
color: #6d6d6d; color: #6d6d6d;
} }
} }
\ No newline at end of file
src/app/orderplaced/orderplaced.page.html
...@@ -107,8 +107,7 @@ ...@@ -107,8 +107,7 @@
<div class="delivery-wrap"> <div class="delivery-wrap">
<h4 class="floatLeft">DELIVERY</h4> <h4 class="floatLeft">DELIVERY</h4>
<span class="floatRight" <span class="floatRight" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"><img
class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span> class="ng-tns-c3-0" src="../../assets/edit.png" (click)="changeAddress(data.orderId)" /></span>
<div class="clear"></div> <div class="clear"></div>
...@@ -117,8 +116,7 @@ ...@@ -117,8 +116,7 @@
<h5 *ngIf="data.deliveryAddress"> <h5 *ngIf="data.deliveryAddress">
{{data.deliveryAddress.addressType}} {{data.deliveryAddress.addressType}}
<!-- ,<br />{{data.deliveryAddress.address}} -->, <!-- ,<br />{{data.deliveryAddress.address}} -->,
<br /> {{data.deliveryAddress.building}}<span <br /> {{data.deliveryAddress.building}}<span *ngIf="data.deliveryAddress.landmark && data.deliveryAddress.landmark!==''"><br />,
*ngIf="data.deliveryAddress.landmark && data.deliveryAddress.landmark!==''"><br />,
{{data.deliveryAddress.landmark}}</span> {{data.deliveryAddress.landmark}}</span>
</h5> </h5>
<!-- <hr /> --> <!-- <hr /> -->
...@@ -184,8 +182,7 @@ ...@@ -184,8 +182,7 @@
<ion-footer> <ion-footer>
<div class="footer-btn"> <div class="footer-btn">
<button class="cancel_btn" (click)="cancelOrder(data.orderId)" <button class="cancel_btn" (click)="cancelOrder(data.orderId)" *ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
*ngIf="cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8">
CANCEL THIS ORDER CANCEL THIS ORDER
</button> </button>
</div> </div>
......
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