Version 4.6.0

2025-12-19 05:55:31 -08:00
1 parent f79dcf067a
commit 517a5e1f70
@@ -4,5 +4,6 @@
    "app_directory": "nexus",
    "app_protected": 0,
    "app_website": null,
-    "app_update_check": null
+    "app_update_check": null,
+    "app_hide_tab": 0
 }
@@ -24,6 +24,8 @@
 <task frequency="P0Y0M1DT0H0M0S">terminateHosting</task>
 <task frequency="P0Y0M0DT0H30M0S">expectedOutputMonitoring</task>
 <task frequency="P0Y0M1DT0H0M0S">cartCleanup</task>
+ <task frequency="P0Y0M0DT0H10M0S">billingAgreements</task>
+ <task frequency="P0Y0M0DT0H10M0S">gatewayPending</task>
 <setting key="billing_agreement_gateways"><![CDATA[{"key":"billing_agreement_gateways","default":"0","report":"bool"}]]></setting>
 <setting key="card_storage_gateways"><![CDATA[{"key":"card_storage_gateways","default":"0","report":"bool"}]]></setting>
 <setting key="cm_invoice_expireafter"><![CDATA[{"key":"cm_invoice_expireafter","default":"30","report":"full"}]]></setting>
@@ -96,6 +98,7 @@
 <setting key="nexus_payout_max"><![CDATA[{"key":"nexus_payout_max","default":"","report":"bool"}]]></setting>
 <setting key="nexus_payout_max_period"><![CDATA[{"key":"nexus_payout_max_period","default":"[\"1\",\"day\"]","report":"bool"}]]></setting>
 <setting key="nexus_payout_min"><![CDATA[{"key":"nexus_payout_min","default":"","report":"bool"}]]></setting>
+ <setting key="nexus_payout_unlimited_times"><![CDATA[{"key":"nexus_payout_unlimited_times","default":"1","report":"full"}]]></setting>
 <setting key="nexus_reg_force"><![CDATA[{"key":"nexus_reg_force","default":"0","report":"full"}]]></setting>
 <setting key="nexus_reg_group"><![CDATA[{"key":"nexus_reg_group","default":"0","report":"bool"}]]></setting>
 <setting key="nexus_require_billing"><![CDATA[{"key":"nexus_require_billing","default":"product,giftvoucher,donation,domain,other","report":"bool"}]]></setting>
@@ -223,11 +226,11 @@
 <acpsearch key="app=nexus&amp;module=support&amp;controller=settings&amp;tab=statuses"><![CDATA[{"lang_key":"statuses","restriction":"settings_manage","keywords":["closed","open","resolved","statuses","tags"]}]]></acpsearch>
 <acpsearch key="app=nexus&amp;module=support&amp;controller=settings&amp;tab=stockactions"><![CDATA[{"lang_key":"stock_actions","restriction":"stockactions_manage","keywords":["defined","pre defined","pre set","predefined","preset","stock","stock actions","stock messages","stock replies"]}]]></acpsearch>
 <acpsearch key="app=nexus&amp;module=support&amp;controller=volume"><![CDATA[{"lang_key":"menu__nexus_support_volume","restriction":"volume_manage","keywords":["new ticket stats","support statistics","support stats"]}]]></acpsearch>
- <hook key="clientAreaLinkLoad"><![CDATA[{"type":"C","class":"\\IPS\\Data\\Store\\Database"}]]></hook>
- <hook key="clientAreaLink"><![CDATA[{"type":"S","class":"\\IPS\\Theme\\class_core_front_global"}]]></hook>
- <hook key="frontDispatcher"><![CDATA[{"type":"C","class":"\\IPS\\Dispatcher\\Front"}]]></hook>
 <hook key="DispatcherAdmin"><![CDATA[{"type":"C","class":"\\IPS\\Dispatcher\\Admin"}]]></hook>
+ <hook key="clientAreaLinkLoad"><![CDATA[{"type":"C","class":"\\IPS\\Data\\Store\\Database"}]]></hook>
 <hook key="register"><![CDATA[{"type":"C","class":"\\IPS\\core\\modules\\front\\system\\register"}]]></hook>
+ <hook key="clientAreaLink"><![CDATA[{"type":"S","class":"\\IPS\\Theme\\class_core_front_global"}]]></hook>
 <hook key="Database"><![CDATA[{"type":"C","class":"\\IPS\\Data\\Store\\Database"}]]></hook>
- <themesetting key="cm_store_view"><![CDATA[{"sc_key":"cm_store_view","sc_type":"Select","sc_multiple":0,"sc_content":"[{\"key\":\"grid\",\"value\":\"cm_store_view_grid\"},{\"key\":\"list\",\"value\":\"cm_store_view_list\"}]","sc_app":"nexus","sc_default":"grid","sc_tab_key":"custom","sc_show_in_vse":0,"sc_title":"themesetting_cm_store_view","sc_order":11,"sc_condition":null}]]></themesetting>
+ <hook key="frontDispatcher"><![CDATA[{"type":"C","class":"\\IPS\\Dispatcher\\Front"}]]></hook>
+ <themesetting key="cm_store_view"><![CDATA[{"sc_key":"cm_store_view","sc_type":"Select","sc_multiple":0,"sc_content":"[{\"key\":\"grid\",\"value\":\"cm_store_view_grid\"},{\"key\":\"list\",\"value\":\"cm_store_view_list\"}]","sc_app":"nexus","sc_default":"grid","sc_tab_key":"custom","sc_show_in_vse":0,"sc_title":"themesetting_cm_store_view","sc_order":12,"sc_condition":null}]]></themesetting>
 </build>
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <emails><template><template_app>nexus</template_app><template_name>staffReplyPending</template_name><template_content_html><![CDATA[{$email->language->addToStack("your_reply_is_pending", FALSE)}<br />
 <br />
-<a href='{expression="\IPS\Settings::i()->base_url"}applications/nexus/interface/email/sendDiscard.php?id={$message->id}&key={expression="md5( $message->item()->email_key . $message->date )"}&send=1' style="color: #ffffff; font-family: 'Helvetica Neue', helvetica, sans-serif; text-decoration: none; font-size: 12px; background: #417ba3; line-height: 32px; padding: 0 10px; display: inline-block; border-radius: 3px;">{$email->language->addToStack("send_it", FALSE)}</a>
-<a href='{expression="\IPS\Settings::i()->base_url"}applications/nexus/interface/email/sendDiscard.php?id={$message->id}&key={expression="md5( $message->item()->email_key . $message->date )"}&send=0' style="color: #ffffff; font-family: 'Helvetica Neue', helvetica, sans-serif; text-decoration: none; font-size: 12px; background: #417ba3; line-height: 32px; padding: 0 10px; display: inline-block; border-radius: 3px;">{$email->language->addToStack("discard_it", FALSE)}</a>
+{{$key = md5( $message->item()->email_key . $message->date );}}
+<a href='{url="app=nexus&module=support&controller=email&do=sendDiscard&id={$message->id}&key={$key}&send=1" base="front"}' style="color: #ffffff; font-family: 'Helvetica Neue', helvetica, sans-serif; text-decoration: none; font-size: 12px; background: #417ba3; line-height: 32px; padding: 0 10px; display: inline-block; border-radius: 3px;">{$email->language->addToStack("send_it", FALSE)}</a>
+<a href='{url="app=nexus&module=support&controller=email&do=sendDiscard&id={$message->id}&key={$key}&send=0" base="front"}' style="color: #ffffff; font-family: 'Helvetica Neue', helvetica, sans-serif; text-decoration: none; font-size: 12px; background: #417ba3; line-height: 32px; padding: 0 10px; display: inline-block; border-radius: 3px;">{$email->language->addToStack("discard_it", FALSE)}</a>
 <br />
 <br />
 <table width='100%' cellpadding='15' cellspacing='0' border='0' style='background: #f5f5f5'>
@@ -18,10 +19,11 @@

 <br />
 <br />
-<em style='color: #8c8c8c'>&mdash; {setting="board_name"}</em>]]></template_content_html><template_data>$message, $newMessage, $email</template_data><template_content_plaintext><![CDATA[{$email->language->addToStack("your_reply_is_pending", FALSE)}
+<em style='color: #8c8c8c'>&mdash; {setting="board_name"}</em>]]></template_content_html><template_data>$message, $newMessage, $email</template_data><template_content_plaintext><![CDATA[{{$key = md5( $message->item()->email_key . $message->date );}}
+{$email->language->addToStack("your_reply_is_pending", FALSE)}
 ---
-{$email->language->addToStack("send_it", FALSE)}: {expression="\IPS\Settings::i()->base_url" raw="true"}applications/nexus/interface/email/sendDiscard.php?id={$message->id}&key={expression="md5( $message->item()->email_key . $message->date )" raw="true"}&send=1
-{$email->language->addToStack("discard_it", FALSE)} {expression="\IPS\Settings::i()->base_url" raw="true"}applications/nexus/interface/email/sendDiscard.php?id={$message->id}&key={expression="md5( $message->item()->email_key . $message->date )" raw="true"}&send=0
+{$email->language->addToStack("send_it", FALSE)}: {url="app=nexus&module=support&controller=email&do=sendDiscard&id={$message->id}&key={$key}&send=1" base="front"}
+{$email->language->addToStack("discard_it", FALSE)} {url="app=nexus&module=support&controller=email&do=sendDiscard&id={$message->id}&key={$key}&send=0" base="front"}
 ---
 {expression="\IPS\Email::buildPlaintextBody( $newMessage->content() )" raw="true"}
 ---
@@ -114,7 +116,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$item->price} {$email->language->get("each_short")}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$item->price->toString( $email->language )} {$email->language->get("each_short")}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -147,7 +149,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -168,7 +170,7 @@
 						<strong>{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}</strong>
 					</td>
 					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; line-height: 21px" align='right'>
-						<strong style="font-size: 1.5em">{$transaction->amount}</strong>
+						<strong style="font-size: 1.5em">{$transaction->amount->toString( $email->language )}</strong>
 					</td>
 				</tr>
 			{{endif}}
@@ -250,7 +252,7 @@
 {$email->language->get("order_details")}
 =====
 {{foreach $summary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$item->price} {$email->language->get("each_short")}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$item->price->toString( $email->language )} {$email->language->get("each_short")}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$summary['subtotal']->toString( $email->language )}
@@ -263,13 +265,13 @@
 {{if \count( $summary['tax'] )}}
 ---
 {{foreach $summary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
 {$email->language->get('total')}: {$summary['total']->toString( $email->language )}
 {{if $transactions = $invoice->transactions() and \count( $transactions )}}{{foreach $transactions as $transaction}}{{if $transaction->status === $transaction::STATUS_PAID}}
-{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}: {$transaction->amount}
+{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}: {$transaction->amount->toString( $email->language )}
 {{endif}}{{endforeach}}{$email->language->get('total_to_pay')}: {$invoice->amountToPay()->toString( $email->language )}
 {{endif}}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>nexus</template_app><template_name>acp_notification_Withdrawal</template_name><template_content_html><![CDATA[<br />
 {$email->language->addToStack( "email_notify_withdrawal", FALSE )}
@@ -434,7 +436,11 @@
 				{{endif}}
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$item->linePrice()->toString( $email->language )}</strong>
+				{{if $item->tax AND \IPS\Settings::i()->nexus_show_tax}}
+					<strong>{$item->grossLinePrice()->toString( $email->language)}</strong> {{if $email->language->checkKeyExists('nexus_tax_explain_val')}}<span style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 12px; color: #bdbdbd; line-height: 18px;">{$email->language->get('nexus_tax_explain_val')}</span>{{endif}}
+				{{else}}
+					<strong>{$item->linePrice()->toString( $email->language )}</strong>
+				{{endif}}
 			</td>
 		</tr>
 	{{endforeach}}
@@ -464,7 +470,7 @@
 {{endif}}

 {$email->language->get("email_expiring_soon")}:
-{{foreach $summary['items'] as $k => $item}}{$item->quantity} x</span> {$item->name} ({$item->linePrice()->toString( $email->language )}) - {$email->language->addToStack('ps_expire', FALSE)}: {expression="\IPS\nexus\Purchase::load( $item->id )->expire->localeDate( $invoice->member )" raw="true"}
+{{foreach $summary['items'] as $k => $item}}{$item->quantity} x {$item->name} ({{if $item->tax AND \IPS\Settings::i()->nexus_show_tax}}{$item->grossLinePrice()->toString( $email->language)} {{if $email->language->checkKeyExists('nexus_tax_explain_val')}}{$email->language->get('nexus_tax_explain_val')}{{endif}}{{else}}{$item->linePrice()->toString( $email->language )}{{endif}}) - {$email->language->addToStack('ps_expire', FALSE)}: {expression="\IPS\nexus\Purchase::load( $item->id )->expire->localeDate( $invoice->member )" raw="true"}
 {{endforeach}}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>nexus</template_app><template_name>monitoring_reset</template_name><template_content_html><![CDATA[
 {expression="$email->language->addToStack( 'monitor_email_intro', FALSE, array( 'sprintf' => \IPS\Settings::i()->board_name ) )"}
 <br />
@@ -603,7 +609,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$item->price} {$email->language->get("each_short")}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$item->price->toString( $email->language )} {$email->language->get("each_short")}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -636,7 +642,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -657,7 +663,7 @@
 						<strong>{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}</strong>
 					</td>
 					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; line-height: 21px" align='right'>
-						<strong style="font-size: 1.5em">{$transaction->amount}</strong>
+						<strong style="font-size: 1.5em">{$transaction->amount->toString( $email->language )}</strong>
 					</td>
 				</tr>
 			{{endif}}
@@ -691,7 +697,7 @@
 {$email->language->get("order_details")}
 =====
 {{foreach $summary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$item->price} {$email->language->get("each_short")}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$item->price->toString( $email->language )} {$email->language->get("each_short")}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$summary['subtotal']->toString( $email->language )}
@@ -704,13 +710,13 @@
 {{if \count( $summary['tax'] )}}
 ---
 {{foreach $summary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
 {$email->language->get('total')}: {$summary['total']->toString( $email->language )}
 {{if $transactions = $invoice->transactions() and \count( $transactions )}}{{foreach $transactions as $transaction}}{{if $transaction->status === $transaction::STATUS_PAID}}
-{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}: {$transaction->amount}
+{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}: {$transaction->amount->toString( $email->language )}
 {{endif}}{{endforeach}}
 {{endif}}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>nexus</template_app><template_name>unsubscribeStaffNotify</template_name><template_content_html><![CDATA[<tr>
 	<td dir='{dir}' valign="top"><img src='{setting="base_url"}applications/core/interface/email/spacer.png' width='1' height='1' alt=''></td>
@@ -884,7 +890,7 @@
 				</tr>
 				<tr>
 					<td dir='{dir}' width="150" align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px"><strong>{$email->language->addToStack("amount", FALSE)}</strong></td>
-					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount}</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount->toString( $email->language )}</td>
 				</tr>
 			</table>
 		</td>
@@ -934,7 +940,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -967,7 +973,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -1008,12 +1014,12 @@
 {$email->language->addToStack("email_payment_method", FALSE)}: {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->addToStack("account_credit", FALSE)}{{endif}}
 {$email->language->addToStack("email_transaction_id", FALSE)}: {$transaction->gw_id}
 {$email->language->addToStack("date", FALSE)}: {$transaction->date}
-{$email->language->addToStack("amount", FALSE)}: {$transaction->amount}
+{$email->language->addToStack("amount", FALSE)}: {$transaction->amount->toString( $email->language )}

 {$email->language->addToStack("order_details", FALSE)}
 ===
 {{foreach $invoiceSummary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price ) ) )}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price->toString( $email->language ) ) ) )}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$invoiceSummary['subtotal']->toString( $email->language )}
@@ -1026,7 +1032,7 @@
 {{if \count( $invoiceSummary['tax'] )}}
 ---
 {{foreach $invoiceSummary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
@@ -1338,7 +1344,7 @@
 				</tr>
 				<tr>
 					<td dir='{dir}' width="150" align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px"><strong>{$email->language->addToStack("t_amount", FALSE)}</strong></td>
-					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount}</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount->toString( $email->language )}</td>
 				</tr>
 			</table>
 		</td>
@@ -1388,7 +1394,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -1421,7 +1427,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -1464,12 +1470,12 @@
 {$email->language->addToStack("email_payment_method", FALSE)}: {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->addToStack("account_credit", FALSE)}{{endif}}
 {$email->language->addToStack("email_transaction_id", FALSE)}: {$transaction->gw_id}
 {$email->language->addToStack("date", FALSE)}: {$transaction->date}
-{$email->language->addToStack("amount", FALSE)}: {$transaction->amount}
+{$email->language->addToStack("amount", FALSE)}: {$transaction->amount->toString( $email->language )}

 {$email->language->addToStack("order_details", FALSE)}
 ===
 {{foreach $invoiceSummary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price ) ) )}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price->toString( $email->language ) ) ) )}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$invoiceSummary['subtotal']->toString( $email->language )}
@@ -1482,7 +1488,7 @@
 {{if \count( $invoiceSummary['tax'] )}}
 ---
 {{foreach $invoiceSummary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
@@ -1695,7 +1701,7 @@
 				</tr>
 				<tr>
 					<td dir='{dir}' width="150" align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px"><strong>{$email->language->addToStack("amount", FALSE)}</strong></td>
-					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount}</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount->toString( $email->language )}</td>
 				</tr>
 			</table>
 		</td>
@@ -1745,7 +1751,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -1778,7 +1784,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -1819,12 +1825,12 @@
 {$email->language->addToStack("email_payment_method", FALSE)}: {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->addToStack("account_credit", FALSE)}{{endif}}
 {$email->language->addToStack("email_transaction_id", FALSE)}: {$transaction->gw_id}
 {$email->language->addToStack("date", FALSE)}: {$transaction->date}
-{$email->language->addToStack("amount", FALSE)}: {$transaction->amount}
+{$email->language->addToStack("amount", FALSE)}: {$transaction->amount->toString( $email->language )}

 {$email->language->addToStack("order_details", FALSE)}
 ===
 {{foreach $invoiceSummary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price ) ) )}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price->toString( $email->language ) ) ) )}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$invoiceSummary['subtotal']->toString( $email->language )}
@@ -1837,7 +1843,7 @@
 {{if \count( $invoiceSummary['tax'] )}}
 ---
 {{foreach $invoiceSummary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
@@ -1945,7 +1951,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -1978,7 +1984,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -2018,7 +2024,7 @@
 {$email->language->addToStack("order_details", FALSE)}
 ===
 {{foreach $invoiceSummary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price ) ) )}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price->toString( $email->language ) ) ) )}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$invoiceSummary['subtotal']->toString( $email->language )}
@@ -2031,7 +2037,7 @@
 {{if \count( $invoiceSummary['tax'] )}}
 ---
 {{foreach $invoiceSummary['tax'] as $tax}}
-{$tax['name']} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$tax['name']} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
@@ -2146,7 +2152,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -2179,7 +2185,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -2219,7 +2225,7 @@
 {$email->language->addToStack("order_details", FALSE)}
 ===
 {{foreach $invoiceSummary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price ) ) )}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price->toString( $email->language ) ) ) )}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$invoiceSummary['subtotal']->toString( $email->language )}
@@ -2232,7 +2238,7 @@
 {{if \count( $invoiceSummary['tax'] )}}
 ---
 {{foreach $invoiceSummary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
@@ -2349,7 +2355,7 @@
 				</tr>
 				<tr>
 					<td dir='{dir}' width="150" align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px"><strong>{$email->language->addToStack("t_amount", FALSE)}</strong></td>
-					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount}</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount->toString( $email->language )}</td>
 				</tr>
 			</table>
 		</td>
@@ -2440,7 +2446,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -2473,7 +2479,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -2513,7 +2519,7 @@
 {$email->language->addToStack("order_details", FALSE)}
 ===
 {{foreach $invoiceSummary['items'] as $k => $item}}
-{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price ) ) )}] ({$item->linePrice()->toString( $email->language )})
+{$item->quantity} x</span> {$item->name} [{$email->language->addToStack("each_short", FALSE, array( 'htmlsprintf' => array( $item->price->toString( $email->language ) ) ) )}] ({$item->linePrice()->toString( $email->language )})
 {{endforeach}}
 ---
 {$email->language->get('subtotal')}: {$invoiceSummary['subtotal']->toString( $email->language )}
@@ -2526,7 +2532,7 @@
 {{if \count( $invoiceSummary['tax'] )}}
 ---
 {{foreach $invoiceSummary['tax'] as $taxId => $tax}}
-{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
 {{endforeach}}
 {{endif}}
 ---
@@ -2641,7 +2647,218 @@
 	{$email->language->addToStack("view_support_request", FALSE)}: {$request->url()}
 	{$email->language->addToStack("or_you_can_reply", FALSE)}
 {{endif}}
-{$email->language->addToStack("support_reply_email_id", FALSE, array( 'htmlsprintf' => array( '[SR' . $request->id . '.' . $request->email_key . ']' ) ) )}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>nexus</template_app><template_name>acp_notification_Transaction</template_name><template_content_html><![CDATA[<br />
+{$email->language->addToStack("support_reply_email_id", FALSE, array( 'htmlsprintf' => array( '[SR' . $request->id . '.' . $request->email_key . ']' ) ) )}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>nexus</template_app><template_name>invoiceNotify</template_name><template_content_html><![CDATA[
+{$email->language->get('email_tracked_invoice_paid')}
+<br /><br />
+
+<h3 style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 24px; font-weight: 500; color: #333333; line-height: 21px; margin: 0 0 5px 0">
+	{expression="sprintf( $email->language->get('invoice_number'), $invoice->id )"}
+</h3>
+<p style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; line-height: 24px; margin: 0">
+	{{if $invoice->po}}
+		<strong>{$email->language->get('invoice_po_number')}: {$invoice->po}</strong><br />
+	{{endif}}
+</p>
+<br />
+
+<a href='{$invoice->acpUrl()}' style="color: #ffffff; font-family: 'Helvetica Neue', helvetica, sans-serif; text-decoration: none; font-size: 14px; background: {setting="email_color"}; line-height: 32px; padding: 0 10px; display: inline-block; border-radius: 3px;">{$email->language->get('invoice_view')}</a>
+<br />
+<br />
+<br />
+
+<table cellpadding="0" cellspacing="0" border="0" width="100%" bgcolor="#ffffff" class='responsive_table'>
+	<tr>
+		<td dir='{dir}' width="{{if $invoice->hasPhysicalItems() and $invoice->shipaddress}}48%{{else}}100%{{endif}}" class='responsive_fullwidth' bgcolor="#f9f9f9">
+			<table cellpadding="10" cellspacing="0" border="0" width="100%">
+				<tr>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" bgcolor="#f0f0f0">
+						<strong>{$email->language->get("billing_address")}</strong>
+					</td>
+				</tr>
+				<tr>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+						{$invoice->member->cm_name}<br />
+						{{if $invoice->billaddress}}{$invoice->billaddress->toString('<br />')|raw}{{endif}}
+					</td>
+				</tr>
+			</table>
+		</td>
+		{{if $invoice->hasPhysicalItems() and $invoice->shipaddress}}
+			<td dir='{dir}' width="4%"><img src='{setting="base_url"}applications/core/interface/email/spacer.png' width='1' height='1' alt=''></td>
+			<td dir='{dir}' width="48%" class='responsive_fullwidth' bgcolor="#f9f9f9">
+				<table cellpadding="10" cellspacing="0" border="0" width="100%">
+					<tr>
+						<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" bgcolor="#f0f0f0">
+							<strong>{$email->language->get("shipping_address")}</strong>
+						</td>
+					</tr>
+					<tr>
+						<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+							{$invoice->member->cm_name}<br />
+							{$invoice->shipaddress->toString('<br />')|raw}
+						</td>
+					</tr>
+				</table>
+			</td>
+		{{endif}}
+	</tr>
+</table>
+<br />
+
+
+<br />
+<table cellpadding="10" cellspacing="0" border="0" width="100%">
+	<tr>
+		<td dir='{dir}' colspan="5" style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" bgcolor="#f0f0f0">
+			<strong>{$email->language->get("order_details")}</strong>
+		</td>
+	</tr>
+	<tr bgcolor="#f9f9f9">
+		<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+			&nbsp;
+		</td>
+		<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 13px; color: #333333; line-height: 21px" colspan="2">
+			<strong>{$email->language->addToStack('invoice_item', FALSE)}</strong>
+		</td>
+		<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 13px; color: #333333; line-height: 21px" align='right'>
+			<strong>{$email->language->get('total')}</strong>
+		</td>
+	</tr>
+	{{foreach $summary['items'] as $k => $item}}
+		<tr style='border-top: 1px solid #f5f5f5'>
+			<td dir='{dir}' width='100' valign='top' class='hidePhone' style='width: 0; max-height: 0; overflow: hidden; float: left;'>
+				{{if $image = $item->image()}}
+					<img src='{$image->url}' width='100' style='border: 0; vertical-align: middle;'>
+				{{endif}}
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+				<span style="color: #8d8d8d">{$item->quantity} x</span> {$item->name}
+				{{if $item instanceof \IPS\nexus\Invoice\Item\Renewal and $purchase = \IPS\nexus\Purchase::load( $item->id ) and $expire = $purchase->expire}}
+					<span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">
+						({$email->language->addToStack('ps_expire', FALSE)}: {expression="$expire->localeDate( $invoice->member )"})
+					</span>
+				{{endif}}
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+				{{if \count( $item->details )}}
+					{{foreach $item->details as $k => $v}}
+						{lang="nexus_pfield_{$k}"}: {expression="\IPS\nexus\Package\CustomField::load( $k )->displayValue( $v )" raw="true"}<br>
+					{{endforeach}}
+				{{endif}}
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
+				<strong>{$item->linePrice()->toString( $email->language )}</strong>
+				{{if $item->quantity > 1}}
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$item->price->toString( $email->language )} {$email->language->get("each_short")}</span>
+				{{endif}}
+			</td>
+		</tr>
+	{{endforeach}}
+
+	
+	<tr style='border-top: 1px solid #dddddd'>
+		<td dir='{dir}' colspan='3' align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+			<strong>{$email->language->get('subtotal')}</strong>
+		</td>
+		<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
+			<strong>{$summary['subtotal']->toString( $email->language )}</strong>
+		</td>
+	</tr>
+
+	{{foreach $summary['shipping'] as $shipping}}
+		<tr style='border-top: 1px solid #f5f5f5'>
+			<td dir='{dir}' colspan='3' align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+				{$shipping->name}
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
+				<strong>{$shipping->linePrice()->toString( $email->language )}</strong>
+			</td>
+		</tr>
+	{{endforeach}}
+
+	{{foreach $summary['tax'] as $taxId => $tax}}
+		<tr style='border-top: 1px solid #f5f5f5'>
+			<td dir='{dir}' colspan='3' align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">
+				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
+			</td>
+		</tr>
+	{{endforeach}}
+
+	{{if $transactions = $invoice->transactions() and \count( $transactions )}}
+		<tr style='border-top: 1px solid #dddddd'>
+			<td dir='{dir}' colspan='3' align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; line-height: 21px">
+				<strong>{$email->language->get('total')}</strong>
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; line-height: 21px" align='right'>
+				<strong>{$summary['total']->toString( $email->language )}</strong>
+			</td>
+		</tr>
+		{{foreach $transactions as $transaction}}
+			{{if $transaction->status === $transaction::STATUS_PAID}}
+				<tr>
+					<td dir='{dir}' colspan='2' align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; line-height: 21px">
+						<strong>{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}</strong>
+					</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; line-height: 21px" align='right'>
+						<strong style="font-size: 1.5em">{$transaction->amount->toString( $email->language )}</strong>
+					</td>
+				</tr>
+			{{endif}}
+		{{endforeach}}
+	{{else}}
+		<tr style='border-top: 1px solid #dddddd'>
+			<td dir='{dir}' colspan='3' align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; color: #cd3816; line-height: 21px">
+				<strong>{$email->language->get('total')}</strong>
+			</td>
+			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 17px; color: #cd3816; line-height: 21px" align='right'>
+				<strong>{$summary['total']->toString( $email->language )}</strong>
+			</td>
+		</tr>
+	{{endif}}
+</table>
+
+<!-- Signature -->
+<br /><br />
+<em style='color: #8c8c8c'>&mdash; {setting="board_name"}</em>]]></template_content_html><template_data>$invoice, $summary, $email</template_data><template_content_plaintext><![CDATA[
+{$email->language->get('email_tracked_invoice_paid')}
+
+-- {setting="board_name"}
+
+{expression="sprintf( $email->language->get('invoice_number'), $invoice->id )" raw="true"}
+=====
+{{if $invoice->po}}{$email->language->get('invoice_po_number')}: {$invoice->po}{{endif}}
+
+{$email->language->get('invoice_view')}: {$invoice->acpUrl()}
+
+
+{$email->language->get("order_details")}
+=====
+{{foreach $summary['items'] as $k => $item}}
+{$item->quantity} x</span> {$item->name} [{$item->price->toString( $email->language )} {$email->language->get("each_short")}] ({$item->linePrice()->toString( $email->language )})
+{{endforeach}}
+---
+{$email->language->get('subtotal')}: {$summary['subtotal']->toString( $email->language )}
+{{if \count( $summary['shipping'] )}}
+---
+{{foreach $summary['shipping'] as $shipping}}
+{$shipping->name}: {$shipping->linePrice()->toString( $email->language )}
+{{endforeach}}
+{{endif}}
+{{if \count( $summary['tax'] )}}
+---
+{{foreach $summary['tax'] as $taxId => $tax}}
+{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100" raw="true"}%): {$tax['amount']->toString( $email->language )}
+{{endforeach}}
+{{endif}}
+---
+{$email->language->get('total')}: {$summary['total']->toString( $email->language )}
+{{if $transactions = $invoice->transactions() and \count( $transactions )}}{{foreach $transactions as $transaction}}{{if $transaction->status === $transaction::STATUS_PAID}}
+{$email->language->get('email_paid_by')} {{if $transaction->method}}{$transaction->method->getTitleForLanguage( $email->language )}{{else}}{$email->language->get('account_credit')}{{endif}}: {$transaction->amount->toString( $email->language )}
+{{endif}}{{endforeach}}
+{{endif}}]]></template_content_plaintext><template_pinned>0</template_pinned></template><template><template_app>nexus</template_app><template_name>acp_notification_Transaction</template_name><template_content_html><![CDATA[<br />
 {$email->language->addToStack( "email_transaction_" . $notification->extra, FALSE )}
 <br />
 <br />
@@ -2737,7 +2954,7 @@
 				</tr>
 				<tr>
 					<td dir='{dir}' width="150" align='right' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px"><strong>{$email->language->addToStack("t_amount", FALSE)}</strong></td>
-					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount}</td>
+					<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px">&nbsp;&nbsp;{$transaction->amount->toString( $email->language )}</td>
 				</tr>
 				{{if $transaction->fraud}}
 					<tr>
@@ -2807,7 +3024,7 @@
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
 				<strong>{$item->linePrice()->toString( $email->language )}</strong>
 				{{if $item->quantity > 1}}
-					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price ) ) )}</span>
+					<br><span style="color: #8d8d8d; font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px;">{$email->language->addToStack("each_short", FALSE, array( 'sprintf' => array( $item->price->toString( $email->language ) ) ) )}</span>
 				{{endif}}
 			</td>
 		</tr>
@@ -2840,7 +3057,7 @@
 				{$email->language->get( 'nexus_tax_' . $taxId )} ({expression="$tax['rate']*100"}%)
 			</td>
 			<td dir='{dir}' style="font-family: 'Helvetica Neue', helvetica, sans-serif; font-size: 15px; color: #333333; line-height: 21px" align='right'>
-				<strong>{$tax['amount']}</strong>
+				<strong>{$tax['amount']->toString( $email->language )}</strong>
 			</td>
 		</tr>
 	{{endforeach}}
