#313: No price entry unless editing enabled

- Also corrects some PHP Notice/Warning logs from the add-to-order cart class.

Author: lat9

zc_plugins/EditOrders/v5.0.0/admin/includes/classes/EoCart.php

@@ -232,13 +232,17 @@ public function addProduct(string $uprid, array $attributes, int|float $qty): ar
         $new_product['cart_contents'] = $uprid_contents;
         $new_product['is_virtual'] ??= $this->productIsVirtual($new_product, $cart_attributes);
 
-        $products_total = zen_add_tax(($qty * $new_product['final_price']) + $new_product['onetime_charges'], $new_product['tax']);
+        // -----
+        // Note: 'tax' isn't present for a newly-added product; it'll be calculated (as will total/weight)
+        // at a later time.
+        //
+        $products_total = zen_add_tax(($qty * $new_product['final_price']) + $new_product['onetime_charges'], $new_product['tax'] ?? 0);
         $products_weight = $qty * $new_product['products_weight'];
 
         $this->total += $products_total;
         $this->weight += $products_weight;
 
-        if ($product['is_virtual'] === true || $product['product_is_always_free_shipping'] === 1) {
+        if ($new_product['is_virtual'] === true || $new_product['product_is_always_free_shipping'] === 1) {
             $this->free_shipping_item += $qty;
             $this->free_shipping_price += $products_total;
             $this->free_shipping_weight += $products_weight;

zc_plugins/EditOrders/v5.0.0/admin/includes/modules/eo_prod_add_modal.php

@@ -146,19 +146,19 @@
                     <?= zen_draw_input_field('name', $new_product['name'], 'id="prod-name" class="form-control" ' . $name_params) ?>
                 </div>
             </div>
-
+<?php
+    // -----
+    // Determine whether prices and taxes can be manually updated.
+    //
+    $price_entry_disabled = ($_SESSION['eo_price_calculations'] === 'Manual') ? '' : 'disabled';
+?>
             <div class="form-group">
                 <label class="control-label col-sm-2" for="prod-tax"><?= TEXT_LABEL_TAX ?></label>
                 <div class="col-sm-10">
-                    <?= zen_draw_input_field('tax', $new_product['tax'], 'id="prod-tax" class="form-control" disabled', false, 'number') ?>
+                    <?= zen_draw_input_field('tax', $new_product['tax'], 'id="prod-tax" class="form-control" min="0" max="100" step="any" ' . $price_entry_disabled, false, 'number') ?>
                 </div>
             </div>
 <?php
-    // -----
-    // Determine whether prices can be manually updated.
-    //
-    $price_entry_disabled = ($_SESSION['eo_price_calculations'] === 'Manual') ? '' : 'disabled';
-
     $final_price = $new_product['final_price'];
     $final_price_label = rtrim((DISPLAY_PRICE_WITH_TAX === 'true') ? TABLE_HEADING_UNIT_PRICE_NET : TABLE_HEADING_UNIT_PRICE, ':');
 ?>

zc_plugins/EditOrders/v5.0.0/admin/includes/modules/eo_prod_update_modal.php

@@ -181,7 +181,7 @@
                 <div class="form-group">
                     <label class="control-label col-sm-2" for="prod-tax"><?= TEXT_LABEL_TAX ?></label>
                     <div class="col-sm-10">
-                        <?= zen_draw_input_field('tax', $updated_product['tax'], 'id="prod-tax" class="form-control" min="0" max="100" step="any"', false, 'number') ?>
+                        <?= zen_draw_input_field('tax', $updated_product['tax'], 'id="prod-tax" class="form-control" min="0" max="100" step="any" ' . $price_entry_disabled, false, 'number') ?>
                     </div>
                 </div>
 <?php