coupon.rb in ultracart_api-4.0.173

- old
+ new

@@ -69,10 +69,12 @@
 
     attr_accessor :free_item_and_shipping_with_subtotal
 
     attr_accessor :free_item_with_item_purchase
 
+    attr_accessor :free_item_with_item_purchase_and_free_shipping
+
     attr_accessor :free_item_with_subtotal
 
     attr_accessor :free_items_with_item_purchase
 
     attr_accessor :free_items_with_mixmatch_purchase
@@ -213,10 +215,11 @@
         :'discount_item_with_item_purchase' => :'discount_item_with_item_purchase',
         :'discount_items' => :'discount_items',
         :'expiration_dts' => :'expiration_dts',
         :'free_item_and_shipping_with_subtotal' => :'free_item_and_shipping_with_subtotal',
         :'free_item_with_item_purchase' => :'free_item_with_item_purchase',
+        :'free_item_with_item_purchase_and_free_shipping' => :'free_item_with_item_purchase_and_free_shipping',
         :'free_item_with_subtotal' => :'free_item_with_subtotal',
         :'free_items_with_item_purchase' => :'free_items_with_item_purchase',
         :'free_items_with_mixmatch_purchase' => :'free_items_with_mixmatch_purchase',
         :'free_shipping' => :'free_shipping',
         :'free_shipping_specific_items' => :'free_shipping_specific_items',
@@ -290,10 +293,11 @@
         :'discount_item_with_item_purchase' => :'CouponDiscountItemWithItemPurchase',
         :'discount_items' => :'CouponDiscountItems',
         :'expiration_dts' => :'String',
         :'free_item_and_shipping_with_subtotal' => :'CouponFreeItemAndShippingWithSubtotal',
         :'free_item_with_item_purchase' => :'CouponFreeItemWithItemPurchase',
+        :'free_item_with_item_purchase_and_free_shipping' => :'CouponFreeItemWithItemPurchaseAndFreeShipping',
         :'free_item_with_subtotal' => :'CouponFreeItemWithSubtotal',
         :'free_items_with_item_purchase' => :'CouponFreeItemsWithItemPurchase',
         :'free_items_with_mixmatch_purchase' => :'CouponFreeItemsWithMixMatchPurchase',
         :'free_shipping' => :'CouponFreeShipping',
         :'free_shipping_specific_items' => :'CouponFreeShippingSpecificItems',
@@ -452,10 +456,14 @@
 
       if attributes.key?(:'free_item_with_item_purchase')
         self.free_item_with_item_purchase = attributes[:'free_item_with_item_purchase']
       end
 
+      if attributes.key?(:'free_item_with_item_purchase_and_free_shipping')
+        self.free_item_with_item_purchase_and_free_shipping = attributes[:'free_item_with_item_purchase_and_free_shipping']
+      end
+
       if attributes.key?(:'free_item_with_subtotal')
         self.free_item_with_subtotal = attributes[:'free_item_with_subtotal']
       end
 
       if attributes.key?(:'free_items_with_item_purchase')
@@ -761,10 +769,11 @@
           discount_item_with_item_purchase == o.discount_item_with_item_purchase &&
           discount_items == o.discount_items &&
           expiration_dts == o.expiration_dts &&
           free_item_and_shipping_with_subtotal == o.free_item_and_shipping_with_subtotal &&
           free_item_with_item_purchase == o.free_item_with_item_purchase &&
+          free_item_with_item_purchase_and_free_shipping == o.free_item_with_item_purchase_and_free_shipping &&
           free_item_with_subtotal == o.free_item_with_subtotal &&
           free_items_with_item_purchase == o.free_items_with_item_purchase &&
           free_items_with_mixmatch_purchase == o.free_items_with_mixmatch_purchase &&
           free_shipping == o.free_shipping &&
           free_shipping_specific_items == o.free_shipping_specific_items &&