@@ -1,145 +1,148 @@
 {
    "core": {
+        "IncomingEmail": {
+            "Support": "IPS\\nexus\\extensions\\core\\IncomingEmail\\Support"
+        },
        "AdminNotifications": {
-            "Advertisement": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Advertisement",
-            "ConfigurationError": "IPS\\nexus\\extensions\\core\\AdminNotifications\\ConfigurationError",
-            "HostingError": "IPS\\nexus\\extensions\\core\\AdminNotifications\\HostingError",
            "Shipment": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Shipment",
-            "Support": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Support",
            "Transaction": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Transaction",
-            "Withdrawal": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Withdrawal"
-        },
-        "CommunityEnhancements": {
-            "EasyPost": "IPS\\nexus\\extensions\\core\\CommunityEnhancements\\EasyPost",
-            "Enom": "IPS\\nexus\\extensions\\core\\CommunityEnhancements\\Enom",
-            "MaxMind": "IPS\\nexus\\extensions\\core\\CommunityEnhancements\\MaxMind"
-        },
-        "ContactUs": {
-            "SupportRequest": "IPS\\nexus\\extensions\\core\\ContactUs\\SupportRequest"
+            "Support": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Support",
+            "Advertisement": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Advertisement",
+            "Withdrawal": "IPS\\nexus\\extensions\\core\\AdminNotifications\\Withdrawal",
+            "ConfigurationError": "IPS\\nexus\\extensions\\core\\AdminNotifications\\ConfigurationError",
+            "HostingError": "IPS\\nexus\\extensions\\core\\AdminNotifications\\HostingError"
        },
        "ContentRouter": {
            "Reviews": "IPS\\nexus\\extensions\\core\\ContentRouter\\Reviews"
        },
-        "Dashboard": {
-            "Income": "IPS\\nexus\\extensions\\core\\Dashboard\\Income",
-            "PendingActions": "IPS\\nexus\\extensions\\core\\Dashboard\\PendingActions"
+        "MemberACPProfileBlocks": {
+            "Support": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Support",
+            "AccountInformation": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\AccountInformation",
+            "Notes": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Notes",
+            "Statistics": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Statistics",
+            "Invoices": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Invoices",
+            "Purchases": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Purchases",
+            "ParentAccounts": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\ParentAccounts"
        },
-        "EditorLocations": {
-            "Admin": "IPS\\nexus\\extensions\\core\\EditorLocations\\Admin",
-            "Customer": "IPS\\nexus\\extensions\\core\\EditorLocations\\Customer",
-            "Purchases": "IPS\\nexus\\extensions\\core\\EditorLocations\\Purchases",
-            "Store": "IPS\\nexus\\extensions\\core\\EditorLocations\\Store",
-            "Support": "IPS\\nexus\\extensions\\core\\EditorLocations\\Support"
+        "MemberExportPersonalInformation": {
+            "Customer": "IPS\\nexus\\extensions\\core\\MemberExportPersonalInformation\\Customer"
+        },
+        "AchievementAction": {
+            "Subscription": "IPS\\nexus\\extensions\\core\\AchievementAction\\Subscription"
+        },
+        "LiveSearch": {
+            "Nexus": "IPS\\nexus\\extensions\\core\\LiveSearch\\Nexus"
        },
        "FileStorage": {
            "Ads": "IPS\\nexus\\extensions\\core\\FileStorage\\Ads",
+            "Support": "IPS\\nexus\\extensions\\core\\FileStorage\\Support",
+            "PurchaseFields": "IPS\\nexus\\extensions\\core\\FileStorage\\PurchaseFields",
            "Customer": "IPS\\nexus\\extensions\\core\\FileStorage\\Customer",
            "PackageGroups": "IPS\\nexus\\extensions\\core\\FileStorage\\PackageGroups",
-            "Products": "IPS\\nexus\\extensions\\core\\FileStorage\\Products",
-            "PurchaseFields": "IPS\\nexus\\extensions\\core\\FileStorage\\PurchaseFields",
-            "Support": "IPS\\nexus\\extensions\\core\\FileStorage\\Support"
+            "Products": "IPS\\nexus\\extensions\\core\\FileStorage\\Products"
        },
-        "FrontNavigation": {
-            "Addresses": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Addresses",
-            "Alternatives": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Alternatives",
-            "BillingAgreements": "IPS\\nexus\\extensions\\core\\FrontNavigation\\BillingAgreements",
-            "Cards": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Cards",
-            "Credit": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Credit",
-            "Donations": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Donations",
-            "Gifts": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Gifts",
-            "Info": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Info",
-            "NetworkStatus": "IPS\\nexus\\extensions\\core\\FrontNavigation\\NetworkStatus",
-            "Orders": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Orders",
-            "Purchases": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Purchases",
-            "Store": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Store",
-            "Subscriptions": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Subscriptions",
-            "Support": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Support"
+        "MFAArea": {
+            "Alternatives": "IPS\\nexus\\extensions\\core\\MFAArea\\Alternatives",
+            "AccountCredit": "IPS\\nexus\\extensions\\core\\MFAArea\\AccountCredit",
+            "BillingAgreements": "IPS\\nexus\\extensions\\core\\MFAArea\\BillingAgreements",
+            "Cards": "IPS\\nexus\\extensions\\core\\MFAArea\\Cards",
+            "BillingInfo": "IPS\\nexus\\extensions\\core\\MFAArea\\BillingInfo",
+            "Addresses": "IPS\\nexus\\extensions\\core\\MFAArea\\Addresses"
        },
-        "IncomingEmail": {
-            "Support": "IPS\\nexus\\extensions\\core\\IncomingEmail\\Support"
+        "EditorLocations": {
+            "Support": "IPS\\nexus\\extensions\\core\\EditorLocations\\Support",
+            "Store": "IPS\\nexus\\extensions\\core\\EditorLocations\\Store",
+            "Customer": "IPS\\nexus\\extensions\\core\\EditorLocations\\Customer",
+            "Purchases": "IPS\\nexus\\extensions\\core\\EditorLocations\\Purchases",
+            "Admin": "IPS\\nexus\\extensions\\core\\EditorLocations\\Admin"
+        },
+        "MemberHistory": {
+            "Nexus": "IPS\\nexus\\extensions\\core\\MemberHistory\\Nexus"
+        },
+        "Dashboard": {
+            "PendingActions": "IPS\\nexus\\extensions\\core\\Dashboard\\PendingActions",
+            "Income": "IPS\\nexus\\extensions\\core\\Dashboard\\Income"
+        },
+        "Uninstall": {
+            "DisablePOP": "IPS\\nexus\\extensions\\core\\Uninstall\\DisablePOP"
+        },
+        "MemberACPProfileTabs": {
+            "Main": "IPS\\nexus\\extensions\\core\\MemberACPProfileTabs\\Main"
+        },
+        "ProfileSteps": {
+            "CustomerFields": "IPS\\nexus\\extensions\\core\\ProfileSteps\\CustomerFields"
+        },
+        "ContactUs": {
+            "SupportRequest": "IPS\\nexus\\extensions\\core\\ContactUs\\SupportRequest"
+        },
+        "CommunityEnhancements": {
+            "MaxMind": "IPS\\nexus\\extensions\\core\\CommunityEnhancements\\MaxMind",
+            "Enom": "IPS\\nexus\\extensions\\core\\CommunityEnhancements\\Enom",
+            "EasyPost": "IPS\\nexus\\extensions\\core\\CommunityEnhancements\\EasyPost"
+        },
+        "Queue": {
+            "FixMissingAddresses": "IPS\\nexus\\extensions\\core\\Queue\\FixMissingAddresses",
+            "RecountTotalSpend": "IPS\\nexus\\extensions\\core\\Queue\\RecountTotalSpend",
+            "FixRefundTransactions": "IPS\\nexus\\extensions\\core\\Queue\\FixRefundTransactions",
+            "MassChangePurchases": "IPS\\nexus\\extensions\\core\\Queue\\MassChangePurchases",
+            "MoveCustomerHistory": "IPS\\nexus\\extensions\\core\\Queue\\MoveCustomerHistory",
+            "DeletePaymentMethod": "IPS\\nexus\\extensions\\core\\Queue\\DeletePaymentMethod"
+        },
+        "MemberFilter": {
+            "Subscriptions": "IPS\\nexus\\extensions\\core\\MemberFilter\\Subscriptions",
+            "TotalSpend": "IPS\\nexus\\extensions\\core\\MemberFilter\\TotalSpend",
+            "Purchases": "IPS\\nexus\\extensions\\core\\MemberFilter\\Purchases"
+        },
+        "OverviewStatistics": {
+            "Subscriptions": "IPS\\nexus\\extensions\\core\\OverviewStatistics\\Subscriptions",
+            "Products": "IPS\\nexus\\extensions\\core\\OverviewStatistics\\Products"
        },
        "IpAddresses": {
            "Payouts": "IPS\\nexus\\extensions\\core\\IpAddresses\\Payouts",
            "Support": "IPS\\nexus\\extensions\\core\\IpAddresses\\Support",
            "Transactions": "IPS\\nexus\\extensions\\core\\IpAddresses\\Transactions"
        },
-        "LiveSearch": {
-            "Nexus": "IPS\\nexus\\extensions\\core\\LiveSearch\\Nexus"
+        "FrontNavigation": {
+            "Info": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Info",
+            "Alternatives": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Alternatives",
+            "Subscriptions": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Subscriptions",
+            "Support": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Support",
+            "BillingAgreements": "IPS\\nexus\\extensions\\core\\FrontNavigation\\BillingAgreements",
+            "Gifts": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Gifts",
+            "Store": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Store",
+            "Cards": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Cards",
+            "Credit": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Credit",
+            "NetworkStatus": "IPS\\nexus\\extensions\\core\\FrontNavigation\\NetworkStatus",
+            "Purchases": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Purchases",
+            "Addresses": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Addresses",
+            "Donations": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Donations",
+            "Orders": "IPS\\nexus\\extensions\\core\\FrontNavigation\\Orders"
        },
-        "MemberACPProfileBlocks": {
-            "AccountInformation": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\AccountInformation",
-            "Invoices": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Invoices",
-            "Notes": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Notes",
-            "ParentAccounts": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\ParentAccounts",
-            "Purchases": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Purchases",
-            "Statistics": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Statistics",
-            "Support": "IPS\\nexus\\extensions\\core\\MemberACPProfileBlocks\\Support"
-        },
-        "MemberACPProfileTabs": {
-            "Main": "IPS\\nexus\\extensions\\core\\MemberACPProfileTabs\\Main"
-        },
-        "MemberExportPersonalInformation": {
-            "Customer": "IPS\\nexus\\extensions\\core\\MemberExportPersonalInformation\\Customer"
-        },
-        "MemberFilter": {
-            "Purchases": "IPS\\nexus\\extensions\\core\\MemberFilter\\Purchases",
-            "Subscriptions": "IPS\\nexus\\extensions\\core\\MemberFilter\\Subscriptions",
-            "TotalSpend": "IPS\\nexus\\extensions\\core\\MemberFilter\\TotalSpend"
-        },
-        "MemberHistory": {
-            "Nexus": "IPS\\nexus\\extensions\\core\\MemberHistory\\Nexus"
+        "OutputPlugins": {
+            "Weight": "IPS\\nexus\\extensions\\core\\OutputPlugins\\Weight",
+            "Money": "IPS\\nexus\\extensions\\core\\OutputPlugins\\Money",
+            "Length": "IPS\\nexus\\extensions\\core\\OutputPlugins\\Length"
        },
        "MemberSync": {
            "Nexus": "IPS\\nexus\\extensions\\core\\MemberSync\\Nexus"
-        },
-        "MFAArea": {
-            "AccountCredit": "IPS\\nexus\\extensions\\core\\MFAArea\\AccountCredit",
-            "Addresses": "IPS\\nexus\\extensions\\core\\MFAArea\\Addresses",
-            "Alternatives": "IPS\\nexus\\extensions\\core\\MFAArea\\Alternatives",
-            "BillingAgreements": "IPS\\nexus\\extensions\\core\\MFAArea\\BillingAgreements",
-            "BillingInfo": "IPS\\nexus\\extensions\\core\\MFAArea\\BillingInfo",
-            "Cards": "IPS\\nexus\\extensions\\core\\MFAArea\\Cards"
-        },
-        "OutputPlugins": {
-            "Length": "IPS\\nexus\\extensions\\core\\OutputPlugins\\Length",
-            "Money": "IPS\\nexus\\extensions\\core\\OutputPlugins\\Money",
-            "Weight": "IPS\\nexus\\extensions\\core\\OutputPlugins\\Weight"
-        },
-        "OverviewStatistics": {
-            "Products": "IPS\\nexus\\extensions\\core\\OverviewStatistics\\Products",
-            "Subscriptions": "IPS\\nexus\\extensions\\core\\OverviewStatistics\\Subscriptions"
-        },
-        "ProfileSteps": {
-            "CustomerFields": "IPS\\nexus\\extensions\\core\\ProfileSteps\\CustomerFields"
-        },
-        "Queue": {
-            "DeletePaymentMethod": "IPS\\nexus\\extensions\\core\\Queue\\DeletePaymentMethod",
-            "FixMissingAddresses": "IPS\\nexus\\extensions\\core\\Queue\\FixMissingAddresses",
-            "FixRefundTransactions": "IPS\\nexus\\extensions\\core\\Queue\\FixRefundTransactions",
-            "MassChangePurchases": "IPS\\nexus\\extensions\\core\\Queue\\MassChangePurchases",
-            "MoveCustomerHistory": "IPS\\nexus\\extensions\\core\\Queue\\MoveCustomerHistory",
-            "RecountTotalSpend": "IPS\\nexus\\extensions\\core\\Queue\\RecountTotalSpend"
-        },
-        "Uninstall": {
-            "DisablePOP": "IPS\\nexus\\extensions\\core\\Uninstall\\DisablePOP"
        }
    },
    "nexus": {
        "Item": {
-            "AccountCreditIncrease": "IPS\\nexus\\extensions\\nexus\\Item\\AccountCreditIncrease",
-            "Bandwidth": "IPS\\nexus\\extensions\\nexus\\Item\\Bandwidth",
-            "CouponDiscount": "IPS\\nexus\\extensions\\nexus\\Item\\CouponDiscount",
-            "CustomPackage": "IPS\\nexus\\extensions\\nexus\\Item\\CustomPackage",
-            "DedicatedServer": "IPS\\nexus\\extensions\\nexus\\Item\\DedicatedServer",
            "Domain": "IPS\\nexus\\extensions\\nexus\\Item\\Domain",
-            "Donation": "IPS\\nexus\\extensions\\nexus\\Item\\Donation",
-            "GiftVoucher": "IPS\\nexus\\extensions\\nexus\\Item\\GiftVoucher",
-            "MiscellaneousCharge": "IPS\\nexus\\extensions\\nexus\\Item\\MiscellaneousCharge",
-            "Package": "IPS\\nexus\\extensions\\nexus\\Item\\Package",
-            "ShippingCharge": "IPS\\nexus\\extensions\\nexus\\Item\\ShippingCharge",
            "Subscription": "IPS\\nexus\\extensions\\nexus\\Item\\Subscription",
+            "ShippingCharge": "IPS\\nexus\\extensions\\nexus\\Item\\ShippingCharge",
+            "Package": "IPS\\nexus\\extensions\\nexus\\Item\\Package",
+            "Bandwidth": "IPS\\nexus\\extensions\\nexus\\Item\\Bandwidth",
+            "DedicatedServer": "IPS\\nexus\\extensions\\nexus\\Item\\DedicatedServer",
+            "GiftVoucher": "IPS\\nexus\\extensions\\nexus\\Item\\GiftVoucher",
            "SubscriptionUpgrade": "IPS\\nexus\\extensions\\nexus\\Item\\SubscriptionUpgrade",
            "SupportCharge": "IPS\\nexus\\extensions\\nexus\\Item\\SupportCharge",
+            "CouponDiscount": "IPS\\nexus\\extensions\\nexus\\Item\\CouponDiscount",
+            "CustomPackage": "IPS\\nexus\\extensions\\nexus\\Item\\CustomPackage",
+            "AccountCreditIncrease": "IPS\\nexus\\extensions\\nexus\\Item\\AccountCreditIncrease",
+            "MiscellaneousCharge": "IPS\\nexus\\extensions\\nexus\\Item\\MiscellaneousCharge",
+            "Donation": "IPS\\nexus\\extensions\\nexus\\Item\\Donation",
            "UpgradeCharge": "IPS\\nexus\\extensions\\nexus\\Item\\UpgradeCharge"
        }
    }
@@ -1,26 +1,26 @@
 {
-    "clientAreaLinkLoad": {
-        "type": "C",
-        "class": "\\IPS\\Data\\Store\\Database"
-    },
-    "clientAreaLink": {
-        "type": "S",
-        "class": "\\IPS\\Theme\\class_core_front_global"
-    },
-    "frontDispatcher": {
-        "type": "C",
-        "class": "\\IPS\\Dispatcher\\Front"
-    },
    "DispatcherAdmin": {
        "type": "C",
        "class": "\\IPS\\Dispatcher\\Admin"
    },
+    "clientAreaLinkLoad": {
+        "type": "C",
+        "class": "\\IPS\\Data\\Store\\Database"
+    },
    "register": {
        "type": "C",
        "class": "\\IPS\\core\\modules\\front\\system\\register"
    },
+    "clientAreaLink": {
+        "type": "S",
+        "class": "\\IPS\\Theme\\class_core_front_global"
+    },
    "Database": {
        "type": "C",
        "class": "\\IPS\\Data\\Store\\Database"
+    },
+    "frontDispatcher": {
+        "type": "C",
+        "class": "\\IPS\\Dispatcher\\Front"
    }
 }
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <javascript app="nexus">
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.billingForm.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.billingForm.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -53,7 +53,7 @@
 				
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.register.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.register.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -84,7 +84,7 @@
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.review.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.review.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -121,7 +121,7 @@
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.shippingForm.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/checkout" javascript_name="ips.checkout.shippingForm.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -144,7 +144,7 @@
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/forms" javascript_name="ips.forms.businessAddressVat.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/forms" javascript_name="ips.forms.businessAddressVat.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -181,7 +181,7 @@
 		
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.authorizenet.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.authorizenet.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -241,7 +241,7 @@
 		
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.braintree.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.braintree.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1147,7 +1147,7 @@
 		
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.stripe.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.stripe.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1341,6 +1341,9 @@
 					if ( scope.attr('data-email') ) {
 						data.billing_details.email = scope.attr('data-email');
 					}
+					if ( scope.attr('data-name') ) {
+						data.billing_details.name = scope.attr('data-name');
+					}
 					if ( scope.attr('data-phone') ) {
 						data.billing_details.phone = scope.attr('data-phone');
 					}
@@ -1351,6 +1354,8 @@
 						this.stripe.handleCardSetup( scope.attr('data-setupSecret'), this.cardNumber, { payment_method_data: data } ).then( function( result ){
 							if (result.error) {
 								Debug.error(result.error);
+								loading.remove();
+								wizardContainer.show();
 								ips.ui.alert.show({
 									type: 'alert',
 									icon: 'warn',
@@ -1475,7 +1480,7 @@
 		
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.stripeamex.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200">/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.stripeamex.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200">/**
 * IPS Community Suite 4
 * (c) 2017 Invision Power Services - http://www.invisionpower.com
 *
@@ -1517,7 +1522,7 @@ function aecCallbackHandler(response){
 		
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.stripepaymentrequest.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200">/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/gateways" javascript_name="ips.gateways.stripepaymentrequest.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200">/**
 * IPS Community Suite 4
 * (c) 2017 Invision Power Services - http://www.invisionpower.com
 *
@@ -1598,7 +1603,7 @@ function aecCallbackHandler(response){
 		
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/hosting" javascript_name="ips.nexus.hosting.accountform.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/hosting" javascript_name="ips.nexus.hosting.accountform.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1630,7 +1635,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/misc" javascript_name="ips.misc.print.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100">/**
+ <file javascript_app="nexus" javascript_location="global" javascript_path="controllers/misc" javascript_name="ips.misc.print.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1652,7 +1657,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/notifications" javascript_name="ips.notifications.pendingTransactions.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/notifications" javascript_name="ips.notifications.pendingTransactions.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1732,7 +1737,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/payments" javascript_name="ips.payments.braintreeSetup.js" javascript_type="controller" javascript_version="105100" javascript_position="1000100"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/payments" javascript_name="ips.payments.braintreeSetup.js" javascript_type="controller" javascript_version="106107" javascript_position="1000100"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1834,7 +1839,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/store" javascript_name="ips.store.productoptions.js" javascript_type="controller" javascript_version="105100" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/store" javascript_name="ips.store.productoptions.js" javascript_type="controller" javascript_version="106107" javascript_position="1000300"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1889,7 +1894,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/store" javascript_name="ips.store.productselector.js" javascript_type="controller" javascript_version="105100" javascript_position="1000300"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/store" javascript_name="ips.store.productselector.js" javascript_type="controller" javascript_version="106107" javascript_position="1000300"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -1949,7 +1954,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.cartReview.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.cartReview.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2049,7 +2054,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.category.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.category.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2163,7 +2168,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.currencySelect.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.currencySelect.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2206,7 +2211,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.giftCard.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.giftCard.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2294,7 +2299,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.packagePage.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.packagePage.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2564,7 +2569,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.register.js" javascript_type="controller" javascript_version="105100" javascript_position="1000250"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/store" javascript_name="ips.store.register.js" javascript_type="controller" javascript_version="106107" javascript_position="1000250"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2713,7 +2718,7 @@ function aecCallbackHandler(response){
 		},
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/subscriptions" javascript_name="ips.subscriptions.main.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/subscriptions" javascript_name="ips.subscriptions.main.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2751,7 +2756,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.emailsetup.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.emailsetup.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2787,7 +2792,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.filterCheckboxSet.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.filterCheckboxSet.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -2840,7 +2845,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.list.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.list.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3049,7 +3054,7 @@ function aecCallbackHandler(response){
 		
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.message.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.message.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3105,7 +3110,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.metamenu.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.metamenu.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3279,7 +3284,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.multimod.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.multimod.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3379,7 +3384,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.packageInfo.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.packageInfo.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3428,7 +3433,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.pendingalert.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.pendingalert.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3455,7 +3460,7 @@ function aecCallbackHandler(response){
 				
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.replyArea.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150"><![CDATA[/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.replyArea.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150"><![CDATA[/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3539,7 +3544,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));]]></file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.request.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.request.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3570,10 +3575,6 @@ function aecCallbackHandler(response){
 				this.scope.find('[data-role=&quot;noteForm&quot;] button[type=&quot;submit&quot;]').attr( { 'title': ips.getString('ctrl_and_enter'), 'data-ipsTooltip': '' } );
 			}

-			this.scope.find('.ipsQuote:not([data-commerceHandled])').each( function () {
-				self._handleQuote( $( this ) );
-			});
-
 			this.resizeInfo();
 		},

@@ -3652,7 +3653,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.splitForm.js" javascript_type="controller" javascript_version="105100" javascript_position="1000150">/**
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="controllers/support" javascript_name="ips.support.splitForm.js" javascript_type="controller" javascript_version="106107" javascript_position="1000150">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3722,7 +3723,7 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/support" javascript_name="ips.support.rate.js" javascript_type="controller" javascript_version="105100" javascript_position="1000200">/**
+ <file javascript_app="nexus" javascript_location="front" javascript_path="controllers/support" javascript_name="ips.support.rate.js" javascript_type="controller" javascript_version="106107" javascript_position="1000200">/**
 * Invision Community
 * (c) Invision Power Services, Inc. - https://www.invisioncommunity.com
 *
@@ -3744,35 +3745,48 @@ function aecCallbackHandler(response){
 		}
 	});
 }(jQuery, _));</file>
- <file javascript_app="nexus" javascript_location="admin" javascript_path="templates" javascript_name="ips.templates.store.js" javascript_type="template" javascript_version="105100" javascript_position="1000050"><![CDATA[ips.templates.set('nexus.store.images', " \
-	<div class='ipsGrid_span3 ipsAttach ipsImageAttach ipsPad_half ipsAreaBackground_light' id='{{id}}' data-role='file' data-fileid='{{id}}' data-fullsizeurl='{{imagesrc}}' data-thumbnailurl='{{thumbnail}}' data-fileType='image'>\
-		<ul class='ipsList_inline ipsImageAttach_controls'>\
-			<li><input type='radio' name='{{field_name}}_primary_image' value='{{id}}' title='{{#lang}}makePrimaryProductImage{{/lang}}' data-ipsTooltip></li>\
-			<li class='ipsPos_right' data-role='deleteFileWrapper'>\
-				<input type='hidden' name='{{field_name}}_keep[{{id}}]' value='1'>\
-				<a href='#' data-role='deleteFile' class='ipsButton ipsButton_verySmall ipsButton_light' data-ipsTooltip title='{{#lang}}removeProductImage{{/lang}}'><i class='fa fa-trash-o'></i></a>\
-			</li>\
-		</ul>\
-		<div class='ipsImageAttach_thumb ipsType_center' data-role='preview' data-grid-ratio='65' data-action='insertFile' {{#thumb}}style='background-image: url( \"{{thumbnail_for_css}}\" )'{{/thumb}}>\
-			{{#status}}\
-				<span class='ipsImageAttach_status ipsType_light' data-role='status'>{{{status}}}</span>\
-				<span class='ipsAttachment_progress'><span data-role='progressbar'></span></span>\
-			{{/status}}\
+ <file javascript_app="nexus" javascript_location="admin" javascript_path="templates" javascript_name="ips.templates.store.js" javascript_type="template" javascript_version="106107" javascript_position="1000050"><![CDATA[ips.templates.set('nexus.store.images', " \
+	<div class='ipsUploader__row ipsUploader__row--image ipsAttach ipsContained {{#done}}ipsAttach_done{{/done}}' id='{{id}}' data-role='file' data-fileid='{{id}}' data-fullsizeurl='{{imagesrc}}' data-thumbnailurl='{{thumbnail}}' data-fileType='image'>\
+		<div class='ipsUploader__rowPreview ipsType_center' data-role='preview'>\
 			{{#thumb}}\
 				{{{thumb}}}\
 			{{/thumb}}\
+			<div class='ipsUploader__rowPreview__generic ipsFlex ipsFlex-ai:center ipsFlex-jc:center' {{#thumb}}style='display: none'{{/thumb}}>\
+				<i class='fa fa-{{extIcon}} ipsType_large'></i>\
+			</div>\
 		</div>\
-		<h2 class='ipsType_reset ipsAttach_title ipsType_medium ipsTruncate ipsTruncate_line' data-role='title'>{{title}}</h2>\
-		<p class='ipsType_light'>{{size}} &middot; <span data-role='status'>{{statusText}}</span></p>\
+		<div class='ipsUploader_rowMeta ipsFlex ipsFlex-flex:11 ipsFlex-fd:column ipsFlex-jc:center ipsFlex-ai:start'>\
+			<h2 class='ipsUploader_rowTitle ipsMargin:none ipsType_reset ipsAttach_title ipsTruncate ipsTruncate_line' data-role='title'>{{title}}</h2>\
+			<p class='ipsDataItem_meta ipsType_medium ipsType_light'>\
+				{{size}} {{#statusText}}&middot; <span class='ipsType_light' data-role='status'>{{statusText}}</span>{{/statusText}}\
+			</p>\
+			{{#status}}<span class='ipsAttachment_progress'><span data-role='progressbar'></span></span>{{/status}}\
+		</div>\
+		<div data-role='deleteFileWrapper'>\
+			<input type='hidden' name='{{field_name}}_keep[{{id}}]' value='1'>\
+			<a href='#' data-role='deleteFile' class='ipsUploader__rowDelete' data-ipsTooltip title='{{#lang}}removeProductImage{{/lang}}'>\
+				&times;\
+			</a>\
+		</div>\
+		<label for='{{field_name}}_primary_image' class='cNexusPrimaryRadio' data-ipsTooltip title='{{#lang}}makePrimaryProductImage{{/lang}}'>\
+			<span class='ipsCustomInput'>\
+			<input type='radio' name='{{field_name}}_primary_image' value='{{id}}' {{#default}}checked{{/default}}>\
+				<span></span>\
+			</span>\
+			{{#lang}}makePrimary{{/lang}}\
+		</label>\
 	</div>\
 ");
-]]></file>
- <file javascript_app="nexus" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.store.js" javascript_type="template" javascript_version="105100" javascript_position="1000050"><![CDATA[ips.templates.set('nexus.store.productImage', " \
+
+ips.templates.set('nexus.store.imagesWrapper', " \
+	<div class='ipsUploader__container ipsUploader__container--images'>{{{content}}}</div>\
+");]]></file>
+ <file javascript_app="nexus" javascript_location="front" javascript_path="templates" javascript_name="ips.templates.store.js" javascript_type="template" javascript_version="106107" javascript_position="1000050"><![CDATA[ips.templates.set('nexus.store.productImage', " \
 	<a href='{{fullURL}}' data-fullURL='{{fullURL}}' class='cNexusProduct_primaryImage ipsContained' data-ipsLightbox data-ipsLightbox-group='product' data-ipsProductZoom>\
 		<img src='{{thumbURL}}' class='ipsImage ipsImage_thumb'>\
 	</a>\
 ");]]></file>
- <file javascript_app="nexus" javascript_location="global" javascript_path="templates" javascript_name="ips.templates.gateways.js" javascript_type="template" javascript_version="105100" javascript_position="1000050"><![CDATA[ips.templates.set('nexus.gateway.vaultAccount', " \
+ <file javascript_app="nexus" javascript_location="global" javascript_path="templates" javascript_name="ips.templates.gateways.js" javascript_type="template" javascript_version="106107" javascript_position="1000050"><![CDATA[ips.templates.set('nexus.gateway.vaultAccount', " \
 	<li>\
 		<span class='ipsCustomInput'>\
 			<input type='radio' name='{{fieldName}}[stored]' value='{{value}}' id='{{fieldName}}_stored{{random}}' data-control='toggle' data-toggles='{{fieldName}}_existing'>\
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <language>
- <app key="nexus" version="105100">
+ <app key="nexus" version="106107">
  <word key="__app_nexus" js="0">Commerce</word>
  <word key="menutab__nexus" js="0">Commerce</word>
  <word key="menutab__nexus_icon" js="0">usd</word>
@@ -30,8 +30,11 @@
  <word key="__indefart_product" js="0">a product</word>
  <word key="__indefart_product_reviews" js="0">a product review</word>
  <word key="__defart_support_request" js="0">support request</word>
+  <word key="__defart_support_request_plural" js="0">support {!#[1:request][?:requests]}</word>
  <word key="__defart_product_reviews" js="0">product review</word>
+  <word key="__defart_product_reviews_plural" js="0">product {!#[1:review][?:reviews]}</word>
  <word key="__defart_product" js="0">product</word>
+  <word key="__defart_product_plural" js="0">{!#[1:product][?:products]}</word>
  <word key="plus_tax_rate" js="0"> + %s</word>
  <word key="complete_profile_app__nexus_CustomerFields" js="0">Customer Fields</word>
  <word key="profile_step_subaction_customer_fields" js="0">Fields</word>
@@ -39,6 +42,7 @@
  <word key="product_pl" js="0">Products</word>
  <word key="product_pl_lc" js="0">products</word>
  <word key="product_groups" js="0">Product Groups</word>
+  <word key="product_groups_sg" js="0">Product Group</word>
  <word key="search_contextual_item_product_groups" js="0">This Product Group</word>
  <word key="search_contextual_item_product" js="0">This Product</word>
  <word key="mass_manage_productgroups" js="0">Move/Delete Products</word>
@@ -233,6 +237,7 @@
  <word key="manual_instructions" js="0">Instructions</word>
  <word key="manual_instructions_desc" js="0">Provide address to send check or bank account details for bank wire or any other instructions for submitting payment manually.</word>
  <word key="manual_gateway_description_placeholder" js="0">Click to add description...</word>
+  <word key="manual_details" js="0"></word>
  <word key="invalid_gateway" js="0">Transaction %s couldn't be processed because of an invalid payment gateway</word>
  <word key="gateway_deprecated" js="0">The %s payment method has been deprecated and will be removed in a future version. Please make plans to switch to an alternative payment method.</word>
  <word key="gateway__Braintree" js="0">Braintree</word>
@@ -712,6 +717,9 @@
  <word key="invoice_timeline_invoice_exp_time" js="0">{# [1:day][?:days]} after invoice was generated</word>
  <word key="invoice_timeline_invoice_exp_event" js="0">If the invoice has still not been paid, it expires and can no longer be paid. To renew, an invoice would need to be manually generated in the AdminCP.</word>
  <word key="invoice_timeline_credit" js="0"><![CDATA[If the product has a custom email set to send when the purchase will expire soon, that email is sent.<br>Otherwise, if a customer has account credit or a card on file, an email is sent to warn them that payment will shortly be taken automatically.]]></word>
+  <word key="mailsub__nexus_invoiceNotify" js="0">A tracked invoice has been marked paid</word>
+  <word key="invoice_track" js="0">Track</word>
+  <word key="invoice_untrack" js="0">Untrack</word>
  <word key="ba_gw_id" js="0">Subscription ID</word>
  <word key="ba_started" js="0">Creation Date</word>
  <word key="ba_next_cycle" js="0">Next Payment</word>
@@ -735,6 +743,7 @@
  <word key="billing_agreement_suspend_confirm" js="0">Payments will stop being taken automatically. If the Subscription is not reactivated before the purchases' expiry date, they will expire without a renewal invoice being generated automatically.</word>
  <word key="billing_agreement_reactivate" js="0">Reactivate</word>
  <word key="billing_agreement_cancel" js="0">Cancel</word>
+  <word key="billing_agreement_check" js="0">Check</word>
  <word key="r__billingagreements" js="0">PayPal Subscriptions</word>
  <word key="r__billingagreements_view" js="0">Can view PayPal Subscriptions?</word>
  <word key="r__billingagreements_manage" js="0">Can suspend, reactivate and cancel PayPal Subscriptions?</word>
@@ -997,8 +1006,8 @@
  <word key="try_another_payment" js="0">Try another payment method</word>
  <word key="split_payment" js="0">Split Payment</word>
  <word key="split_payment_title" js="0">Pay for this order using multiple payment methods</word>
-  <word key="manage_orders_in_billing" js="0"><![CDATA[You can manage your orders in <a href='{internal.app=nexus&module=clients&controller=invoices}'>Your Orders</a>]]></word>
-  <word key="track_orders_in_billing" js="0"><![CDATA[You can keep track of the status of this order in <a href='{internal.app=nexus&module=clients&controller=invoices}'>Your Orders</a>]]></word>
+  <word key="manage_orders_in_billing" js="0"><![CDATA[You can manage your orders in <a href='{internal.front.app=nexus&module=clients&controller=invoices.clientsinvoices}'>Your Orders</a>]]></word>
+  <word key="track_orders_in_billing" js="0"><![CDATA[You can keep track of the status of this order in <a href='{internal.front.app=nexus&module=clients&controller=invoices.clientsinvoices}'>Your Orders</a>]]></word>
  <word key="return_to_checkout" js="0">Return To Checkout</word>
  <word key="continue_to_registration" js="0">Continue to registration</word>
  <word key="registration_items_in_cart" js="0">You have {# [1:item][?:items]} in your cart</word>
@@ -1373,6 +1382,7 @@
  <word key="mass_change_purchases_confirm" js="0">Started Mass Updates</word>
  <word key="mass_change_purchases_in_progress" js="0">Change / Cancel Purchases in Progress</word>
  <word key="mass_change_purchases_in_progress_text" js="0">Making changes to purchases of %s</word>
+  <word key="can_not_reactivate" js="0">This purchase cannot be reactivated.</word>
  <word key="license_key" js="0">License Key</word>
  <word key="generate_new_key" js="0">Generate new key</word>
  <word key="lkey_using_x_of_unlimited_uses" js="0">Using %d of unlimited allowed uses</word>
@@ -1410,8 +1420,13 @@
  <word key="payout__data_Manual" js="0">Payment Details</word>
  <word key="nexus_payout_min" js="0">Minimum Withdrawal</word>
  <word key="nexus_payout_maximum" js="0">Maximum Withdrawal</word>
+  <word key="nexus_payout_confirm_title" js="0">Process Withdrawals</word>
+  <word key="nexus_payout_proceed" js="0">Proceed</word>
+  <word key="nexus_payout_confirm_text" js="0">Are you sure? This action cannot be undone.</word>
  <word key="max_withdrawl_exceeded" js="0">You have exceeded the maximum withdrawal amount for this currency</word>
  <word key="nexus_payout_approve" js="0">Withdrawals must be approved?</word>
+  <word key="nexus_payout_unlimited_times" js="0">Unlimited number of Withdrawals?</word>
+  <word key="nexus_payout_unlimited_times_desc" js="0">When disabled, the end user will need to cancel any active withdrawal request (per currency) before creating another.</word>
  <word key="po_status" js="0">Status</word>
  <word key="po_id" js="0">ID</word>
  <word key="po_gateway" js="0">Payment Method</word>
@@ -1497,7 +1512,6 @@
  <word key="r__customerfeedback_manage" js="0">Can manage customer feedback settings?</word>
  <word key="r__outgoingemail_manage" js="0">Can manage outgoing email settings?</word>
  <word key="r__incomingemail_manage" js="0">Can manage incoming email settings?</word>
-  <word key="r__stats" js="0">Statistics</word>
  <word key="r__volume_manage" js="0">Can see new support request statistics?</word>
  <word key="r__requests_merge" js="0">Can merge support requests?</word>
  <word key="r__requests_split" js="0">Can split support requests?</word>
@@ -2399,6 +2413,7 @@
  <word key="mailsub__nexus_giftVoucher" js="0">Gift Card</word>
  <word key="x_in_stock" js="0">{# [?:in stock]}</word>
  <word key="not_enough_in_stock" js="0">There is not enough stock to add that amount to your cart. Enter a quantity of %d or less.</word>
+  <word key="not_enough_in_stock_checkout" js="0">There is not enough stock to fulfill your order. There {!#[1:is][?:are] #} of %s remaining in stock.</word>
  <word key="add_to_cart" js="0">Add to cart</word>
  <word key="in_stock" js="0">In Stock</word>
  <word key="out_of_stock" js="0">Out of Stock</word>
@@ -2594,7 +2609,7 @@
  <word key="altcontact_add" js="0">Add New Contact</word>
  <word key="altcontact_add_title" js="0">Add a new alternate contact to your account</word>
  <word key="altcontact_email" js="0">Email Address</word>
-  <word key="altcontact_email_desc" js="0"><![CDATA[If the user does not already have an account, they first need to <a href='{internal.app=core&module=system&controller=register}'>create one</a>.]]></word>
+  <word key="altcontact_email_desc" js="0"><![CDATA[If the user does not already have an account, they first need to <a href='{internal.front.app=core&module=system&controller=register.register}'>create one</a>.]]></word>
  <word key="altcontact_email_error" js="0">There is not an account with that email address.</word>
  <word key="altcontact_email_self" js="0">You cannot add yourself as an alternative contact.</word>
  <word key="altcontact_already_exists" js="0">That user is already one of your alternative contacts.</word>
@@ -2605,7 +2620,7 @@
  <word key="altcontact_support" js="0">Also allow this contact to view other support requests not related to the selected purchases?</word>
  <word key="altcontact_support_desc" js="0">The user will be able to see and reply to all support requests on your account. They will also be able to contact support from your account without having to associate the request with one of the selected purchases.</word>
  <word key="altcontact_edit" js="0">Edit Alternate Contact</word>
-  <word key="altcontact_none" js="0"><![CDATA[You don't have any alternative contacts set up. Would you like to <a href='{internal.app=nexus&module=clients&controller=alternatives&do=form}' data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title='%s'>set one up now</a>?]]></word>
+  <word key="altcontact_none" js="0"><![CDATA[You don't have any alternative contacts set up. Would you like to <a href='{internal.front.app=nexus&module=clients&controller=alternatives&do=form.clientsalternatives}' data-ipsDialog data-ipsDialog-size='medium' data-ipsDialog-title='%s'>set one up now</a>?]]></word>
  <word key="altcontact_authorized" js="0">Authorized Users</word>
  <word key="altcontact_can" js="0">can</word>
  <word key="altcontact_perm_manage" js="0">View {# [1:purchase][?:purchases]} and view and submit support requests related to {!# [1:it][?:them]}</word>
@@ -2749,6 +2764,7 @@
  <word key="r__donations" js="0">Donations</word>
  <word key="r__donations_manage" js="0">Can view donations list?</word>
  <word key="r__donationgoals_manage" js="0">Can manage donation goals?</word>
+  <word key="nexus_no_donations_found" js="0">There are no donations currently</word>
  <word key="enhancements__nexus_EasyPost" js="0">EasyPost</word>
  <word key="enhancements__nexus_EasyPost_desc" js="0">Easy shipping with USPS, UPS, DHL, FedEx and others.</word>
  <word key="easypost_enable" js="0">Enable EasyPost integration?</word>
@@ -3309,6 +3325,8 @@ At this stage, no further action is required from you. We will send you an addit
  <word key="emailtpl_unsubscribeStaffNotify" js="0">Staff notification unsubscribe</word>
  <word key="emailtpl_package_customemail" js="0">Custom Package Email</word>
  <word key="email_expire_warning_can_cancel" js="0">Update your renewal preferences</word>
+  <word key="email_tracked_invoice_paid" js="0">An invoice you are tracking has been marked paid</word>
+  <word key="emailtpl_invoiceNotify" js="0">Tracked invoice marked paid</word>
  <word key="block_pendingActions" js="0">Commerce Overview</word>
  <word key="block_pendingActions_desc" js="0">Shows items requiring staff attention such as pending transactions and open support requests.</word>
  <word key="block_donations" js="0">Donation Goals</word>
@@ -3322,6 +3340,7 @@ At this stage, no further action is required from you. We will send you an addit
  <word key="block_featuredProduct" js="0">Featured Products</word>
  <word key="block_featuredProduct_desc" js="0">Shows featured products</word>
  <word key="widget_group" js="0">Category</word>
+  <word key="view_this_product" js="0">View the product</word>
  <word key="modperms__core_Content_nexus_Package_Review" js="0">Product Reviews</word>
  <word key="can_edit_product_reviews" js="0">Can edit product reviews?</word>
  <word key="can_delete_product_reviews" js="0">Can delete product reviews?</word>
@@ -3379,6 +3398,7 @@ At this stage, no further action is required from you. We will send you an addit
  <word key="r__subscribers" js="0">Subscribers</word>
  <word key="r__subscribers_manage" js="0">Can manage subscribers?</word>
  <word key="nexus_subscriptions" js="0">Subscriptions</word>
+  <word key="not_with_existing_subscription" js="0">This purchase cannot be reactivated because this customer already has an existing subscription.</word>
  <word key="sp_name" js="0">Name</word>
  <word key="sp_enabled" js="0">Allow Purchases?</word>
  <word key="sp_enabled_desc" js="0">Even if disabled, users who have already purchased this plan will still have all the benefits given to them by purchasing and be able to renew, however users who have purchased other subscription plans will not be able to upgrade/downgrade to this plan.</word>
@@ -3509,7 +3529,7 @@ At this stage, no further action is required from you. We will send you an addit
  <word key="block_subscriptions" js="0">Member Subscriptions</word>
  <word key="block_subscriptions_desc" js="0">Show a list of available subscription packages to customers not yet subscribed</word>
  <word key="nexus_require_billing_subscriptions" js="0">Member Subscriptions</word>
-  <word key="nexus_subs_non_available" js="0">There are not any subscriptions available at this time.</word>
+  <word key="nexus_subs_non_available" js="0">There are no subscriptions available at this time.</word>
  <word key="nexus_subs_paid_flash_msg" js="0">Thanks for your payment, you're all set!</word>
  <word key="nexus_dont_delete_group" js="0">Some users who have purchased packages or subscriptions are set to return to this group when their subscription ends. If you delete this group, those users will be returned to the group '%s' instead.</word>
  <word key="upgrade_fix_refund_transactions" js="0">Updating transaction data</word>
@@ -3587,6 +3607,16 @@ At this stage, no further action is required from you. We will send you an addit
  <word key="emailtpl_acp_notification_Advertisement" js="0">Advertisement pending approval admin notification</word>
  <word key="emailtpl_acp_notification_Shipment" js="0">Pending shipment admin notification</word>
  <word key="emailtpl_acp_notification_Withdrawal" js="0">Withdrawl request admin notification</word>
+  <word key="achievement_filter_Subscriptions_node_prefix" js="0">Subscriptions</word>
+  <word key="achievement_filter_Subscriptions_nth" js="0">Add a milestone condition</word>
+  <word key="achievement_filter_Subscriptions" js="0">Add a subscription filter</word>
+  <word key="achievement_filter_Subscription_nth_suffix" js="0"><![CDATA[<span data-role='th'>th</span> subscription]]></word>
+  <word key="AchievementAction__Subscription" js="0">Member purchases a subscription</word>
+  <word key="AchievementAction__Subscription_title" js="0">User purchased</word>
+  <word key="AchievementAction__Subscription_title_generic" js="0">Subscription</word>
+  <word key="achievement_filter_Subscriptions_active" js="0">active subscriptions</word>
+  <word key="achievements_filter_Subscription_type" js="0">of type %s</word>
+  <word key="achievements_filter_Subscription_pl" js="0">%s subscriptions</word>
  <word key="payment_error" js="1">There was an error processing the payment. Please try a different payment method or contact us for assistance.</word>
  <word key="support_ajax_error" js="1">An error occurred. Your session may have expired. Refresh the page and try again.</word>
  <word key="click_to_show_url" js="1">Click to show real URL</word>
@@ -4539,7 +4539,7 @@
            },
            "sf_max_input": {
                "name": "sf_max_input",
-                "type": "SMALLINT",
+                "type": "MEDIUMINT",
                "length": 6,
                "decimals": null,
                "values": [],
@@ -4547,9 +4547,7 @@
                "default": "0",
                "comment": "",
                "unsigned": false,
-                "zerofill": false,
-                "auto_increment": false,
-                "binary": false
+                "auto_increment": false
            },
            "sf_input_format": {
                "name": "sf_input_format",
@@ -10547,5 +10545,48 @@
                ]
            }
        }
+    },
+    "nexus_invoice_tracker": {
+        "name": "nexus_invoice_tracker",
+        "columns": {
+            "member_id": {
+                "name": "member_id",
+                "type": "BIGINT",
+                "length": "20",
+                "decimals": null,
+                "values": null,
+                "allow_null": false,
+                "default": null,
+                "comment": "ID Number",
+                "unsigned": true,
+                "auto_increment": false
+            },
+            "invoice_id": {
+                "name": "invoice_id",
+                "type": "BIGINT",
+                "length": null,
+                "decimals": null,
+                "values": null,
+                "allow_null": false,
+                "default": null,
+                "comment": "",
+                "unsigned": true,
+                "auto_increment": false
+            }
+        },
+        "indexes": {
+            "PRIMARY": {
+                "type": "primary",
+                "name": "PRIMARY",
+                "columns": [
+                    "member_id",
+                    "invoice_id"
+                ],
+                "length": [
+                    null,
+                    null
+                ]
+            }
+        }
    }
 }
@@ -359,6 +359,11 @@
        "default": "",
        "report": "bool"
    },
+    {
+        "key": "nexus_payout_unlimited_times",
+        "default": "1",
+        "report": "full"
+    },
    {
        "key": "nexus_reg_force",
        "default": "0",
@@ -1 +1 @@
-{"capture":"P0Y0M0DT1H0M0S","sendInvoiceWarnings":"P0Y0M0DT1H0M0S","generateRenewalInvoices":"P0Y0M0DT0H30M0S","expirePurchases":"P0Y0M0DT1H0M0S","expireInvoices":"P0Y0M0DT1H0M0S","supportAutoresolve":"P0Y0M0DT1H0M0S","supportAssignedReminder":"P0Y0M1DT0H0M0S","monitor":"P0Y0M0DT0H5M0S","terminateHosting":"P0Y0M1DT0H0M0S","expectedOutputMonitoring":"P0Y0M0DT0H30M0S","cartCleanup":"P0Y0M1DT0H0M0S"}
+{"capture":"P0Y0M0DT1H0M0S","sendInvoiceWarnings":"P0Y0M0DT1H0M0S","generateRenewalInvoices":"P0Y0M0DT0H30M0S","expirePurchases":"P0Y0M0DT1H0M0S","expireInvoices":"P0Y0M0DT1H0M0S","supportAutoresolve":"P0Y0M0DT1H0M0S","supportAssignedReminder":"P0Y0M1DT0H0M0S","monitor":"P0Y0M0DT0H5M0S","terminateHosting":"P0Y0M1DT0H0M0S","expectedOutputMonitoring":"P0Y0M0DT0H30M0S","cartCleanup":"P0Y0M1DT0H0M0S","billingAgreements":"P0Y0M0DT0H10M0S","gatewayPending":"P0Y0M0DT0H10M0S"}
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <theme name="Default" author_name="Invision Power Services, Inc" author_url="https://www.invisioncommunity.com">
- <field sc_key="cm_store_view" sc_type="Select" sc_multiple="0" sc_updated="1588211797" sc_app="nexus" sc_default="grid" sc_tab_key="custom" sc_show_in_vse="0" sc_title="themesetting_cm_store_view" sc_order="11" sc_condition="">[{&quot;key&quot;:&quot;grid&quot;,&quot;value&quot;:&quot;cm_store_view_grid&quot;},{&quot;key&quot;:&quot;list&quot;,&quot;value&quot;:&quot;cm_store_view_list&quot;}]</field>
+ <field sc_key="cm_store_view" sc_type="Select" sc_multiple="0" sc_updated="1507736128" sc_app="nexus" sc_default="grid" sc_tab_key="custom" sc_show_in_vse="0" sc_title="themesetting_cm_store_view" sc_order="12" sc_condition="">[{&quot;key&quot;:&quot;grid&quot;,&quot;value&quot;:&quot;cm_store_view_grid&quot;},{&quot;key&quot;:&quot;list&quot;,&quot;value&quot;:&quot;cm_store_view_list&quot;}]</field>
 <template template_group="billingagreements" template_name="view" template_data="$billingAgreement, $purchases, $transactions" template_location="admin" template_app="nexus"><![CDATA[{{if $billingAgreement->status() == $billingAgreement::STATUS_ACTIVE and !$billingAgreement->next_cycle}}
 	<p class="ipsMessage ipsMessage_warning">{lang="billing_agreement_run_failed" sprintf="$billingAgreement->acpUrl()->setQueryString( 'do', 'reconcile' )->csrf()"}</p>
 {{endif}}
@@ -92,7 +92,7 @@
 		{{endif}}
 	</div>
 </div>]]></template>
- <template template_group="checkout" template_name="changeShippingAddressForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="front" template_app="nexus"><![CDATA[<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
+ <template template_group="checkout" template_name="changeShippingAddressForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="front" template_app="nexus"><![CDATA[<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
 		{{if \is_array($v)}}
@@ -228,7 +228,7 @@
 		{template="checkoutOrderSummary" group="checkout" app="nexus" params="$invoice->summary()"}
 	</div>
 </div>]]></template>
- <template template_group="checkout" template_name="checkoutShippingForm" template_data="$shippingAddress, $shippingAddressErrors, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="front" template_app="nexus"><![CDATA[<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
+ <template template_group="checkout" template_name="checkoutShippingForm" template_data="$shippingAddress, $shippingAddressErrors, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="front" template_app="nexus"><![CDATA[<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
 		{{if \is_array($v)}}
@@ -502,7 +502,7 @@
 										{{else}}
 											{{if isset( $overriddenRenewalTerms[ $rId ] )}}
 												{money="$overriddenRenewalTerms[ $rId ]->cost->amount->multiply( new \IPS\Math\Number( (string) $item->quantity ) )" currency="$overriddenRenewalTerms[ $rId ]->cost->currency"}
-											{{else}}
+											{{elseif $item->renewalTerm}}
 												{money="$item->renewalTerm->cost->amount->multiply( new \IPS\Math\Number( (string) $item->quantity ) )" currency="$item->renewalTerm->cost->currency"}
 											{{endif}}
 										{{endif}}
@@ -542,7 +542,7 @@
 		{{endif}}
 	</div>
 </div>]]></template>
- <template template_group="checkout" template_name="couponForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="front" template_app="nexus"><![CDATA[
+ <template template_group="checkout" template_name="couponForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="front" template_app="nexus"><![CDATA[
 <form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm data-role='couponForm'>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
@@ -620,7 +620,7 @@
 								{lang="new_customer_blurb"}
 							</p>
 							{{if \IPS\Login::registrationType() == 'redirect'}}
-								<a href="{expression="\IPS\Settings::i()->allow_reg_target"}" class='ipsButton ipsButton_primary ipsButton_medium'>{lang="sign_up"}</a>
+								<a href="{expression="\IPS\Settings::i()->allow_reg_target"}" target="_blank" rel="noopener" class='ipsButton ipsButton_primary ipsButton_medium'>{lang="sign_up"}</a>
 							{{else}}
 								<button data-action='newMember' class='ipsButton ipsButton_primary ipsButton_medium'>{lang="continue_as_new_member"}</button>
 							{{endif}}
@@ -683,7 +683,7 @@
 		</div>
 	</div>	
 {{endif}}]]></template>
- <template template_group="checkout" template_name="customerInformationForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="front" template_app="nexus"><![CDATA[
+ <template template_group="checkout" template_name="customerInformationForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="front" template_app="nexus"><![CDATA[
 <form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
@@ -783,7 +783,7 @@
 		</div>
 	</div>	
 </section>]]></template>
- <template template_group="checkout" template_name="paymentForm" template_data="$invoice, $amountToPay, $showSubmitButton, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="front" template_app="nexus"><![CDATA[
+ <template template_group="checkout" template_name="paymentForm" template_data="$invoice, $amountToPay, $showSubmitButton, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="front" template_app="nexus"><![CDATA[
 <form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
@@ -977,7 +977,7 @@
 		{{endif}}
 	</ul>
 {{endif}}]]></template>
- <template template_group="clients" template_name="addresses" template_data="$billingAddress = NULL, $shippingAddress = NULL, $otherAddresses" template_location="front" template_app="nexus"><![CDATA[<a href='{url="app=nexus&module=clients&controller=addresses&do=form" seoTemplate="clientsaddresses"}' class='ipsPos_right ipsButton ipsButton_important ipsButton_verySmall' title="{lang="address_add_title"}" data-ipsDialog data-ipsDialog-size='narrow' data-ipsDialog-title='{lang="address_add"}'>{lang="address_add"}</a>
+ <template template_group="clients" template_name="addresses" template_data="$billingAddress=NULL, $shippingAddress=NULL, $otherAddresses=array()" template_location="front" template_app="nexus"><![CDATA[<a href='{url="app=nexus&module=clients&controller=addresses&do=form" seoTemplate="clientsaddresses"}' class='ipsPos_right ipsButton ipsButton_important ipsButton_verySmall' title="{lang="address_add_title"}" data-ipsDialog data-ipsDialog-size='narrow' data-ipsDialog-title='{lang="address_add"}'>{lang="address_add"}</a>
 <h1 class='ipsType_pageTitle'>{lang="address_book"}</h1>

 <p class='ipsType_reset ipsType_normal ipsSpacer_bottom'>
@@ -1222,32 +1222,38 @@
 	{lang="cards_info"}
 </p>

-<ul class='ipsList_inline cNexusCards ipsSpacer_top ipsBox ipsPad'>
-	{{foreach $cards as $card}}
-		<li>
-			{{if $card['card_type'] === 'paypal' or $card['card_type'] === 'venmo'}}
-				<div class='cNexusCards_name'>{$card['card_number']}</div>
-			{{else}}
-				<span class='cNexusCards_number'>
-					{{if $card['card_type'] == 'american_express' OR $card['card_type'] == 'diners_club'}}
-						XXXX XXXXXX X{$card['card_number']}
-					{{else}}
-						XXXX XXXX XXXX {$card['card_number']}
-					{{endif}}
-				</span>
-			{{endif}}
-			{{if $card['card_type']}}
-				<span class='cNexusCards_type cPayment cPayment_{$card['card_type']}'>{lang="card_type_{$card['card_type']}"}</span>
-			{{endif}}
-			{{if $card['card_expire']}}
-				<span class='cNexusCards_expTitle'>{lang="cards_exp"}</span>
-				<span class='cNexusCards_exp'>{$card['card_expire']}</span>
-			{{endif}}
-			
-			<a href="{url="app=nexus&module=clients&controller=cards&do=delete&id={$card['id']}" seoTemplate="clientscards" csrf="true"}" class='cNexusCards_delete' data-confirm data-ipsTooltip title='{lang="delete_this_card"}'>&times;</a>
-		</li>
-	{{endforeach}}
-</ul>]]></template>
+{{if \count( $cards )}}
+	<ul class='ipsList_inline cNexusCards ipsSpacer_top ipsBox ipsPad'>
+		{{foreach $cards as $card}}
+			<li>
+				{{if $card['card_type'] === 'paypal' or $card['card_type'] === 'venmo'}}
+					<div class='cNexusCards_name'>{$card['card_number']}</div>
+				{{else}}
+					<span class='cNexusCards_number'>
+						{{if $card['card_type'] == 'american_express' OR $card['card_type'] == 'diners_club'}}
+							XXXX XXXXXX X{$card['card_number']}
+						{{else}}
+							XXXX XXXX XXXX {$card['card_number']}
+						{{endif}}
+					</span>
+				{{endif}}
+				{{if $card['card_type']}}
+					<span class='cNexusCards_type cPayment cPayment_{$card['card_type']}'>{lang="card_type_{$card['card_type']}"}</span>
+				{{endif}}
+				{{if $card['card_expire']}}
+					<span class='cNexusCards_expTitle'>{lang="cards_exp"}</span>
+					<span class='cNexusCards_exp'>{$card['card_expire']}</span>
+				{{endif}}
+				
+				<a href="{url="app=nexus&module=clients&controller=cards&do=delete&id={$card['id']}" seoTemplate="clientscards" csrf="true"}" class='cNexusCards_delete' data-confirm data-ipsTooltip title='{lang="delete_this_card"}'>&times;</a>
+			</li>
+		{{endforeach}}
+	</ul>
+{{else}}
+	<p class='ipsType_light ipsType_large ipsType_center ipsMargin_top:double'>
+		{lang="no_credit_cards"}
+	</p>
+{{endif}}]]></template>
 <template template_group="clients" template_name="credit" template_data="$balance, $pastWithdrawals, $pastWithdrawalsPagination, $canWithdraw, $canTopup" template_location="front" template_app="nexus"><![CDATA[
 <h1 class='ipsType_pageTitle'>{lang="credit_title"}</h1>

@@ -2848,7 +2854,7 @@
 		</li>
 	</ol>
 </div>]]></template>
- <template template_group="forms" template_name="addPaymentMethodForm" template_data="$showSubmitButton, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="global" template_app="nexus"><![CDATA[
+ <template template_group="forms" template_name="addPaymentMethodForm" template_data="$showSubmitButton, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="global" template_app="nexus"><![CDATA[
 <div class="ipsBox" data-controller="">
 	<form accept-charset='utf-8' class="ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 		<input type="hidden" name="{$id}_submitted" value="1">
@@ -3028,8 +3034,8 @@
 		<input type="text" name="{$name}[postalCode]" placeholder="{lang="zip"}" value="{$value->postalCode}" data-role="postalCode" autocomplete="postal-code">
 	</li>
 	{{if $vat}}
-		<li data-role="vatField">
-			<input type="text" name="{$name}[vat]" placeholder="{lang="cm_checkout_vat_number"}" value="{{if isset( $value->vat ) and $value->vat}}{$value->vat}{{endif}}" data-role="vat">
+		<li data-role="vatField" id="{$htmlId}_vat">
+			<input type="text" name="{$name}[vat]" placeholder="{lang="cm_checkout_vat_number"}" value="{{if isset( $value->vat ) and $value->vat}}{$value->vat}{{endif}}" data-role="vat" class="ipsFieldRow_errorExclude">
 		</li>
 	{{endif}}
 </ul>]]></template>
@@ -3220,12 +3226,12 @@
 		<li data-step='{lang="price"}'>
 			{{if $options['allCurrencies']}}
 				{{foreach \IPS\nexus\Money::currencies() as $currency}}
-					<input type="number" name="{$name}[amount_{$currency}]" size="4" data-decimals="2" data-decpoint="{expression="\IPS\Member::loggedIn()->language()->locale['decimal_point']"}" data-thousandsseparator="{expression="\IPS\Member::loggedIn()->language()->locale['thousands_sep']"}" step="0.01" value="{{if isset( $value->cost[ $currency ]->amount )}}{$value->cost[ $currency ]->amount}{{endif}}" class="ipsField_short ipsField_stackItemNoMargin"> {$currency}<br>
+					<input type="number" name="{$name}[amount_{$currency}]" size="4" data-decimals="2" data-decpoint="{expression="\IPS\Member::loggedIn()->language()->locale['decimal_point']"}" data-thousandsseparator="{expression="\IPS\Member::loggedIn()->language()->locale['thousands_sep']"}" step="0.01" value="{{if $value AND isset( $value->cost[ $currency ]->amount )}}{$value->cost[ $currency ]->amount}{{endif}}" class="ipsField_short ipsField_stackItemNoMargin"> {$currency}<br>
 				{{endforeach}}
 			{{else}}
 				<input type="number" name="{$name}[amount]" size="4" data-decimals="2" data-decpoint="{expression="\IPS\Member::loggedIn()->language()->locale['decimal_point']"}" data-thousandsseparator="{expression="\IPS\Member::loggedIn()->language()->locale['thousands_sep']"}" step="0.01" value="{{if $value}}{$value->cost->amountAsString()}{{endif}}" class="ipsField_short ipsField_stackItemNoMargin">
 				{{if \count( \IPS\nexus\Money::currencies() ) === 1}}
-					{$value->cost->currency}
+					{{if $value}}{$value->cost->currency}{{else}}{expression="\IPS\nexus\Money::currencies()[0]"}{{endif}}
 				{{else}}
 					<select name="{$name}[currency]">
 						{{foreach \IPS\nexus\Money::currencies() as $currency}}
@@ -5756,7 +5762,7 @@

 {$customFieldsForm|raw}
 ]]></template>
- <template template_group="purchases" template_name="view" template_data="$purchase, $customer, $children, $invoices, $customFields" template_location="admin" template_app="nexus"><![CDATA[{{if $billingAgreement = $purchase->billing_agreement AND !$purchase->billing_agreement->canceled}}
+ <template template_group="purchases" template_name="view" template_data="$purchase, $customer, $children, $customFields" template_location="admin" template_app="nexus"><![CDATA[{{if $billingAgreement = $purchase->billing_agreement AND !$purchase->billing_agreement->canceled}}
 	<p class="ipsMessage ipsMessage_info">{lang="billing_agreement_purchase_info" sprintf="$billingAgreement->acpUrl()"}</p>
 {{endif}}
 <div class="ipsGrid">
@@ -5917,7 +5923,11 @@
 		</div>
 		{{endif}}

-		{$invoices|raw}
+		<div data-controller='core.admin.members.lazyLoadingProfileBlock' data-url='{url="app=nexus&module=customers&controller=purchases&do=showInvoices&id="}{$purchase->id}'>
+			<div class="ipsSpacer_bottom ipsType_center">
+				<img src="{resource="tiny_loading.gif" app="core"}">
+			</div>
+		</div>
 	</div>
 </div>]]></template>
 <template template_group="shiporders" template_name="easypostTest" template_data="$easyPost" template_location="admin" template_app="nexus"><![CDATA[{{if isset( $easyPost['messages'] ) and \count( $easyPost['messages'] )}}
@@ -6749,7 +6759,7 @@
 <div class='ipsBox ipsPadding:double' data-controller='nexus.front.store.giftCard' data-formatCurrencyUrl="{url="app=nexus&module=store&controller=gifts&do=formatCurrency"}">
 	{$form|raw}
 </div>]]></template>
- <template template_group="store" template_name="giftCardForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes, $sidebar, $form" template_location="front" template_app="nexus"><![CDATA[{{if $form->error}}
+ <template template_group="store" template_name="giftCardForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="front" template_app="nexus"><![CDATA[{{if $form->error}}
 	<div class="ipsMessage ipsMessage_error ipsSpacer_bottom">
 		{$form->error}
 	</div>
@@ -7805,11 +7815,11 @@
        </div>
 		<div class="cSubscription_desc ipsType_richText ipsType_normal ipsMargin_top">{$package->description}</div>
 	</div>
-	{{if $subscription}}
-		{{if $subscription->package and $subscription->purchase}}
-			{{$upgradeCost = $package->costToUpgrade( $subscription->package, \IPS\nexus\Customer::loggedIn() );}}
+	{{if $subscription AND !$subscription->cancelled }}
+		{{if $subscription->package and $subscription->purchase }}
+			{{$upgradeCost = $subscription->active ? $package->costToUpgrade( $subscription->package, \IPS\nexus\Customer::loggedIn() ) : NULL;}}
 			{{if $subscription->package->id === $package->id}}
-				{{if $subscription->purchase->expire and ( $canRenewUntil = $subscription->purchase->canRenewUntil( NULL,TRUE ) or ( !$subscription->purchase->renewals and $subscription->purchase->can_reactivate ) or ( $pendingInvoice = $subscription->purchase->invoice_pending and $pendingInvoice->status === $pendingInvoice::STATUS_PENDING ) or $subscription->purchase->canCancel())}}
+				{{if $subscription->purchase->expire and ( $canRenewUntil = $subscription->purchase->canRenewUntil( NULL,TRUE ) or ( $subscription->purchase->can_reactivate ) or ( $pendingInvoice = $subscription->purchase->invoice_pending and $pendingInvoice->status === $pendingInvoice::STATUS_PENDING ) or $subscription->purchase->canCancel())}}
 					<div class='cSubscriptionInfo ipsBorder_top ipsType_center ipsPadding:half ipsFlex-flex:00'>
 						<ul class='ipsFlex ipsFlex-jc:center ipsFlex-ai:center ipsFlex-fw:wrap ipsGap:3 ipsGap_row:1'>
 							{{if $pendingInvoice = $subscription->purchase->invoice_pending and $pendingInvoice->status === $pendingInvoice::STATUS_PENDING}}
@@ -7824,7 +7834,7 @@
 										{lang="purchase_renew_now"}
 									</a>
 								</li>
-							{{elseif !$subscription->purchase->renewals and $renewOptions = json_decode( $package->renew_options, TRUE ) and \count( $renewOptions ) and $subscription->purchase->can_reactivate and ( !$subscription->purchase->billing_agreement or $subscription->purchase->billing_agreement->canceled )}}
+							{{elseif $renewOptions = json_decode( $package->renew_options, TRUE ) and \count( $renewOptions ) and $subscription->purchase->can_reactivate and ( !$subscription->purchase->billing_agreement or $subscription->purchase->billing_agreement->canceled )}}
 								<li>
 									<a href="{url="app=nexus&module=subscriptions&controller=subscriptions&do=reactivate&id={$package->id}" base="front" csrf="true" seoTemplate="nexus_subscription"}" class='ipsButton ipsButton_small ipsButton_link ipsButton_fullWidth' title="{lang="purchase_renew_now_title"}">
 										{lang="reactivate_package"}
@@ -7837,6 +7847,12 @@
 										{lang="purchase_cancel_renewal"}
 									</a>
 								</li>
+                            {{elseif $subscription->canCancel()}}
+                                <li>
+									<a href="{url="app=nexus&module=subscriptions&controller=subscriptions&do=cancel&id={$subscription->purchase->id}" base="front" csrf="true" )"}&ref={expression="base64_encode( \IPS\Http\Url::internal( 'app=nexus&module=subscriptions&controller=subscriptions', 'front', 'nexus_subscriptions' ) )"}" class="ipsButton ipsButton_small ipsButton_link ipsButton_link--negative ipsButton_fullWidth" data-confirm ">
+										{lang="nexus_subs_cancel"}
+									</a>
+								</li>
 							{{endif}}
 						</ul>
 					</div>
@@ -7930,13 +7946,9 @@
 	</div>
 	{{endif}}
 </div>
-{{if $table->pages > 1}}
-<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear ipsSpacer_bottom">
-	<div data-role="tablePagination">
-		{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
-	</div>
+<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear ipsSpacer_bottom {{if $table->pages <= 1}}ipsHide{{endif}}" data-role="tablePagination">
+	{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
 </div>
-{{endif}}

 {{if \is_array( $rows ) AND \count( $rows )}}
 	<div class='ipsClear {{foreach $table->classes as $class}}{$class} {{endforeach}}' id='elTable_{$table->uniqueId}' data-controller='nexus.front.subscriptions.main' data-role='tableRows'>
@@ -7950,13 +7962,9 @@
 	</p>
 {{endif}}

-{{if $table->pages > 1}}
-	<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear ipsSpacer_top">
-		<div data-role="tablePagination">
-			{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
-		</div>
-	</div>
-{{endif}}]]></template>
+<div class="ipsButtonBar ipsPad_half ipsClearfix ipsClear ipsSpacer_top {{if $table->pages <= 1}}ipsHide{{endif}}" data-role="tablePagination">
+	{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit, TRUE, $table->getPaginationKey()"}
+</div>]]></template>
 <template template_group="support" template_name="create" template_data="$form" template_location="front" template_app="nexus"><![CDATA[
 {{if !\IPS\Request::i()->isAjax()}}
 	{template="pageHeader" group="global" app="core" params="\IPS\Member::loggedIn()->language()->addToStack('create_new_request')"}
@@ -7974,7 +7982,7 @@
 	<hr class="ipsHr">
 	{expression="nl2br( $rating['rating_note'] )"}
 </div>]]></template>
- <template template_group="support" template_name="filterForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[<form accept-charset='utf-8' class="ipsForm ipsForm_fullWidth {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
+ <template template_group="support" template_name="filterForm" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[<form accept-charset='utf-8' class="ipsForm ipsForm_fullWidth {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
 		{{if \is_array($v)}}
@@ -8057,7 +8065,7 @@
 		</div>
 	</form>
 </div>]]></template>
- <template template_group="support" template_name="filterFormStream" template_data="$input, $options" template_location="admin" template_app="nexus"><![CDATA[<div class="ipsTabs ipsTabs_stretch ipsClearfix ipsJS_show acpFormTabBar cNexusStream_tabs" id='elSupportTabs' data-ipsTabBar data-ipsTabBar-disableNav data-ipsTabBar-contentArea='#elRequestsTabContent'>
+ <template template_group="support" template_name="filterFormStream" template_data="$input, $options" template_location="admin" template_app="nexus"><![CDATA[<div class="ipsTabs ipsClearfix ipsJS_show acpFormTabBar cNexusStream_tabs" id='elSupportTabs' data-ipsTabBar data-ipsTabBar-disableNav data-ipsTabBar-contentArea='#elRequestsTabContent'>
 	<ul role="tablist">
 		<a href="#elSupportTabs" data-action='expandTabs'><i class='fa fa-caret-down'></i></a>
 		{{foreach $options as $stream}}
@@ -8144,12 +8152,10 @@
 	<input type="checkbox" name="{$name}[3]" {{if !$number}}checked{{endif}} data-control="unlimited" id="{$name}_unlimited">
 	<span></span>
 </span> <label for="{$name}_unlimited" class='ipsField_unlimited'>{lang="do_not_highlight_requests"}</label>]]></template>
- <template template_group="support" template_name="latestFeedback" template_data="$table, $headers, $rows" template_location="admin" template_app="nexus"><![CDATA[{{if $table->pages > 1}}
-	<div data-role="tablePagination">
-		{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit"}
-	</div>
-	<br>
-{{endif}}
+ <template template_group="support" template_name="latestFeedback" template_data="$table, $headers, $rows" template_location="admin" template_app="nexus"><![CDATA[
+<div data-role="tablePagination" class='ipsSpacer_bottom {{if $table->pages <= 1}}ipsHide{{endif}}'>
+	{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit"}
+</div>

 <ul class='ipsDataList ipsDataList_large'>
 	{{foreach $rows as $row}}
@@ -8172,11 +8178,9 @@
 	{{endforeach}}
 </ul>

-{{if $table->pages > 1}}
-	<div data-role="tablePagination">
-		{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit"}
-	</div>
-{{endif}}]]></template>
+<div data-role="tablePagination" {{if $table->pages <= 1}}class='ipsHide'{{endif}}>
+	{template="pagination" group="global" app="core" location="global" params="$table->baseUrl, $table->pages, $table->page, $table->limit"}
+</div>]]></template>
 <template template_group="support" template_name="link" template_data="$request, $hovercard=TRUE" template_location="admin" template_app="nexus"><![CDATA[<a href="{$request->acpUrl()}" {{if $hovercard}}data-ipsHover data-ipsHover-target="{$request->acpUrl()->setQueryString( array( 'do' => 'hovercard' ) )}" data-ipsHover-width="750"{{endif}} data-role="supportLink">
 	{{if $request->unread()}}
 		<strong>{$request->title}</strong>
@@ -8185,7 +8189,7 @@
 	{{endif}}
 </a>
 <span class='ipsType_light ipsType_medium'>#{$request->id}</span>]]></template>
- <template template_group="support" template_name="myDepartments" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[<div class="ipsAreaBackground ipsPad">
+ <template template_group="support" template_name="myDepartments" template_data="$id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[<div class="ipsAreaBackground ipsPad">
 	<form accept-charset='utf-8' action="{$action}" method="post" {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm>
 		<input type="hidden" name="{$id}_submitted" value="1">
 		{{foreach $hiddenValues as $k => $v}}
@@ -8484,8 +8488,8 @@
 {{endif}}
 </div>
 </div>]]></template>
- <template template_group="support" template_name="noteForm" template_data="$request, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[
-<form accept-charset='utf-8' class="cNexusSupportForm cNexusSupportForm_note ipsComposeArea ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm id='elNoteForm_form'>
+ <template template_group="support" template_name="noteForm" template_data="$request, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[
+<form accept-charset='utf-8' class="cNexusSupportForm cNexusSupportForm_note ipsAreaBackground_reset ipsPadding ipsComposeArea ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm id='elNoteForm_form'>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
 		{{if \is_array($v)}}
@@ -8507,7 +8511,7 @@
 		</div>
 	{{endif}}

-	<div class='ipsAreaBackground ipsClearfix ipsPad_half ipsType_right' data-ipsEditor-toolList>
+	<div class='ipsClearfix ipsPadding_top ipsType_right' data-ipsEditor-toolList>
 		<ul class='ipsList_inline ipsPos_left ipsType_left cNexusSupportForm_controls'>
 			{{if isset( $elements['']['status'] )}}
 				<li>
@@ -8571,7 +8575,7 @@
 				{{endif}}
 				{{if \IPS\Member::loggedIn()->hasAcpRestriction( 'nexus', 'support', 'requests_reply_delete' )}}
 					<li>
-						<a href="{url="app=nexus&module=support&controller=request&do=deleteReply&id={$comment->id}"}" data-confirm data-ipsTooltip title='{lang="delete"}' class='ipsFaded ipsFaded_more ipsType_blendLinks ipsPos_right ipsType_normal'><i class='fa fa-times'></i></a>
+						<a href="{url="app=nexus&module=support&controller=request&do=deleteReply&id={$comment->id}" csrf="true"}" data-confirm data-ipsTooltip title='{lang="delete"}' class='ipsFaded ipsFaded_more ipsType_blendLinks ipsPos_right ipsType_normal'><i class='fa fa-times'></i></a>
 					</li>
 				{{endif}}
 			</ul>
@@ -8878,7 +8882,7 @@

 		<section class='ipsBox cNexusSupportForm' data-controller='nexus.admin.support.replyArea'>
 			<div>
-				<div class="ipsTabs ipsTabs_small ipsClearfix" id="elSupportForm" data-ipsTabBar data-ipsTabBar-contentArea="#elSupportForm_content">
+				<div class="ipsTabs ipsClearfix" id="elSupportForm" data-ipsTabBar data-ipsTabBar-contentArea="#elSupportForm_content">
 					<a href="#elSupportForm" data-action="expandTabs"><i class="fa fa-caret-down"></i></a>
 					<ul role="tablist">
 						<li>
@@ -9126,7 +9130,7 @@
 									{{if $otherRequestsCount > 10}}
 										<div class="ipsType_center">
 											{{$param = $request->member ? "member={$request->member}" : "email={$request->email}";}}
-											<a href="{url="app=nexus&module=support&controller=requests&{$param}"}" class="ipsButton ipsButton_verySmall ipsButton_normal">{lang="see_all_support" pluralize="$otherRequestsCount"}</a>
+											<a href="{url="app=nexus&module=support&controller=requests&{$param}" csrf="true"}" class="ipsButton ipsButton_verySmall ipsButton_normal">{lang="see_all_support" pluralize="$otherRequestsCount"}</a>
 										</div>
 									{{endif}}
 								</div>
@@ -9397,10 +9401,18 @@
 <ul class='ipsList_reset'>
 	{{foreach $actions as $action}}
 		<li>
-			<a href='#' class='ipsType_blendLinks' {{if isset( $action['menu'] )}}data-ipsMenu id='{{$id = mt_rand();}}{$id}'{{endif}} {{if isset( $action['data'] )}}{{foreach $action['data'] as $k => $v}}data-{$k}="{$v}" {{endforeach}}{{endif}}>
-				<h3 class='ipsType_minorHeading'>{$action['tooltip']}</h3>
+			{{if \count($action['menu']) > 1}} 
+				<a href='#' class='ipsType_blendLinks' {{if isset( $action['menu'] )}}data-ipsMenu id='{{$id = mt_rand();}}{$id}'{{endif}} {{if isset( $action['data'] )}}{{foreach $action['data'] as $k => $v}}data-{$k}="{$v}" {{endforeach}}{{endif}}>
+			{{else}}
+				<span>
+			{{endif}}
+			   <h3 class='ipsType_minorHeading'>{$action['tooltip']}</h3>
 				<p class='ipsType_reset cNexusSupportStatus_value ipsTruncate ipsTruncate_line'><span data-role="title">{lang="$action['title']"}</span></p>
-			</a>
+			{{if \count($action['menu']) > 1}} 
+				</a>
+			{{else}}
+				</span>
+			{{endif}}
 			{{if isset( $action['menu'] )}}
 				<div id='{$id}_menu' class='ipsMenu {{if isset( $action['menuClass'] )}}{$action['menuClass']}{{endif}} ipsHide'>
 					<ul>
@@ -9655,8 +9667,8 @@
 					<th class='ipsType_noBreak'>&nbsp;</th>
 					<th class='ipsType_noBreak'>{lang="request"}</th>
 					<th class='ipsType_noBreak'>{lang="r_status"}</th>
-					<th class='ipsType_noBreak'>{lang="r_staff"}</th>
-					<th class='ipsType_noBreak'>{lang="request_started_by"}</th>
+					<th class='ipsType_noBreak ipsResponsive_hideTablet'>{lang="r_staff"}</th>
+					<th class='ipsType_noBreak ipsResponsive_hideTablet'>{lang="request_started_by"}</th>
 					<th class='ipsType_noBreak'>{lang="r_last_reply_by"}</th>
 					<th class='ipsType_noBreak'>&nbsp;</th>
 					<th class='ipsType_noBreak'>&nbsp;</th>
@@ -9731,14 +9743,14 @@
 					<td class="cNexusSupportTable_status">
 						{template="status" group="support" params="$request->status" app="nexus"}
 					</td>
-					<td class="cNexusSupportTable_assignedTo">
+					<td class="cNexusSupportTable_assignedTo ipsResponsive_hideTablet">
 						{{if $request->staff}}
 							<strong class="ipsType_success">
 								{$request->staff->name}
 							</strong>
 						{{endif}}
 					</td>
-					<td class="cNexusSupportTable_customer ipsType_blendLinks">
+					<td class="cNexusSupportTable_customer ipsType_blendLinks ipsResponsive_hideTablet">
 						{{if $request->author()->member_id}}
 							{template="userLink" group="global" params="$request->author()" app="nexus"}
 						{{else}}
@@ -9831,7 +9843,7 @@
 {$table|raw}]]></template>
 <template template_group="support" template_name="severity" template_data="$severity" template_location="admin" template_app="nexus"><![CDATA[<span class="cNexusSupportBadge ipsTruncate ipsTruncate_line" style="background-color: #{$severity->color}" data-ipsTooltip data-ipsTooltip-label="{$severity->_title}">{$severity->_title}</span>]]></template>
 <template template_group="support" template_name="staffReply" template_data="" template_location="admin" template_app="nexus"></template>
- <template template_group="support" template_name="staffReplyForm" template_data="$request, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[
+ <template template_group="support" template_name="staffReplyForm" template_data="$request, $id, $action, $elements, $hiddenValues, $actionButtons, $uploadField, $class='', $attributes=array(), $sidebar=NULL, $form=NULL" template_location="admin" template_app="nexus"><![CDATA[
 <form accept-charset='utf-8' class="cNexusSupportForm ipsForm {$class}" action="{$action}" method="post" {{if $uploadField}}enctype="multipart/form-data"{{endif}} {{foreach $attributes as $k => $v}}{$k}="{$v}"{{endforeach}} data-ipsForm id='elSupportReplyForm'>
 	<input type="hidden" name="{$id}_submitted" value="1">
 	{{foreach $hiddenValues as $k => $v}}
@@ -9848,9 +9860,9 @@
 		<input type="hidden" name="plupload" value="{expression="md5( mt_rand() )"}">
 	{{endif}}
 	
-	<div class='ipsComposeArea'>
+	<div class='ipsComposeArea ipsAreaBackground_reset ipsPadding'>
 						
-		<div class='ipsPad_half cNexusSupportForm_sendTo ipsJS_hide ipsClearfix' data-ipsEditor-toolList>
+		<div class='ipsMargin_bottom cNexusSupportForm_sendTo ipsJS_hide ipsClearfix' data-ipsEditor-toolList>
 			{{if isset( $elements['']['stock_action'] )}}
 				<span class='ipsPos_right ipsResponsive_noFloat cNexusSupportForm_customAction'><i class='fa fa-flash ipsType_large ipsPos_middle' title='{lang="stock_actions"}' data-ipsTooltip></i> {$elements['']['stock_action']->html()|raw}</span>
 			{{endif}}
@@ -9890,7 +9902,7 @@
 			{{endif}}
 		</div>
 		
-		<div class='ipsAreaBackground ipsClearfix ipsPad_half ipsType_right ipsJS_hide' data-ipsEditor-toolList>
+		<div class='ipsClearfix ipsPadding_top ipsType_right ipsJS_hide' data-ipsEditor-toolList>
 			<ul class='ipsList_inline ipsPos_left ipsType_left cNexusSupportForm_controls'>
 				{{if isset( $elements['']['status'] )}}
 					<li>
@@ -9919,9 +9931,9 @@
 					<li>
 						<a href='#' class='ipsButton ipsButton_primary ipsButton_large ipsButton_narrow' id='elSupportReplyForm_more' data-ipsMenu data-ipsMenu-appendTo='#elSupportReplyForm'><i class='fa fa-caret-down'></i></a>
 						<ul id='elSupportReplyForm_more_menu' class='ipsMenu ipsMenu_narrow ipsHide'>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='next'>{lang="reply_and_go_to_next"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='first'>{lang="reply_and_go_to_first"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='list'>{lang="reply_and_go_to_list"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='next'>{lang="reply_and_go_to_next"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='first'>{lang="reply_and_go_to_first"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='list'>{lang="reply_and_go_to_list"}</button></li>
 						</ul>
 					</li>
 				{{elseif $defaultAction == 'list'}}
@@ -9929,9 +9941,9 @@
 					<li>
 						<a href='#' class='ipsButton ipsButton_primary ipsButton_large ipsButton_narrow' id='elSupportReplyForm_more' data-ipsMenu data-ipsMenu-appendTo='#elSupportReplyForm'><i class='fa fa-caret-down'></i></a>
 						<ul id='elSupportReplyForm_more_menu' class='ipsMenu ipsMenu_narrow ipsHide'>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth'>{lang="reply_and_stay"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='next'>{lang="reply_and_go_to_next"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='first'>{lang="reply_and_go_to_first"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth'>{lang="reply_and_stay"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='next'>{lang="reply_and_go_to_next"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='first'>{lang="reply_and_go_to_first"}</button></li>
 						</ul>
 					</li>
 				{{elseif $defaultAction == 'next'}}
@@ -9939,9 +9951,9 @@
 					<li>
 						<a href='#' class='ipsButton ipsButton_primary ipsButton_large ipsButton_narrow' id='elSupportReplyForm_more' data-ipsMenu data-ipsMenu-appendTo='#elSupportReplyForm'><i class='fa fa-caret-down'></i></a>
 						<ul id='elSupportReplyForm_more_menu' class='ipsMenu ipsMenu_narrow ipsHide'>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='first'>{lang="reply_and_go_to_first"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth'>{lang="reply_and_stay"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='list'>{lang="reply_and_go_to_list"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='first'>{lang="reply_and_go_to_first"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth'>{lang="reply_and_stay"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='list'>{lang="reply_and_go_to_list"}</button></li>
 						</ul>
 					</li>
 				{{else}}
@@ -9949,9 +9961,9 @@
 					<li>
 						<a href='#' class='ipsButton ipsButton_primary ipsButton_large ipsButton_narrow' id='elSupportReplyForm_more' data-ipsMenu data-ipsMenu-appendTo='#elSupportReplyForm'><i class='fa fa-caret-down'></i></a>
 						<ul id='elSupportReplyForm_more_menu' class='ipsMenu ipsMenu_narrow ipsHide'>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth'>{lang="reply_and_stay"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='next'>{lang="reply_and_go_to_next"}</button></li>
-							<li class='ipsMenu_item ipsPad_half'><button type='submit' class='ipsButton ipsButton_primary ipsButton_small ipsButton_fullWidth' name='goto' value='list'>{lang="reply_and_go_to_list"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth'>{lang="reply_and_stay"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='next'>{lang="reply_and_go_to_next"}</button></li>
+							<li class='ipsMenu_item'><button type='submit' class='ipsButton ipsButton_link ipsButton_fullWidth' name='goto' value='list'>{lang="reply_and_go_to_list"}</button></li>
 						</ul>
 					</li>
 				{{endif}}
@@ -10680,7 +10692,7 @@
 					</p>
 					{{if $transaction->status === $transaction::STATUS_DISPUTED}}
 						<div class="ipsSpacer_top">
-							<a href="{$transaction->acpUrl()->setQueryString( array( 'do' => 'approve', 'r' => 'v' ) )}" class="ipsButton ipsButton_positive ipsButton_verySmall" data-confirm data-confirmSubMessage="{lang="transaction_approve_from_dispute"}">{lang="transaction_approve"}</a>
+							<a href="{$transaction->acpUrl()->setQueryString( array( 'do' => 'approve', 'r' => 'v' ) )->csrf()}" class="ipsButton ipsButton_positive ipsButton_verySmall" data-confirm data-confirmSubMessage="{lang="transaction_approve_from_dispute"}">{lang="transaction_approve"}</a>
 							<a href="{$transaction->acpUrl()->setQueryString( array( 'do' => 'refund', 'r' => 'v' ) )}" class="ipsButton ipsButton_negative ipsButton_verySmall" data-ipsDialog data-ipsDialog-title="{lang="transaction_refund_credit_title" sprintf="$transaction->amount"}">{lang="transaction_refund_credit"}</a>
 						</div>
 					{{endif}}
@@ -11522,7 +11534,7 @@
        <a href='#' class='ipsCarousel_nav ipsHide' data-action='next'><i class='fa fa-chevron-right'></i></a>
    </div>
 {{endif}}
-
+	</div>
 ]]></template>
 <template template_group="widgets" template_name="latestProducts" template_data="$packages, $orientation='vertical'" template_location="front" template_app="nexus"><![CDATA[{{if !empty( $packages ) }}
 	<h3 class='ipsType_reset ipsWidget_title'>{lang="block_latestProducts"}</h3>
@@ -11642,7 +11654,7 @@
 						{{$package =  \IPS\nexus\Package::load( $review->item()->id );}}
 						<li class='ipsDataItem cNexusWidgetProduct ipsClearfix'>
 							<div class='ipsPhotoPanel ipsPhotoPanel_mini'>
-								<a href='{$package->url()}' class='ipsPos_left cNexusProduct_image ipsThumb ipsThumb_tiny ipsThumb_bg' {{if $package->image}}style='background-image: url({backgroundimage="$package->image"})'{{endif}}>
+								<a href='{$review->url()}' class='ipsPos_left cNexusProduct_image ipsThumb ipsThumb_tiny ipsThumb_bg' {{if $package->image}}style='background-image: url({backgroundimage="$package->image"})'{{endif}}>
 									{{if $package->image}}
 										<img src="{$package->image}" class='ipsImage' alt="{$package->_title}">
 									{{else}}
@@ -11652,7 +11664,7 @@
 								<div>
 									<div class='ipsType_break ipsContained'>
 										<div class='ipsSpacer_bottom ipsSpacer_half'>
-											<a href="{$review->item()->url()}" title='{lang="view_this_product" sprintf="$review->item()->title"}' class='ipsType_normal ipsType_blendLinks'>{$review->item()->title}</a><br>
+											<a href="{$review->url()}" title='{lang="view_this_product" sprintf="$review->item()->title"}' class='ipsType_normal ipsType_blendLinks'>{$review->item()->title}</a><br>
 											<span class='cNexusWidgetPrice'>{$package->price()}</span>
 										</div>

@@ -11678,7 +11690,7 @@
 					{{$package =  \IPS\nexus\Package::load( $review->item()->id );}}
 					<li class='ipsDataItem cNexusWidgetProduct ipsClearfix'>
 						<div class='ipsPhotoPanel ipsPhotoPanel_large'>
-							<a href='{$package->url()}' class='ipsPos_left cNexusProduct_image ipsThumb ipsThumb_small ipsThumb_bg' {{if $package->image}}style='background-image: url({backgroundimage="$package->image"})'{{endif}}>
+							<a href='{$review->url()}' class='ipsPos_left cNexusProduct_image ipsThumb ipsThumb_small ipsThumb_bg' {{if $package->image}}style='background-image: url({backgroundimage="$package->image"})'{{endif}}>
 								{{if $package->image}}
 									<img src="{$package->image}" class='ipsImage' alt="{$package->_title}">
 								{{else}}
@@ -11688,7 +11700,7 @@
 							<div>
 								<div class='ipsType_break ipsContained'>
 									<div class='ipsSpacer_bottom ipsSpacer_half'>
-										<a href="{$review->item()->url()}" title='{lang="view_this_product" sprintf="$review->item()->title"}' class='ipsType_normal ipsType_blendLinks'>{$review->item()->title}</a><br>
+										<a href="{$review->url()}" title='{lang="view_this_product" sprintf="$review->item()->title"}' class='ipsType_normal ipsType_blendLinks'>{$review->item()->title}</a><br>
 										<span class='cNexusWidgetPrice'>{$package->price()}</span>
 									</div>

@@ -12740,7 +12752,25 @@ ul.cInvoiceUnpaidConsequences ul {
 .cNexusActionBadge_off {
 	background: #ececec;
 	background: var(--c3);
-}]]></css>
+}
+
+.cNexusPrimaryRadio {
+	background: rgb(var(--theme-area_background_reset));
+	border-radius: 40px;
+	position: absolute;
+	top: 110px;
+	left: var(--sp-3); 
+	padding: var(--sp-1) var(--sp-2) var(--sp-1) var(--sp-1);
+	font-size: {fontsize="11"} !important;
+}
+
+	.cNexusPrimaryRadio .ipsCustomInput {
+		margin-right: 2px;
+	}
+
+	.ipsUploader__row.ipsAttach_error .cNexusPrimaryRadio {
+		display: none;
+	}]]></css>
 <css css_location="front" css_app="nexus" css_attributes="" css_path="." css_name="nexus.css"><![CDATA[.cNexusPrice {
 	color: rgb( var(--theme-price) );
 }
@@ -13491,7 +13521,7 @@ html[dir="rtl"] .cNexusStep_block .ipsColumn_fluid {
 	height: 40px;
 	font-size: 26px;
 	padding-top: 2px;
-	z-index: 5000;
+	z-index: 1000;
 	border-radius: 2px 2px 0 0;
 }
 html[dir=&quot;ltr&quot;] .cSubscriptions .cSubscriptionActive {
@@ -13916,7 +13946,7 @@ html[dir="rtl"] .cNexusStream_count {
 		margin: 0;
 	}

-	#elNexusRequestControls li a {
+	#elNexusRequestControls li a, #elNexusRequestControls li > span {
 		display: block;
 		position: relative;
 		padding: 10px 15px 10px 10px;
@@ -13991,10 +14021,6 @@ html[dir="rtl"] .cNexusStream_count {
 }

 /* Reset some tab styles specifically for the ticket view page */
-#elSupportForm {
-	padding: 0;
-}
-
 .cNexusSupportForm .ipsTabs_panels.ipsTabs_contained .ipsTabs_panel,
 .cNexusSupportRequest_metaInfo .ipsTabs_small {
 	padding: 0;
@@ -14006,23 +14032,17 @@ html[dir="rtl"] .cNexusStream_count {
 	border: 0 !important;
 }*/

-.cNexusSupportForm_message .ipsComposeArea_editor {
-	padding: 0 !important;
-}
-
 /* Special classes for the note reply form */
 .cNexusSupportForm_note .ipsTabs_contained {
 	border-color: #ecdcb9;
 }

-.cNexusSupportForm_note .ipsAreaBackground,
-.cNexusSupportForm_note,
 .cNexusSupportForm_note .ipsTabs {
 	background: #ecd2ab;
 }

-.cNexusSupportForm_note .ipsType_minorHeading {
-	color: #765d38;
+.cNexusSupportForm_note .ipsButton_primary {
+	background: #b38034;
 }

 .cNexusSupportForm_note .ipsTabs .ipsTabs_item:not( .ipsTabs_activeItem ) {
@@ -14034,11 +14054,6 @@ html[dir="rtl"] .cNexusStream_count {
 	color: #765d38;
 }

-.cNexusSupportForm_sendTo {
-	border-bottom: 1px solid #ebebeb;
-	padding-left: 10px;
-}
-
 .cNexusSupportForm_sendTo .ipsForm > li {
 	margin-bottom: 0;
 }
@@ -14054,6 +14069,13 @@ html[dir="rtl"] .cNexusSupportForm_sendTo .ipsForm_horizontal .ipsFieldRow:not(
 	margin-right: 100px;
 }

+.cNexusSupportForm_buttons{
+	padding: 0;
+	border-width: 0;
+	box-shadow: none;
+	background: none;
+}
+
 .cNexusTicketSort {
 	width: 30% !important;
 }
@@ -9,7 +9,7 @@
        "sc_tab_key": "custom",
        "sc_show_in_vse": 0,
        "sc_title": "themesetting_cm_store_view",
-        "sc_order": 11,
+        "sc_order": 12,
        "sc_condition": null
    }
 ]
@@ -382,6 +382,7 @@
    "104067": "4.4.10",
    "104068": "4.4.10",
    "104069": "4.4.10",
+    "104070": "4.4.11",
    "105013": "4.5.0 Beta 1",
    "105014": "4.5.0 Beta 1",
    "105015": "4.5.0 Beta 2",
@@ -402,5 +403,42 @@
    "105030": "4.5.0 Beta 11",
    "105031": "4.5.0 Beta 11",
    "105032": "4.5.0 Beta 12",
-    "105100": "4.5.0"
+    "105100": "4.5.0",
+    "105101": "4.5.0",
+    "105102": "4.5.1 Beta 1",
+    "105103": "4.5.1 Beta 1",
+    "105104": "4.5.1 Beta 2",
+    "105105": "4.5.1 Beta 3",
+    "105106": "4.5.1",
+    "105107": "4.5.2",
+    "105108": "4.5.2",
+    "105109": "4.5.2",
+    "105110": "4.5.2",
+    "105111": "4.5.2",
+    "105112": "4.5.3",
+    "105113": "4.5.3",
+    "105114": "4.5.3",
+    "105115": "4.5.3",
+    "105116": "4.5.4",
+    "105117": "4.5.4",
+    "105118": "4.5.4",
+    "105119": "4.5.4",
+    "105120": "4.5.4",
+    "105121": "4.5.4",
+    "105122": "4.5.4",
+    "105123": "4.5.4",
+    "105124": "4.5.4.1",
+    "105125": "4.5.4.2",
+    "105126": "4.5.4.2",
+    "105127": "4.5.4.2",
+    "105128": "4.5.4.2",
+    "105129": "4.5.4.2",
+    "105130": "4.5.4.2",
+    "106100": "4.6.0 Beta 1",
+    "106101": "4.6.0 Beta 1.1",
+    "106103": "4.6.0 Beta 2",
+    "106104": "4.6.0 Beta 3",
+    "106105": "4.6.0 Beta 3.1",
+    "106106": "4.6.0 Beta 4",
+    "106107": "4.6.0"
 }