Skip to content

Add order state for free orders #2579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.9
Choose a base branch
from
Open

Add order state for free orders #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion system/modules/isotope/dca/tl_iso_config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
{pricing_legend},priceDisplay,currencyFormat,priceRoundPrecision,priceRoundIncrement;
{currency_legend},currency,currencyPosition,currencySymbol;
{converter_legend:hide},priceCalculateFactor,priceCalculateMode,currencyAutomator;
{order_legend:hide},orderPrefix,orderDigits,orderstatus_new,orderstatus_error,orderDetailsModule;
{order_legend:hide},orderPrefix,orderDigits,orderstatus_new,orderstatus_error,orderstatus_no_payment,orderDetailsModule;
{config_legend},templateGroup,cartMinSubtotal;
{products_legend},newProductPeriod;
{analytics_legend},ga_enable',
Expand Down Expand Up @@ -560,6 +560,17 @@
'sql' => "int(10) unsigned NOT NULL default '0'",
'relation' => array('type'=>'hasOne', 'load'=>'lazy'),
),
'orderstatus_no_payment' => array
(
'exclude' => true,
'filter' => true,
'inputType' => 'select',
'foreignKey' => \Isotope\Model\OrderStatus::getTable().'.name',
'options_callback' => array('\Isotope\Backend', 'getOrderStatus'),
'eval' => array('mandatory'=>true, 'includeBlankOption'=>true, 'tl_class'=>'w50'),
'sql' => "int(10) unsigned NOT NULL default '0'",
'relation' => array('type'=>'hasOne', 'load'=>'lazy'),
),
'orderDetailsModule' => array
(
'exclude' => true,
Expand Down
8 changes: 7 additions & 1 deletion system/modules/isotope/languages/da/tl_iso_config.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,12 @@
<trans-unit id="tl_iso_config.orderstatus_error.1">
<source>Select an order status if something goes wrong (e.g. payment).</source>
</trans-unit>
<trans-unit id="tl_iso_config.orderstatus_error.0">
<source>Status for free orders</source>
</trans-unit>
<trans-unit id="tl_iso_config.orderstatus_error.1">
<source>Choose a matching status for free orders. A payment module can override this.</source>
</trans-unit>
<trans-unit id="tl_iso_config.orderDetailsModule.0">
<source>Module for backend view</source>
</trans-unit>
Expand Down Expand Up @@ -491,4 +497,4 @@
</trans-unit>
</body>
</file>
</xliff>
</xliff>
6 changes: 5 additions & 1 deletion system/modules/isotope/library/Isotope/Model/ProductCollection/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,11 @@ public function checkout()

// Set order status only if a payment module has not already set it
if ($this->order_status == 0) {
$this->updateOrderStatus($this->getRelated('config_id')->orderstatus_new);
if(parent::requiresPayment()) {
$this->updateOrderStatus($this->getRelated('config_id')->orderstatus_new);
} else {
$this->updateOrderStatus($this->getRelated('config_id')->orderstatus_no_payment);
}
}

// !HOOK: post-process checkout
Expand Down