Merge pull request #7 from diconium/feature/release_2.1

Chiran:03/06: Release 2.1 Fixes

Author: rafaelbarbosa-diconium

cif/cart/src/Interface/CartItemInterface.js

@@ -39,7 +39,6 @@ class CartItemInterface {
     return this.data.map(item => {
       return {
         __typename: this.__typename,
-        id: item.entryNumber,
         uid: item.entryNumber,
         prices: {
           price: {

cif/cart/src/RemoveCouponFromCartLoader.js

@@ -77,7 +77,7 @@ class RemoveCouponFromCartLoader {
     return new Promise((resolve, reject) => {
       vouchersList &&
         vouchersList.vouchers.map(({ code }) => {
-          let uri = `${HB_PROTOCOL}://${HB_API_HOST}${HB_API_BASE_PATH}${HB_BASESITEID}/users/${customerId}/carts/${cartId}/vouchers/${code}?fields=DEFAULT`;
+          let uri = `${HB_PROTOCOL}://${HB_API_HOST}${HB_API_BASE_PATH}${HB_BASESITEID}/users/${customerId}/carts/${cartId}/vouchers/${code}?fields=FULL`;
           axios
             .delete(uri, {
               params: {

cif/cart/src/RemoveItemFromCartLoader.js

@@ -75,9 +75,8 @@ class RemoveItemFromCartLoader {
       HB_BASESITEID,
     } = actionParameters.context.settings;
 
-    let { cart_id, cart_item_id, cart_item_uid } = cartInput;
-    cart_item_id = cart_item_uid || cart_item_id;
-    const uri = `${HB_PROTOCOL}://${HB_API_HOST}${HB_API_BASE_PATH}${HB_BASESITEID}/users/${customerId}/carts/${cart_id}/entries/${cart_item_id}?fields=DEFAULT`;
+    let { cart_id, cart_item_uid } = cartInput;
+    const uri = `${HB_PROTOCOL}://${HB_API_HOST}${HB_API_BASE_PATH}${HB_BASESITEID}/users/${customerId}/carts/${cart_id}/entries/${cart_item_uid}?fields=DEFAULT`;
     return new Promise((resolve, reject) => {
       axios
         .delete(uri, {

cif/cart/src/SetShippingAddressesOnCart.js

@@ -47,7 +47,6 @@ class SetShippingAddressesOnCart {
    */
   __load() {
     return this.setShippingAddressOnCartLoader.load(this.cartId).then(data => {
-      console.log(data);
       return this.shippingMethodsLoader.load(this.cartId).then(result => {
         data.deliveryModes = result.deliveryModes;
         return data;

cif/cart/src/UpdateCartItemsLoader.js

@@ -75,8 +75,7 @@ class UpdateCartItemsLoader {
     const { cart_id, cart_items } = queryInput;
 
     const cart_item = cart_items[0];
-    let { cart_item_id, cart_item_uid, quantity } = cart_item;
-    cart_item_uid = cart_item_uid ? cart_item_uid : cart_item_id;
+    let { cart_item_uid, quantity } = cart_item;
     let body = {
       quantity: quantity,
     };

cif/cart/test/integration/addProductToCartTest.js

@@ -62,7 +62,6 @@ describe('AddProductToCart', () => {
       args.query =
         'mutation {addSimpleProductsToCart(input:{cart_id: "00000035", cart_items: [{data: {quantity: "1", sku: "3514521" } }]}){cart {items {id,product { name,sku },quantity} }}}';
       return resolve(args).then(result => {
-        console.log(result);
         assert.isUndefined(result.errors);
         assert.equal(AddProduct.callCount, 1);
       });

cif/cart/test/integration/cartResolverTest.js

@@ -63,7 +63,6 @@ describe('Cart Resolver', () => {
       args.query =
         '{cart(cart_id: "00000000") {email,billing_address {city,country {code,label},firstname,lastname,postcode, region {code,label},street,telephone},shipping_addresses{firstname,lastname,street,city,region{code,label},country{code,label},available_shipping_methods{amount{currency,value},available,carrier_code,carrier_title,error_message,method_code,method_title,price_excl_tax{value,currency},price_incl_tax{value,currency}},selected_shipping_method{amount{value,currency},carrier_code,carrier_title,method_code,method_title}},items{id,product{name,sku},quantity},available_payment_methods{code,title},selected_payment_method{code,title},applied_coupon{code},prices{grand_total{value,currency}}}}';
       return resolve(args).then(result => {
-        console.log(result);
         assert.isUndefined(result.errors);
         let response = result.data.cart;
         assert.notEqual(response, null);

cif/cart/test/integration/createEmptyCartTest.js

@@ -62,7 +62,6 @@ describe('CreateEmptyCart', function() {
     it('Mutation: validate response should return new cart id', () => {
       args.query = 'mutation {createEmptyCart}';
       return resolve(args).then(result => {
-        console.log(result);
         const { errors } = result;
         assert.isUndefined(result.errors);
         let responseData = result.data.createEmptyCart;

cif/cart/test/integration/removeItemFromCartTest.js

@@ -59,7 +59,7 @@ describe('RemoveItemFromCart', () => {
 
     it('Remove item from cart', () => {
       args.query =
-        'mutation { removeItemFromCart( input: { cart_id: "00000035", cart_item_id: "0" }) {cart { items {id,product { name } quantity } prices { grand_total{ value,currency}}}}}';
+        'mutation { removeItemFromCart( input: { cart_id: "00000035", cart_item_uid: "0" }) {cart { items {uid,product { name } quantity } prices { grand_total{ value,currency}}}}}';
       return resolve(args).then(result => {
         assert.isUndefined(result.errors);
         assert.equal(RemoveItem.callCount, 1);

cif/cart/test/integration/setShippingAddressOnCartTest.it.js

@@ -65,7 +65,7 @@ describe('Shipping Address on Cart', () => {
 
     it('Mutation: set shipping address on cart', () => {
       args.query =
-        'mutation {setShippingAddressesOnCart(input: {cart_id: "00000035", shipping_addresses: [{address: {firstname: "Senthil", lastname: "Roll", company: "Magento", street: ["Magento shipping", "Main Street"], city: "Austin", region: "WA", postcode: "78758", country_code: "US", telephone: "9999998899", save_in_address_book: false}}]}) { cart {shipping_addresses {firstname,lastname,company,street,city,region {code,label},postcode,telephone,country {code,label} }}}}';
+        'mutation {setShippingAddressesOnCart(input: {cart_id: "00000035", shipping_addresses: [{address: {firstname: "Test User", lastname: "Roll", company: "Magento", street: ["Magento shipping", "Main Street"], city: "Austin", region: "WA", postcode: "78758", country_code: "US", telephone: "9999998899", save_in_address_book: false}}]}) { cart {shipping_addresses {firstname,lastname,company,street,city,region {code,label},postcode,telephone,country {code,label} }}}}';
       return resolve(args).then(result => {
         assert.isUndefined(result.errors); // No GraphQL errors
         assert.equal(ShippingAddress.callCount, 1);