diff --git a/src/application/helpers/export_helper.php b/src/application/helpers/export_helper.php index 2b20c892..8712bdc1 100644 --- a/src/application/helpers/export_helper.php +++ b/src/application/helpers/export_helper.php @@ -3,35 +3,35 @@ // quark_helper.php Chris Dart Feb 9, 2015 4:34:51 PM // chrisdart@cerebratorium.com -function format_sunlight ($sunlight, $format = "quark") -{ - $output = ""; - if ($format == "quark" || $format == "poster") { - if (strstr($sunlight, "full")) { - $output .= "Í"; - } - if (strstr($sunlight, "part")) { - $output .= "∏"; - } - if (strstr($sunlight, "shade")) { - $output .= "Ó"; - } - } else { - if (strstr($sunlight, "full")) { - $output .= "+++"; - } - if (strstr($sunlight, "part")) { - $output .= "%%%"; - } - if (strstr($sunlight, "shade")) { - $output .= "///"; - } - } +function format_sunlight($sunlight, $format = "quark") { + $output = ""; + if ($format == "quark" || $format == "poster") { + if (strstr($sunlight, "full")) { + $output .= "Í"; + } + if (strstr($sunlight, "part")) { + $output .= "∏"; + } + if (strstr($sunlight, "shade")) { + $output .= "Ó"; + } + } + else { + if (strstr($sunlight, "full")) { + $output .= "+++"; + } + if (strstr($sunlight, "part")) { + $output .= "%%%"; + } + if (strstr($sunlight, "shade")) { + $output .= "///"; + } + } - if ($format == "quark") { - $output = sprintf("%s", $output); - } - return $output; + if ($format == "quark") { + $output = sprintf("%s", $output); + } + return $output; } /** @@ -40,247 +40,258 @@ function format_sunlight ($sunlight, $format = "quark") * Someday we'll * clean this up. */ -function format_flags ($flags, $format = "quark") -{ - $output = FALSE; - foreach ($flags as $flag) { - switch ($flag->name) { - case "Bees": - if ($format == "quark" || $format == "poster") { - $output .= "Ω"; - // If(flag~Bee > "a";"Ω";"") - } else { - $output = "Bee"; - } - break; - case "Birds": - if ($format == "quark" || $format == "poster") { - $output .= "ı"; - } else { - $output = "BirdB"; - } - break; - case "Butterflies": - if ($format == "quark" || $format == "poster") { - $output .= "∫"; - } else { - $output .= "ButterB"; - } - break; - case "Cold Sensitive": - if ($format == "quark" || $format == "poster") { - $output .= "†"; - } else { - $output .= "ColdB"; - } - break; - case "Culinary": - if ($format == "quark" || $format == "poster") { - $output .= "Ç"; - } else { - $output .= "CulinaryB"; - } - break; - case "Edible Flowers": - if ($format == "quark" || $format == "poster") { - $output .= "´"; - } else { - $output .= "EdibleB"; - } - break; - case "Ground Cover": - if ($format == "quark" || $format == "poster") { - $output .= "˝"; - } else { - $output = "GroundB"; - } - break; - case "Hummingbirds": - if ($format == "quark" || $format == "poster") { - $output .= "˙"; - } else { - $output .= "HummB"; - } - break; - case "Interesting Foliage": - if ($format == "quark" || $format == "poster") { - $output .= "ç"; - } else { - $output .= "FoliageB"; - } - break; - case "Medicinal": - if ($format == "quark" || $format == "poster") { - $output .= "Â"; - } else { - $output .= "MedicinalB"; - } - break; - case "Minnesota Native": - if ($format == "quark" || $format == "poster") { - $output .= "˜"; - } else { - $output .= "NativeB"; - } - break; - case "Organic": - if ($format == "quark" || $format == "poster") { - $output .= "Ø"; - } else { - $output .= "OrganicB"; - } - break; - case "Poisonous": - if ($format == "quark" || $format == "poster") { - $output .= "¥"; - } else { - $output .= "PoisonousB"; - } - break; - case "Rock Garden": - if ($format == "quark" || $format == "poster") { - $output .= "‰"; - } else { - $output .= "RockB"; - } - break; - } - } - if ($format == "quark") { - if ($output) { - $output = sprintf("%s", $output); - } - } - return $output; +function format_flags($flags, $format = "quark") { + $output = FALSE; + foreach ($flags as $flag) { + switch ($flag->name) { + case "Bees": + if ($format == "quark" || $format == "poster") { + $output .= "Ω"; + // If(flag~Bee > "a";"Ω";"") + } + else { + $output = "Bee"; + } + break; + case "Birds": + if ($format == "quark" || $format == "poster") { + $output .= "ı"; + } + else { + $output = "BirdB"; + } + break; + case "Butterflies": + if ($format == "quark" || $format == "poster") { + $output .= "∫"; + } + else { + $output .= "ButterB"; + } + break; + case "Cold Sensitive": + if ($format == "quark" || $format == "poster") { + $output .= "†"; + } + else { + $output .= "ColdB"; + } + break; + case "Culinary": + if ($format == "quark" || $format == "poster") { + $output .= "Ç"; + } + else { + $output .= "CulinaryB"; + } + break; + case "Edible Flowers": + if ($format == "quark" || $format == "poster") { + $output .= "´"; + } + else { + $output .= "EdibleB"; + } + break; + case "Ground Cover": + if ($format == "quark" || $format == "poster") { + $output .= "˝"; + } + else { + $output = "GroundB"; + } + break; + case "Hummingbirds": + if ($format == "quark" || $format == "poster") { + $output .= "˙"; + } + else { + $output .= "HummB"; + } + break; + case "Interesting Foliage": + if ($format == "quark" || $format == "poster") { + $output .= "ç"; + } + else { + $output .= "FoliageB"; + } + break; + case "Medicinal": + if ($format == "quark" || $format == "poster") { + $output .= "Â"; + } + else { + $output .= "MedicinalB"; + } + break; + case "Minnesota Native": + if ($format == "quark" || $format == "poster") { + $output .= "˜"; + } + else { + $output .= "NativeB"; + } + break; + case "Organic": + if ($format == "quark" || $format == "poster") { + $output .= "Ø"; + } + else { + $output .= "OrganicB"; + } + break; + case "Poisonous": + if ($format == "quark" || $format == "poster") { + $output .= "¥"; + } + else { + $output .= "PoisonousB"; + } + break; + case "Rock Garden": + if ($format == "quark" || $format == "poster") { + $output .= "‰"; + } + else { + $output .= "RockB"; + } + break; + } + } + if ($format == "quark") { + if ($output) { + $output = sprintf("%s", $output); + } + } + return $output; } /** * Assume that the determination of new year is calculated elsewhere. */ -function format_new ($format = "quark") -{ - if ($format == "quark") { - $output = sprintf("%s", "◊"); - }elseif($format == "poster"){ - $output = "◊"; - } else { - $output = "Y"; - } +function format_new($format = "quark") { + if ($format == "quark") { + $output = sprintf("%s", "◊"); + } + elseif ($format == "poster") { + $output = "◊"; + } + else { + $output = "Y"; + } - return $output; + return $output; } -function format_saturday ($format = "quark") -{ - if ($format == "quark") { - $output = sprintf("%s", "ß"); - }elseif($format == "poster"){ - $output = "ß"; - } else { - $output = "qqq"; - } - return $output; +function format_saturday($format = "quark") { + if ($format == "quark") { + $output = sprintf("%s", "ß"); + } + elseif ($format == "poster") { + $output = "ß"; + } + else { + $output = "qqq"; + } + return $output; } /** * format the dimensions of the dimensions of the object * * @param $object + * * @return string If a variety doesn't have a measurmement, then assume inches. */ -function format_quark_dimensions ($object) -{ - $output = array(); - if (($object->min_height && $object->min_height > 0) || ($object->max_height && $object->max_height > 0 )) { - $output["height"] = format_dimensions($object->min_height, $object->max_height, - $object->height_unit == "Inches" || $object->height_unit == NULL ? "”" : "’", "h"); - } - if (($object->min_width && $object->min_height > 0) || ($object->max_width && $object->max_width > 0)) { - $output["width"] = format_dimensions($object->min_width, $object->max_width, $object->width_unit == "Inches" || $object->width_unit == NULL ? "”" : "’", - "w"); - } - return implode(" by ", $output); +function format_quark_dimensions($object) { + $output = []; + if (($object->min_height && $object->min_height > 0) || ($object->max_height && $object->max_height > 0)) { + $output["height"] = format_dimensions($object->min_height, $object->max_height, + $object->height_unit == "Inches" || $object->height_unit == NULL ? "”" : "’", "h"); + } + if (($object->min_width && $object->min_height > 0) || ($object->max_width && $object->max_width > 0)) { + $output["width"] = format_dimensions($object->min_width, $object->max_width, $object->width_unit == "Inches" || $object->width_unit == NULL ? "”" : "’", + "w"); + } + return implode(" by ", $output); } -function format_description ($description, $object, $format = FALSE) -{ - if ($object->print_description) { - $output[] = trim($object->print_description); - } - // if ($format == "web") { - // if ($object->web_description) { - // $output[] = trim($object->web_description); - // } - // } - $output[] = $description; - return implode(" ", $output); +function format_description($description, $object, $format = FALSE) { + if ($object->print_description) { + $output[] = trim($object->print_description); + } + // if ($format == "web") { + // if ($object->web_description) { + // $output[] = trim($object->web_description); + // } + // } + $output[] = $description; + return implode(" ", $output); } -function subcategory_order ($categories = array()) -{ - if (! $categories) { - $categories = array( - "Indoor Plants", - "Hanging Baskets", - "Succulents", - "General Annuals", - "General Perennials", - "Water Plants" - ); - } - $category_order = "CASE "; +function subcategory_order($categories = []) { + if (!$categories) { + $categories = [ + "Indoor Plants", + "Hanging Baskets", + "Succulents", + "General Annuals", + "General Perennials", + "Water Plants", + ]; + } + $category_order = "CASE "; - for ($i = 0; $i < count($categories); $i ++) { - $my_category = $categories[$i]; - $x = $i + 1; - $category_order .= "WHEN subcategory='$my_category' THEN $x "; - } - $category_order .= "END"; - return $category_order; + for ($i = 0; $i < count($categories); $i++) { + $my_category = $categories[$i]; + $x = $i + 1; + $category_order .= "WHEN subcategory='$my_category' THEN $x "; + } + $category_order .= "END"; + return $category_order; } -function quark_single ($common) -{ - $variety = $common->varieties[0]; - $output[] = sprintf("@Common Name:<@Number In-text>%s<@\$p> %s ", $variety->catalog_number, $common->name); - $output[] = $variety->count_midsale > 0 ? format_saturday("quark") : ""; - $output[] = $variety->new_year == get_current_year() ? format_new("quark") : ""; - $output[] = sprintf("

