[T2845] - Refactore "Suggested Donation amount" should be price based and not quantity based

my_compassion/controllers/my2_donations.py

@@ -323,8 +323,8 @@ def my2_gifts_thank_you_page(self, **kwargs):
     def _extract_donation_order_line_fields(product_template, post):
         # Compute quantity
         price = 0
-        amount = post.get("suggested_amount")
-        if amount == "custom":
+        amount_type = post.get("suggested_amount")
+        if amount_type == "custom":
             try:
                 price = float(post.get("custom_amount"))
             except (ValueError, TypeError) as e:
@@ -333,15 +333,15 @@ def _extract_donation_order_line_fields(product_template, post):
             if price <= 0:
                 raise BadRequest()
         else:
-            quantities = {
-                "low": product_template.my_compassion_donation_quantity_low,
-                "medium": product_template.my_compassion_donation_quantity_medium,
-                "high": product_template.my_compassion_donation_quantity_high,
+            amounts = {
+                "low": product_template.my_compassion_donation_amount_low,
+                "medium": product_template.my_compassion_donation_amount_medium,
+                "high": product_template.my_compassion_donation_amount_high,
             }
-            quantity = quantities.get(amount)
-            if not quantity:
+            price = amounts.get(amount_type)
+
+            if price is None or price <= 0:
                 raise BadRequest()
-            price = quantity * product_template.list_price
 
         # Get frequency
         frequency = post.get("frequency")
@@ -350,6 +350,7 @@ def _extract_donation_order_line_fields(product_template, post):
         order_line_fields = {
             "product_id": product.id,
             "price_unit": price,
+            "product_uom_qty": 1.0,
             "frequency": frequency,
         }
         if product_template.my_compassion_donation_type == "gift":

my_compassion/models/product_template.py

@@ -101,16 +101,25 @@ class ProductTemplate(models.Model):
     )
 
     # Donation suggestions
-    my_compassion_donation_quantity_low = fields.Integer(
-        default=1, help="Lowest quantity suggestion when making a donation"
+    my_compassion_donation_amount_low = fields.Monetary(
+        string="Lowest Amount",
+        currency_field="currency_id",
+        default=15.0,
+        help="Lowest price suggestion when making a donation",
     )
 
-    my_compassion_donation_quantity_medium = fields.Integer(
-        default=3, help="Medium quantity suggestion when making a donation"
+    my_compassion_donation_amount_medium = fields.Monetary(
+        string="Medium Amount",
+        currency_field="currency_id",
+        default=50.0,
+        help="Medium price suggestion when making a donation",
     )
 
-    my_compassion_donation_quantity_high = fields.Integer(
-        default=5, help="Highest quantity suggestion when making a donation"
+    my_compassion_donation_amount_high = fields.Monetary(
+        string="Highest Amount",
+        currency_field="currency_id",
+        default=100.0,
+        help="Highest price suggestion when making a donation",
     )
 
     def get_donation_limits(self, company, partner, sponsorship_id=None):

my_compassion/templates/components/my2_donation_form.xml

@@ -118,10 +118,7 @@
                                 class="suggested-amount"
                             />
                             <label class="mb-0 w-100" t-attf-for="#{base_name}-suggested-low">
-                                <t
-                                    t-set="price"
-                                    t-value="product.my_compassion_donation_quantity_low * product.list_price"
-                                />
+                                <t t-set="price" t-value="product.my_compassion_donation_amount_low" />
                                 <t t-esc="product.currency_id.name" />
                                 <t t-if="price % 1 == 0" t-esc="int(price)" />
                                 <t t-else="" t-esc="'{0:.2f}'.format(price)" />
@@ -137,10 +134,7 @@
                                 class="suggested-amount"
                             />
                             <label class="mb-0 w-100" t-attf-for="#{base_name}-suggested-medium">
-                                <t
-                                    t-set="price"
-                                    t-value="product.my_compassion_donation_quantity_medium * product.list_price"
-                                />
+                                <t t-set="price" t-value="product.my_compassion_donation_amount_medium" />
                                 <t t-esc="product.currency_id.name" />
                                 <t t-if="price % 1 == 0" t-esc="int(price)" />
                                 <t t-else="" t-esc="'{0:.2f}'.format(price)" />
@@ -156,10 +150,7 @@
                                 class="suggested-amount"
                             />
                             <label class="mb-0 w-100" t-attf-for="#{base_name}-suggested-high">
-                                <t
-                                    t-set="price"
-                                    t-value="product.my_compassion_donation_quantity_high * product.list_price"
-                                />
+                                <t t-set="price" t-value="product.my_compassion_donation_amount_high" />
                                 <t t-esc="product.currency_id.name" />
                                 <t t-if="price % 1 == 0" t-esc="int(price)" />
                                 <t t-else="" t-esc="'{0:.2f}'.format(price)" />

my_compassion/templates/components/my2_donation_product.xml

@@ -75,10 +75,7 @@
                         From
                         <span class="body-small bold">
                             <t t-esc="currency_name" />
-                            <t
-                                t-set="price"
-                                t-value="product.my_compassion_donation_quantity_low * product.list_price"
-                            />
+                            <t t-set="price" t-value="product.my_compassion_donation_amount_low" />
                             <t t-if="price % 1 == 0" t-set="price" t-value="'{0}.-'.format(int(price))" />
                             <t t-else="" t-set="price" t-value="'{0:.2f}'.format(price)" />
                             <t t-esc="price" />

my_compassion/views/product_view.xml

@@ -101,9 +101,9 @@
                         string="Suggested Donations"
                         attrs="{'invisible': [('activate_for_my_compassion', '=', False)]}"
                     >
-                        <field name="my_compassion_donation_quantity_low" string="Lowest suggested quantity" />
-                        <field name="my_compassion_donation_quantity_medium" string="Medium suggested quantity" />
-                        <field name="my_compassion_donation_quantity_high" string="High suggested quantity" />
+                        <field name="my_compassion_donation_amount_low" string="Lowest suggested amount" />
+                        <field name="my_compassion_donation_amount_medium" string="Medium suggested amount" />
+                        <field name="my_compassion_donation_amount_high" string="High suggested amount" />
                     </group>
                 </page>
             </xpath>