@@ -814,10 +823,10 @@
     end
 
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [affiliate_oid, allow_multiple_one_time_codes, amount_off_items, amount_off_shipping, amount_off_shipping_with_items_purchase, amount_off_subtotal, amount_off_subtotal_and_free_shipping, amount_off_subtotal_and_shipping, amount_off_subtotal_with_block_purchase, amount_off_subtotal_with_items_purchase, amount_off_subtotal_with_purchase, amount_shipping_with_subtotal, automatically_apply_coupon_codes, buy_one_get_one, calculated_description, can_be_used_with_other_coupons, coupon_oid, coupon_type, description, discount_item_with_item_purchase, discount_items, expiration_dts, free_item_and_shipping_with_subtotal, free_item_with_item_purchase, free_item_with_subtotal, free_items_with_item_purchase, free_items_with_mixmatch_purchase, free_shipping, free_shipping_specific_items, free_shipping_with_items_purchase, free_shipping_with_subtotal, hide_from_customer, merchant_code, merchant_notes, more_loyalty_cashback, more_loyalty_points, multiple_amounts_off_items, no_discount, percent_more_loyalty_cashback, percent_more_loyalty_points, percent_off_item_with_items_quantity_purchase, percent_off_items, percent_off_items_and_free_shipping, percent_off_items_with_items_purchase, percent_off_msrp_items, percent_off_retail_price_items, percent_off_shipping, percent_off_subtotal, percent_off_subtotal_and_free_shipping, percent_off_subtotal_limit, percent_off_subtotal_with_items_purchase, percent_off_subtotal_with_subtotal, quickbooks_code, restrict_by_postal_codes, restrict_by_screen_branding_theme_codes, restrict_by_storefronts, skip_on_rebill, start_dts, super_coupon, tiered_amount_off_items, tiered_amount_off_subtotal, tiered_percent_off_items, tiered_percent_off_shipping, tiered_percent_off_subtotal, tiered_percent_off_subtotal_based_on_msrp, usable_by].hash
+      [affiliate_oid, allow_multiple_one_time_codes, amount_off_items, amount_off_shipping, amount_off_shipping_with_items_purchase, amount_off_subtotal, amount_off_subtotal_and_free_shipping, amount_off_subtotal_and_shipping, amount_off_subtotal_with_block_purchase, amount_off_subtotal_with_items_purchase, amount_off_subtotal_with_purchase, amount_shipping_with_subtotal, automatically_apply_coupon_codes, buy_one_get_one, calculated_description, can_be_used_with_other_coupons, coupon_oid, coupon_type, description, discount_item_with_item_purchase, discount_items, expiration_dts, free_item_and_shipping_with_subtotal, free_item_with_item_purchase, free_item_with_item_purchase_and_free_shipping, free_item_with_subtotal, free_items_with_item_purchase, free_items_with_mixmatch_purchase, free_shipping, free_shipping_specific_items, free_shipping_with_items_purchase, free_shipping_with_subtotal, hide_from_customer, merchant_code, merchant_notes, more_loyalty_cashback, more_loyalty_points, multiple_amounts_off_items, no_discount, percent_more_loyalty_cashback, percent_more_loyalty_points, percent_off_item_with_items_quantity_purchase, percent_off_items, percent_off_items_and_free_shipping, percent_off_items_with_items_purchase, percent_off_msrp_items, percent_off_retail_price_items, percent_off_shipping, percent_off_subtotal, percent_off_subtotal_and_free_shipping, percent_off_subtotal_limit, percent_off_subtotal_with_items_purchase, percent_off_subtotal_with_subtotal, quickbooks_code, restrict_by_postal_codes, restrict_by_screen_branding_theme_codes, restrict_by_storefronts, skip_on_rebill, start_dts, super_coupon, tiered_amount_off_items, tiered_amount_off_subtotal, tiered_percent_off_items, tiered_percent_off_shipping, tiered_percent_off_subtotal, tiered_percent_off_subtotal_based_on_msrp, usable_by].hash
     end
 
     # Builds the object from hash
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself