Skip to content

Commit

Permalink
reset to fetching order model
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomtimmerman
tomtimmerman committed Aug 26, 2021
1 parent 52edb41 commit a00ccf7
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions src/Cart.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,14 @@ export class Cart {

private async fetchOrder(orderId: string, validator?: OrderValidator, retryPolicy: Array<number> = [], forceOrder: boolean = false): Promise<Order> {
try {
let query = `query { me{cart(id: "${orderId}"){id,status,number,email,customer{id,fullName,email},paymentStatus,paymentUrl,payments{id,currency{code,name,exponent,symbol},amount,status,psp,method},refunds{id,currency{code,name,exponent,symbol},amount,status,refundMethod},totalPrice,totalTax,createDate,expiresOn,tokens{id,typeId,token},requiredPayments{currency{code,name,exponent,symbol},amount},requiredLoyaltyCardPayments{currency{code,name,exponent,symbol},cardType,amount},lineItems{ ... on AccessLineItem {id,packageOrderLineItemId,type,status,price,tax,currency{code,name,exponent,symbol},limit,name,accessDefinition{id},capacityLocationPath,requestedConditionPath,accessId,access{id,tokens},event{id,eventManagerId,name,location,start,end,availableCapacity}} ... on ProductLineItem {id,packageOrderLineItemId,type,status,name,price,tax,currency{name,code,exponent,symbol},requestedConditionPath,productId,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}},product{id,status}} },aggregatedLineItems{... on AggregatedAccessLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,accessIds,event{id,eventManagerId,name,start,location,end,availableCapacity},accessDefinition{name}} ... on AggregatedProductLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,productIds,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}}}}}} }`;
if(forceOrder) {
query = `query { me{order(id: "${orderId}"){id,status,number,email,customer{id,fullName,email},paymentStatus,paymentUrl,payments{id,currency{code,name,exponent,symbol},amount,status,psp,method},refunds{id,currency{code,name,exponent,symbol},amount,status,refundMethod},totalPrice,totalTax,createDate,expiresOn,tokens{id,typeId,token},requiredPayments{currency{code,name,exponent,symbol},amount},requiredLoyaltyCardPayments{currency{code,name,exponent,symbol},cardType,amount},lineItems{ ... on AccessLineItem {id,packageOrderLineItemId,type,status,price,tax,currency{code,name,exponent,symbol},limit,name,accessDefinition{id},capacityLocationPath,requestedConditionPath,accessId,access{id,tokens},event{id,eventManagerId,name,location,start,end,availableCapacity}} ... on ProductLineItem {id,packageOrderLineItemId,type,status,name,price,tax,currency{name,code,exponent,symbol},requestedConditionPath,productId,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}},product{id,status}} },aggregatedLineItems{... on AggregatedAccessLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,accessIds,event{id,eventManagerId,name,start,location,end,availableCapacity},accessDefinition{name}} ... on AggregatedProductLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,productIds,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}}}}}} }`;
}
const query = `query { me{order(id: "${orderId}"){id,status,number,email,customer{id,fullName,email},paymentStatus,paymentUrl,payments{id,currency{code,name,exponent,symbol},amount,status,psp,method},refunds{id,currency{code,name,exponent,symbol},amount,status,refundMethod},totalPrice,totalTax,createDate,expiresOn,tokens{id,typeId,token},requiredPayments{currency{code,name,exponent,symbol},amount},requiredLoyaltyCardPayments{currency{code,name,exponent,symbol},cardType,amount},lineItems{ ... on AccessLineItem {id,packageOrderLineItemId,type,status,price,tax,currency{code,name,exponent,symbol},limit,name,accessDefinition{id},capacityLocationPath,requestedConditionPath,accessId,access{id,tokens},event{id,eventManagerId,name,location,start,end,availableCapacity}} ... on ProductLineItem {id,packageOrderLineItemId,type,status,name,price,tax,currency{name,code,exponent,symbol},requestedConditionPath,productId,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}},product{id,status}} },aggregatedLineItems{... on AggregatedAccessLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,accessIds,event{id,eventManagerId,name,start,location,end,availableCapacity},accessDefinition{name}} ... on AggregatedProductLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,productIds,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}}}}}} }`;
// let query = `query { me{cart(id: "${orderId}"){id,status,number,email,customer{id,fullName,email},paymentStatus,paymentUrl,payments{id,currency{code,name,exponent,symbol},amount,status,psp,method},refunds{id,currency{code,name,exponent,symbol},amount,status,refundMethod},totalPrice,totalTax,createDate,expiresOn,tokens{id,typeId,token},requiredPayments{currency{code,name,exponent,symbol},amount},requiredLoyaltyCardPayments{currency{code,name,exponent,symbol},cardType,amount},lineItems{ ... on AccessLineItem {id,packageOrderLineItemId,type,status,price,tax,currency{code,name,exponent,symbol},limit,name,accessDefinition{id},capacityLocationPath,requestedConditionPath,accessId,access{id,tokens},event{id,eventManagerId,name,location,start,end,availableCapacity}} ... on ProductLineItem {id,packageOrderLineItemId,type,status,name,price,tax,currency{name,code,exponent,symbol},requestedConditionPath,productId,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}},product{id,status}} },aggregatedLineItems{... on AggregatedAccessLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,accessIds,event{id,eventManagerId,name,start,location,end,availableCapacity},accessDefinition{name}} ... on AggregatedProductLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,productIds,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}}}}}} }`;
// if(forceOrder) {
// query = `query { me{order(id: "${orderId}"){id,status,number,email,customer{id,fullName,email},paymentStatus,paymentUrl,payments{id,currency{code,name,exponent,symbol},amount,status,psp,method},refunds{id,currency{code,name,exponent,symbol},amount,status,refundMethod},totalPrice,totalTax,createDate,expiresOn,tokens{id,typeId,token},requiredPayments{currency{code,name,exponent,symbol},amount},requiredLoyaltyCardPayments{currency{code,name,exponent,symbol},cardType,amount},lineItems{ ... on AccessLineItem {id,packageOrderLineItemId,type,status,price,tax,currency{code,name,exponent,symbol},limit,name,accessDefinition{id},capacityLocationPath,requestedConditionPath,accessId,access{id,tokens},event{id,eventManagerId,name,location,start,end,availableCapacity}} ... on ProductLineItem {id,packageOrderLineItemId,type,status,name,price,tax,currency{name,code,exponent,symbol},requestedConditionPath,productId,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}},product{id,status}} },aggregatedLineItems{... on AggregatedAccessLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,accessIds,event{id,eventManagerId,name,start,location,end,availableCapacity},accessDefinition{name}} ... on AggregatedProductLineItem {id,type,orderLineItemIds,price,tax,totalPrice,totalTax,currency{name,code,exponent,symbol},limit,quantity,name,requestedConditionPath,productIds,productDefinition{id,name,apiConfig{... on MembershipApiConfig{source}, ... on CreditAccountApiConfig{source}}}}}}} }`;
// }
const response = await this.client.sendQuery<GetMeResponse>(query, []);
// const order = response.data.me.order;
const order = forceOrder ? response.data.me.order : response.data.me.cart;
const order = response.data.me.order;
// const order = forceOrder ? response.data.me.order : response.data.me.cart;
Cart.setOrder(order);

// check if order is in desired state
Expand Down

0 comments on commit a00ccf7

Please sign in to comment.