@Latin Name:%s ", quark_latin_name($common->genus, $variety->species)); - $output[] = sprintf(" %s", $variety->variety); - $output[] = sprintf("

@Copy:%s ", format_description($common->description, $variety, "quark")); - $output[] = format_quark_dimensions($variety); - $output[] = sprintf(" %s", format_sunlight($common->sunlight, "quark")); - $output[] = format_flags($variety->flags, "quark"); - $output[] = sprintf("

@Pot and Price Right:%s--%s", get_as_price($variety->price), $variety->pot_size); - return implode("", $output); +function quark_single($common) { + $variety = $common->varieties[0]; + $output[] = sprintf("@Common Name:<@Number In-text>%s<@\$p> %s ", $variety->catalog_number, $common->name); + $output[] = $variety->count_midsale > 0 ? format_saturday("quark") : ""; + $output[] = $variety->new_year == get_current_year() ? format_new("quark") : ""; + $output[] = sprintf("

@Latin Name:%s ", quark_latin_name($common->genus, $variety->species)); + $output[] = sprintf(" %s", $variety->variety); + $output[] = sprintf("

@Copy:%s ", format_description($common->description, $variety, "quark")); + $output[] = format_quark_dimensions($variety); + $output[] = sprintf(" %s", format_sunlight($common->sunlight, "quark")); + $output[] = format_flags($variety->flags, "quark"); + $output[] = sprintf("

