Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
getme
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
amal
getme
Commits
aad75dad
Commit
aad75dad
authored
Mar 11, 2020
by
Arjun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
order details page
parent
88d20df1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
18 deletions
+36
-18
changeaddress.page.ts
src/app/changeaddress/changeaddress.page.ts
+4
-2
orderplaced.page.html
src/app/orderplaced/orderplaced.page.html
+10
-3
orderplaced.page.scss
src/app/orderplaced/orderplaced.page.scss
+22
-13
No files found.
src/app/changeaddress/changeaddress.page.ts
View file @
aad75dad
...
@@ -100,7 +100,9 @@ export class ChangeaddressPage implements OnInit {
...
@@ -100,7 +100,9 @@ export class ChangeaddressPage implements OnInit {
if
(
this
.
latitude
!==
this
.
lat
&&
this
.
longitude
!==
this
.
lng
)
{
if
(
this
.
latitude
!==
this
.
lat
&&
this
.
longitude
!==
this
.
lng
)
{
this
.
lat
=
this
.
latitude
;
this
.
lat
=
this
.
latitude
;
this
.
lng
=
this
.
longitude
;
this
.
lng
=
this
.
longitude
;
this
.
myorder
.
getNearBy
(
this
.
latitude
,
this
.
longitude
,
this
.
order
.
orderId
).
then
(
resp
=>
{
this
.
myorder
.
getNearBy
(
this
.
latitude
,
this
.
longitude
,
this
.
order
.
orderId
)
.
then
(
resp
=>
{
console
.
log
(
resp
);
console
.
log
(
resp
);
if
(
resp
)
{
if
(
resp
)
{
this
.
addressValid
=
resp
;
this
.
addressValid
=
resp
;
...
@@ -143,7 +145,7 @@ export class ChangeaddressPage implements OnInit {
...
@@ -143,7 +145,7 @@ export class ChangeaddressPage implements OnInit {
onSubmit
(
data
:
any
)
{
onSubmit
(
data
:
any
)
{
this
.
loader
=
true
;
this
.
loader
=
true
;
this
.
service
.
get
(
'orderId'
).
then
(
(
orderId
)
=>
{
this
.
service
.
get
(
'orderId'
).
then
(
orderId
=>
{
const
postData
:
Address
=
{
const
postData
:
Address
=
{
address
:
this
.
address
,
address
:
this
.
address
,
addressType
:
data
.
addressType
,
addressType
:
data
.
addressType
,
...
...
src/app/orderplaced/orderplaced.page.html
View file @
aad75dad
...
@@ -113,9 +113,7 @@
...
@@ -113,9 +113,7 @@
{{data.deliveryAddress.addressType}},
<br
/>
{{data.deliveryAddress.address}},
{{data.deliveryAddress.addressType}},
<br
/>
{{data.deliveryAddress.address}},
<br
/>
{{data.deliveryAddress.building}},
<br
/>
{{data.deliveryAddress.landmark}}
<br
/>
{{data.deliveryAddress.building}},
<br
/>
{{data.deliveryAddress.landmark}}
</h5>
</h5>
<button
class=
"cancel_btn"
(
click
)="
cancelOrder
(
data
.
orderId
)"
*
ngIf=
"cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"
>
CANCEL THIS ORDER
</button>
<!-- <hr /> -->
<!-- <hr /> -->
</div>
</div>
...
@@ -176,3 +174,11 @@
...
@@ -176,3 +174,11 @@
</div> -->
</div> -->
</div>
</div>
</ion-content>
</ion-content>
<ion-footer>
<div
class=
"footer-btn"
>
<button
class=
"cancel_btn"
(
click
)="
cancelOrder
(
data
.
orderId
)"
*
ngIf=
"cancelDelivery > 0 && data.orderStatus != 0 && data.orderStatus != 8"
>
CANCEL THIS ORDER
</button>
</div>
</ion-footer>
\ No newline at end of file
src/app/orderplaced/orderplaced.page.scss
View file @
aad75dad
...
@@ -159,19 +159,6 @@
...
@@ -159,19 +159,6 @@
padding-top
:
20px
;
padding-top
:
20px
;
padding-bottom
:
10px
;
padding-bottom
:
10px
;
}
}
.cancel_btn
{
border-radius
:
8px
;
height
:
45px
;
width
:
100%
;
background-color
:
#29285b
;
color
:
#fff
;
font-size
:
18px
;
font-weight
:
lighter
;
padding-left
:
20px
;
padding-right
:
20px
;
margin-bottom
:
20px
;
margin-top
:
20px
;
}
.delivery-wrap
{
.delivery-wrap
{
img
{
img
{
width
:
20px
;
width
:
20px
;
...
@@ -282,3 +269,24 @@
...
@@ -282,3 +269,24 @@
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
}
}
.footer-btn
{
padding
:
0
20px
;
.cancel_btn
{
border-radius
:
8px
;
height
:
45px
;
width
:
100%
;
background-color
:
#29285b
;
color
:
#fff
;
font-size
:
18px
;
font-weight
:
lighter
;
padding-left
:
20px
;
padding-right
:
20px
;
margin-bottom
:
15px
;
margin-top
:
10px
;
}
}
.footer-md
:before
{
background
:
none
;
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment