coupon.rb in ultracart_api-3.1.17

- old
+ new

@@ -98,10 +98,12 @@
 
     attr_accessor :percent_off_items_and_free_shipping
 
     attr_accessor :percent_off_items_with_items_purchase
 
+    attr_accessor :percent_off_msrp_items
+
     attr_accessor :percent_off_retail_price_items
 
     attr_accessor :percent_off_shipping
 
     attr_accessor :percent_off_subtotal
@@ -184,10 +186,11 @@
         :'no_discount' => :'no_discount',
         :'percent_off_item_with_items_quantity_purchase' => :'percent_off_item_with_items_quantity_purchase',
         :'percent_off_items' => :'percent_off_items',
         :'percent_off_items_and_free_shipping' => :'percent_off_items_and_free_shipping',
         :'percent_off_items_with_items_purchase' => :'percent_off_items_with_items_purchase',
+        :'percent_off_msrp_items' => :'percent_off_msrp_items',
         :'percent_off_retail_price_items' => :'percent_off_retail_price_items',
         :'percent_off_shipping' => :'percent_off_shipping',
         :'percent_off_subtotal' => :'percent_off_subtotal',
         :'percent_off_subtotal_and_free_shipping' => :'percent_off_subtotal_and_free_shipping',
         :'percent_off_subtotal_limit' => :'percent_off_subtotal_limit',
@@ -247,10 +250,11 @@
         :'no_discount' => :'CouponNoDiscount',
         :'percent_off_item_with_items_quantity_purchase' => :'CouponPercentOffItemWithItemsQuantityPurchase',
         :'percent_off_items' => :'CouponPercentOffItems',
         :'percent_off_items_and_free_shipping' => :'CouponPercentOffItemsAndFreeShipping',
         :'percent_off_items_with_items_purchase' => :'CouponPercentOffItemsWithItemsPurchase',
+        :'percent_off_msrp_items' => :'CouponPercentOffMsrpItems',
         :'percent_off_retail_price_items' => :'CouponPercentOffRetailPriceItems',
         :'percent_off_shipping' => :'CouponPercentOffShipping',
         :'percent_off_subtotal' => :'CouponPercentOffSubtotal',
         :'percent_off_subtotal_and_free_shipping' => :'CouponPercentOffSubtotalAndFreeShipping',
         :'percent_off_subtotal_limit' => :'CouponPercentOffSubtotalLimit',
@@ -429,10 +433,14 @@
 
       if attributes.has_key?(:'percent_off_items_with_items_purchase')
         self.percent_off_items_with_items_purchase = attributes[:'percent_off_items_with_items_purchase']
       end
 
+      if attributes.has_key?(:'percent_off_msrp_items')
+        self.percent_off_msrp_items = attributes[:'percent_off_msrp_items']
+      end
+
       if attributes.has_key?(:'percent_off_retail_price_items')
         self.percent_off_retail_price_items = attributes[:'percent_off_retail_price_items']
       end
 
       if attributes.has_key?(:'percent_off_shipping')
@@ -658,10 +666,11 @@
           no_discount == o.no_discount &&
           percent_off_item_with_items_quantity_purchase == o.percent_off_item_with_items_quantity_purchase &&
           percent_off_items == o.percent_off_items &&
           percent_off_items_and_free_shipping == o.percent_off_items_and_free_shipping &&
           percent_off_items_with_items_purchase == o.percent_off_items_with_items_purchase &&
+          percent_off_msrp_items == o.percent_off_msrp_items &&
           percent_off_retail_price_items == o.percent_off_retail_price_items &&
           percent_off_shipping == o.percent_off_shipping &&
           percent_off_subtotal == o.percent_off_subtotal &&
           percent_off_subtotal_and_free_shipping == o.percent_off_subtotal_and_free_shipping &&
           percent_off_subtotal_limit == o.percent_off_subtotal_limit &&
@@ -688,10 +697,10 @@
     end
 
     # Calculates hash code according to all attributes.
     # @return [Fixnum] 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, 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, merchant_code, merchant_notes, multiple_amounts_off_items, no_discount, percent_off_item_with_items_quantity_purchase, percent_off_items, percent_off_items_and_free_shipping, percent_off_items_with_items_purchase, 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, start_dts, super_coupon, tiered_amount_off_item, tiered_amount_off_subtotal, tiered_percent_off_items, tiered_percent_off_shipping, tiered_percent_off_subtotal, 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, 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, merchant_code, merchant_notes, multiple_amounts_off_items, no_discount, 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, start_dts, super_coupon, tiered_amount_off_item, tiered_amount_off_subtotal, tiered_percent_off_items, tiered_percent_off_shipping, tiered_percent_off_subtotal, 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