@Pot and Price Right:%s--%s", get_as_price($variety->price), $variety->pot_size); + return implode("", $output); } -function quark_multiple ($common) -{ - $output[] = sprintf("@Common Name:%s

@Latin Name:%s

@Copy:%s %s", $common->name, $common->genus, $common->description, - format_sunlight($common->sunlight, "quark")); +function quark_multiple($common) { + $output[] = sprintf("@Common Name:%s

@Latin Name:%s

@Copy:%s %s", $common->name, $common->genus, $common->description, + format_sunlight($common->sunlight, "quark")); - // set prices and pot sizes based on if they show up in the output. - $base_price = FALSE; - $base_size = FALSE; - foreach ($common->varieties as $variety) { - $price = FALSE; - $pot_size = FALSE; - if ($base_price != $variety->price || $base_size != $variety->pot_size) { - $price = $variety->price; - $pot_size = $variety->pot_size; - $base_price = $price; - $base_size = $pot_size; - } - //if either the pot size or price have changed, then print them out. - if ($price || $pot_size) { - $output[] = sprintf("

@Pot and Price:%s--%s:", get_as_price($price), $pot_size); - } - $output[] = sprintf("

@Copy After Copy:<@Number In-text>%s ", $variety->catalog_number); - $output[] = sprintf("<@In text Goudy Sans Bold>%s<@\$p> %s ", $variety->variety, quark_latin_name($common->genus,$variety->species,TRUE)); - $output[] = $variety->new_year == get_current_year() ? format_new("quark") : ""; - $output[] = (get_value($variety, "count_midsale") > 0) ? " " . format_saturday("quark") : ""; - $output[] = sprintf("--%s %s %s", $variety->print_description, format_quark_dimensions($variety), format_flags($variety->flags, "quark")); - } - return implode("", $output); + // set prices and pot sizes based on if they show up in the output. + $base_price = FALSE; + $base_size = FALSE; + foreach ($common->varieties as $variety) { + $price = FALSE; + $pot_size = FALSE; + if ($base_price != $variety->price || $base_size != $variety->pot_size) { + $price = $variety->price; + $pot_size = $variety->pot_size; + $base_price = $price; + $base_size = $pot_size; + } + //if either the pot size or price have changed, then print them out. + if ($price || $pot_size) { + $output[] = sprintf("

@Pot and Price:%s--%s:", get_as_price($price), $pot_size); + } + $output[] = sprintf("

@Copy After Copy:<@Number In-text>%s ", $variety->catalog_number); + $output[] = sprintf("<@In text Goudy Sans Bold>%s<@\$p> %s ", $variety->variety, quark_latin_name($common->genus, $variety->species, TRUE)); + $output[] = $variety->new_year == get_current_year() ? format_new("quark") : ""; + $output[] = (get_value($variety, "count_midsale") > 0) ? " " . format_saturday("quark") : ""; + $output[] = sprintf("--%s %s %s", $variety->print_description, format_quark_dimensions($variety), format_flags($variety->flags, "quark")); + } + return implode("", $output); } diff --git a/src/application/models/Order_model.php b/src/application/models/Order_model.php index aec371ae..7a503137 100644 --- a/src/application/models/Order_model.php +++ b/src/application/models/Order_model.php @@ -366,8 +366,10 @@ function get_for_catalog($year, $category = NULL) { $this->db->order_by('(' . subcategory_order() . ')'); $this->db->order_by('subcategory.subcategory'); $this->db->order_by('common.name', 'ASC'); - $this->db->order_by('orders.price', 'ASC'); - $this->db->order_by('orders.pot_size', 'ASC'); + if($this->get_current_year() != 2021) { + $this->db->order_by('orders.price', 'ASC'); + $this->db->order_by('orders.pot_size', 'ASC'); + } $this->db->order_by('variety.variety', 'ASC'); $this->db->select('orders.id,category.category'); $result = $this->db->get()->result(); diff --git a/src/application/views/order/catalog.php b/src/application/views/order/catalog.php index d79e004b..40635669 100644 --- a/src/application/views/order/catalog.php +++ b/src/application/views/order/catalog.php @@ -4,6 +4,7 @@ // variety_order.php Chris Dart Mar 4, 2013 8:44:25 PM // chrisdart@cerebratorium.com + if (!empty($orders)) : ?> @@ -33,10 +34,8 @@ Friday Order Saturday Order - - Midsale Order - + Midsale Order Total Pot Size Flat Size @@ -46,7 +45,7 @@ Price Grower Code + title="Include or exclude these items from the flat totals calculator on the home page"> Excluded from flat totals @@ -76,7 +75,7 @@ $flat_cost = $order->flat_size * $order->plant_cost; } $row_classes = [ - "grouping", + "grouping", ]; $latest_year = get_value($order, "latest_year", TRUE); @@ -95,31 +94,31 @@ $row_classes [] = has_price_discrepancy($order); ?> " - id="order_id; ?>" - data-order-id="id; ?>"> + id="order_id; ?>" + data-order-id="id; ?>"> Omit + id="omit-order_id; ?>">Omit "Edit", - "href" => site_url("order/edit/$order->id"), - "class" => [ - "button", - "edit", - "dialog", - "edit-order", - ], - "id" => sprintf("edit-order_%s", $order->id), + 'text' => 'Edit', + 'href' => site_url('order/edit/'. $order->id), + 'class' => [ + 'button', + 'edit', + 'dialog', + 'edit-order', + ], + 'id' => sprintf('edit-order_%s', $order->id), ]); ?> "Details", - "class" => ["button", "details"], - "href" => site_url("order/view/$order->id"), + "text" => "Details", + "class" => ["button", "details"], + "href" => site_url("order/view/$order->id"), ]); ?> @@ -134,92 +133,128 @@ class="order-year field">year, "", "order" class="order-grower_id field">grower_id, "", "order", $order->id, ["envelope" => "span"]); ?> + catalog_number ? $order->catalog_number : ucfirst(substr($order->category, 0, 1)), "", "order", $order->id, ["envelope" => "span"]); ?> genus)); ?>" - title="View all genus; ?>">genus; ?> + href="genus)); ?>" + title="View all genus; ?>">genus; ?> species; ?> common_id"); ?>" - title="View the details for name; ?>">name; ?> + title="View the details for name; ?>">name; ?> variety_id"); ?>" - title="View the details for variety; ?>">variety; ?> + href="variety_id"); ?>" + title="View the details for variety; ?>">variety; ?> - count_presale, "", "order", $order->id, ["envelope" => "span"]); ?> + count_presale, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - count_friday, "", "order", $order->id, ["envelope" => "span"]); ?> + count_friday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - count_saturday, "", "order", $order->id, ["envelope" => "span"]); ?> - - - - count_midsale, "", "order", $order->id, ["envelope" => "span"]); ?> + count_saturday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> + + count_midsale, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> + - received_presale, "", "order", $order->id, ["envelope" => "span"]); ?> + received_presale, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - remainder_friday, "", "order", $order->id, ["envelope" => "span"]); ?> + remainder_friday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - sellout_friday, "", "order", $order->id, ["envelope" => "span"]); ?> + sellout_friday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - received_midsale, "", "order", $order->id, ["envelope" => "span"]); ?> + received_midsale, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - remainder_saturday, "", "order", $order->id, ["envelope" => "span"]); ?> + remainder_saturday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - sellout_saturday, "", "order", $order->id, ["envelope" => "span"]); ?> + sellout_saturday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - remainder_sunday, "", "order", $order->id, ["envelope" => "span"]); ?> + remainder_sunday, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> - count_dead, "", "order", $order->id, ["envelope" => "span"]); ?> + count_dead, "", "order", $order->id, [ + "envelope" => "span", + 'title' => 'enter x to zero out the value', + ]); ?> count_midsale + $order->count_presale + $order->count_friday + $order->count_saturday; ?> pot_size, "", "order", $order->id, [ - "envelope" => "span", - "class" => "pot-size", + class="order-pot_size field no-wrap">pot_size, "", "order", $order->id, [ + "envelope" => "span", + "class" => "pot-size", ]); ?> flat_size; ?> + class="edit-cost">flat_size; ?> + id="flat_cost"> $ flat_cost, 2); ?> + class="edit-cost">flat_cost, 2); ?> + id="plant_cost"> $ plant_cost, 2); ?> + class="edit-cost">plant_cost, 2); ?> $flat_cost * ($order->count_presale + $order->count_midsale + $order->count_friday + $order->count_saturday), 2); ?> @@ -228,7 +263,7 @@ class="edit-cost">plant_cost, 2); ?> $price, "", "order", $order->id, ["envelope" => "span"]); ?> grower_code, "", "order", $order->id, ["envelope" => "span"]); ?> + class="order-grower_code field">grower_code, "", "order", $order->id, ["envelope" => "span"]); ?> flat_exclude_button)): ?> @@ -237,16 +272,16 @@ class="order-grower_code field">gro "Re-order", - "href" => site_url("order/create?variety_id=$order->variety_id&reorder=1"), - "id" => "oc_$order->variety_id", - "class" => [ - "button", - "new", - "create", - "dialog", - "order-create", - ], + "text" => "Re-order", + "href" => site_url("order/create?variety_id=$order->variety_id&reorder=1"), + "id" => "oc_$order->variety_id", + "class" => [ + "button", + "new", + "create", + "dialog", + "order-create", + ], ]); ?> @@ -267,18 +302,18 @@ class="order-grower_code field">gro + title="Presale total"> + title="Friday total"> - - + title="Saturday total"> + + + title="Grand total flats"> diff --git a/src/application/views/order/edit.php b/src/application/views/order/edit.php index b09ffdaa..0e855156 100644 --- a/src/application/views/order/edit.php +++ b/src/application/views/order/edit.php @@ -2,29 +2,32 @@ // row.php Chris Dart Mar 4, 2013 9:25:12 PM chrisdart@cerebratorium.com $crop_failure = FALSE; - +if (empty($order)): + return FALSE; +endif; $days = ['presale', 'midsale']; if (get_value($order, 'year') == 2021) { $days = [ - 'presale', - 'friday', - 'saturday', + 'presale', + 'friday', + 'saturday', + 'midsale', ]; } ?>

