Browse Source

Create order --- added adddition param app_user to create order by user id

master
kj1352 5 years ago
parent
commit
e09143e877
7 changed files with 1002 additions and 998 deletions
  1. +960
    -954
      .firebase/hosting.d3d3.cache
  2. +5
    -0
      .firebaserc
  3. +1
    -1
      firebase.json
  4. +23
    -39
      package-lock.json
  5. +1
    -0
      package.json
  6. +4
    -2
      src/app/cart/cart.page.ts
  7. +8
    -2
      src/app/services/order.service.ts

+ 960
- 954
.firebase/hosting.d3d3.cache
File diff suppressed because it is too large
View File


+ 5
- 0
.firebaserc View File

@@ -0,0 +1,5 @@
{
"projects": {
"default": "mall-app-20"
}
}

+ 1
- 1
firebase.json View File

@@ -1,6 +1,6 @@
{
"hosting": {
"public": "www",
"public": "www/",
"ignore": [
"firebase.json",
"**/.*",


+ 23
- 39
package-lock.json View File

@@ -1277,39 +1277,19 @@
}
},
"@babel/compat-data": {
"version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
"integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
"dev": true,
"version": "7.8.0",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.0.tgz",
"integrity": "sha512-ixPUWJpnd9hHvRkyIE3mJ6PY5DEWmR08UkcpdqI5kV5g/d6knT8Wth1LE5v5sVTIJkm9dGpQsXnhwxcf2/PjAg==",
"requires": {
"browserslist": "^4.12.0",
"browserslist": "^4.8.2",
"invariant": "^2.2.4",
"semver": "^5.5.0"
"semver": "^7.1.1"
},
"dependencies": {
"browserslist": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
"integrity": "sha512-UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg==",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001043",
"electron-to-chromium": "^1.3.413",
"node-releases": "^1.1.53",
"pkg-up": "^2.0.0"
}
},
"caniuse-lite": {
"version": "1.0.30001066",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
"integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==",
"dev": true
},
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
"version": "7.3.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="
}
}
},
@@ -1580,6 +1560,17 @@
"semver": "^5.5.0"
},
"dependencies": {
"@babel/compat-data": {
"version": "7.10.1",
"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.10.1.tgz",
"integrity": "sha512-CHvCj7So7iCkGKPRFUfryXIkU2gSBw7VSZFYLsqVhrS47269VK2Hfi9S/YcublPMW8k1u2bQBlbDruoQEm4fgw==",
"dev": true,
"requires": {
"browserslist": "^4.12.0",
"invariant": "^2.2.4",
"semver": "^5.5.0"
}
},
"browserslist": {
"version": "4.12.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz",
@@ -4846,7 +4837,6 @@
"version": "4.8.3",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.8.3.tgz",
"integrity": "sha512-iU43cMMknxG1ClEZ2MDKeonKE1CCrFVkQK2AqO2YWFmvIrx4JWrvQ4w4hQez6EpVI8rHTtqh/ruHHDHSOKxvUg==",
"dev": true,
"requires": {
"caniuse-lite": "^1.0.30001017",
"electron-to-chromium": "^1.3.322",
@@ -5015,8 +5005,7 @@
"caniuse-lite": {
"version": "1.0.30001019",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001019.tgz",
"integrity": "sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g==",
"dev": true
"integrity": "sha512-6ljkLtF1KM5fQ+5ZN0wuyVvvebJxgJPTmScOMaFuQN2QuOzvRJnWSKfzQskQU5IOU4Gap3zasYPIinzwUjoj/g=="
},
"canonical-path": {
"version": "1.0.0",
@@ -6190,8 +6179,7 @@
"electron-to-chromium": {
"version": "1.3.453",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.453.tgz",
"integrity": "sha512-IQbCfjJR0NDDn/+vojTlq7fPSREcALtF8M1n01gw7nQghCtfFYrJ2dfhsp8APr8bANoFC8vRTFVXMOGpT0eetw==",
"dev": true
"integrity": "sha512-IQbCfjJR0NDDn/+vojTlq7fPSREcALtF8M1n01gw7nQghCtfFYrJ2dfhsp8APr8bANoFC8vRTFVXMOGpT0eetw=="
},
"elementtree": {
"version": "0.1.7",
@@ -7758,7 +7746,6 @@
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
"dev": true,
"requires": {
"loose-envify": "^1.0.0"
}
@@ -8266,8 +8253,7 @@
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
"dev": true
"integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls="
},
"js-yaml": {
"version": "3.13.1",
@@ -9339,7 +9325,6 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
"dev": true,
"requires": {
"js-tokens": "^3.0.0 || ^4.0.0"
}
@@ -9910,8 +9895,7 @@
"node-releases": {
"version": "1.1.57",
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz",
"integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==",
"dev": true
"integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw=="
},
"nopt": {
"version": "4.0.1",


+ 1
- 0
package.json View File

@@ -22,6 +22,7 @@
"@angular/pwa": "^0.802.1",
"@angular/router": "~8.1.2",
"@angular/service-worker": "~8.1.2",
"@babel/compat-data": "^7.8.0",
"@ionic-native/core": "^5.0.0",
"@ionic-native/geolocation": "^5.15.1",
"@ionic-native/splash-screen": "^5.0.0",


+ 4
- 2
src/app/cart/cart.page.ts View File

@@ -17,7 +17,7 @@ export type ICart = {
take_away: boolean,
order_status: boolean,
total_price: number,
soft_delete: boolean
soft_delete: boolean,
}>
};

@@ -40,6 +40,7 @@ export class CartPage implements OnInit {
selectedTempMallId: string;
show_promocodes: boolean = false;
selected_promocode: string = '';
userInfo: any;

constructor(
private location: Location,
@@ -51,6 +52,7 @@ export class CartPage implements OnInit {

ngOnInit() {
this.hideMenuButton();
this.userInfo = JSON.parse(localStorage.userInfo)['User Info'];
}

async presentModal(url: string) {
@@ -257,7 +259,7 @@ export class CartPage implements OnInit {
}

placeOrder() {
this.orderService.createOrder({
this.orderService.createOrder(this.userInfo.id, {
soft_delete: false,
orderedlist: this.userCart.orderedlist
}).then(() => {


+ 8
- 2
src/app/services/order.service.ts View File

@@ -11,7 +11,13 @@ export class OrderService {
private http: HttpClient
) { }

async createOrder(userCart: any) {
async createOrder(userId: any, userCart: any) {
let cart: any = userCart;

cart.app_user = {
user_id: userId
};

const httpOptions = {
headers: new HttpHeaders({
'Access-Control-Allow-Origin': '*',
@@ -20,7 +26,7 @@ export class OrderService {
})
};

return await this.http.post(URL + '/api/maioraservice/orders/v1/create/', userCart, httpOptions).toPromise();
return await this.http.post(URL + '/api/maioraservice/orders/v1/create/', cart, httpOptions).toPromise();
}

async getOrders(id: any) {


Loading…
Cancel
Save