" - method="post"> + action="" + method="post">
CROP FAILURE
"/> + value=""/> + value=""/>

Order details

@@ -33,51 +36,54 @@
" - required/> + name="year" + value="" + required/>
"/> + name="grower_id" + value=""/>
"/> + value=""/>
- " - required autocomplete="off"/> + + " + required autocomplete="off"/>
- " - required autocomplete="off"/> + + " + required autocomplete="off"/>
- " - autocomplete="off" required/> + + " + autocomplete="off" required/>
" - required - autocomplete="off"/> + name="price" + value="" + required + autocomplete="off"/>
@@ -86,23 +92,26 @@
- "/> + + "/>
- " - size="10"/> + + " + size="10"/>
- " - size="10"/> + + " + size="10"/>
@@ -113,9 +122,9 @@ + name="count_" + value="" + autocomplete="off"/>
@@ -127,60 +136,63 @@
" - name="" - value="" - autocomplete="off"/> + Received:  + " + name="" + value="" + autocomplete="off"/>
" - size="6"/> + type="text" + name="sellout_friday" + value="" + size="6"/>
" - size="3"/> + type="text" + name="remainder_friday" + value="" + size="3"/>
" - size="6"/> + type="text" + name="sellout_saturday" + value="" + size="6"/>
" - size="3"/> + name="remainder_saturday" + value="" + size="3"/>
" - size="3"/> + Sunday:  + " + size="3"/>
- " - size="3"/> + + " + size="3"/>
@@ -191,12 +203,12 @@
+ class="button "/> "Delete", - "class" => ["button", "delete", "delete-order"], - "id" => "delete-order_$order->id", + "text" => "Delete", + "class" => ["button", "delete", "delete-order"], + "id" => "delete-order_$order->id", ]); ?>
diff --git a/src/application/views/order/export.php b/src/application/views/order/export.php index 3d43487d..acb9c278 100644 --- a/src/application/views/order/export.php +++ b/src/application/views/order/export.php @@ -50,8 +50,10 @@ 'category' => 'Category', 'subcategory' => 'Subcategory', 'pot_size' => 'Pot Size', - 'count_presale' => 'Wednesday', - 'count_midsale' => 'Saturday', + 'count_presale' => 'Presale', + 'count_friday' => 'Friday 2021', + 'count_saturday' => 'Saturday 2021', + 'count_midsale' => 'Midsale', 'flat_count' => 'Total Flats', 'flat_size' => 'Flat Size', 'flat_cost' => 'Flat Cost',