From 359a73a58fa831ebed2de6079b05d670d1bd725e Mon Sep 17 00:00:00 2001 From: Partydragen Date: Wed, 30 Dec 2020 23:54:27 +0100 Subject: [PATCH] Release pr2 --- .../Default/store/categories_edit.tpl | 119 ++++----- .../Default/store/categories_new.tpl | 117 ++++----- .../panel_templates/Default/store/index.tpl | 119 ++++----- .../Default/store/packages.tpl | 121 ++++----- .../Default/store/packages_command_edit.tpl | 101 ++++---- .../Default/store/packages_command_new.tpl | 101 ++++---- .../Default/store/packages_edit.tpl | 116 ++++----- .../Default/store/packages_new.tpl | 117 ++++----- .../Default/store/payments.tpl | 116 ++++----- .../Default/store/payments_new_step_1.tpl | 110 ++++----- .../Default/store/payments_new_step_2.tpl | 110 ++++----- .../Default/store/payments_user.tpl | 116 ++++----- .../Default/store/payments_view.tpl | 233 ++++++++++-------- .../Store/gateways/payment_listener.php | 1 - .../Store/language/EnglishUK/admin.php | 4 + upload/modules/Store/module.php | 9 +- .../modules/Store/pages/panel/categories.php | 33 +-- upload/modules/Store/pages/panel/index.php | 29 +-- upload/modules/Store/pages/panel/packages.php | 29 +-- upload/modules/Store/pages/panel/payments.php | 81 +++--- 20 files changed, 743 insertions(+), 1039 deletions(-) diff --git a/upload/custom/panel_templates/Default/store/categories_edit.tpl b/upload/custom/panel_templates/Default/store/categories_edit.tpl index e9ccaf2..72ef698 100644 --- a/upload/custom/panel_templates/Default/store/categories_edit.tpl +++ b/upload/custom/panel_templates/Default/store/categories_edit.tpl @@ -1,79 +1,49 @@ {include file='header.tpl'} - -
- {include file='navbar.tpl'} + + + + +
+ + {include file='sidebar.tpl'} -
-
-
-
-
-

{$CATEGORIES}

-
-
-
    -
  1. {$DASHBOARD}
    2. -
  2. {$BUYCRAFT}
    3. -
  3. {$CATEGORIES}
    4. -
-
-
-
-
+ +
-
+
+ + + {include file='navbar.tpl'} + +
- {if isset($NEW_UPDATE)} - {if $NEW_UPDATE_URGENT eq true} -
- {else} -
- - {/if} - {$NEW_UPDATE} -
- {$UPDATE} -
- {$CURRENT_VERSION}
- {$NEW_VERSION} -
- {/if} -
-
+ +
+

{$CATEGORIES}

+
    +
  1. {$DASHBOARD}
    2. +
  2. {$STORE}
    3. +
  3. {$CATEGORIES}
    4. +
+
+ + + {include file='includes/update.tpl'} + +
+
+
{$EDITING_CATEGORY}
{$BACK}
- - {if isset($SUCCESS)} -
- -
{$SUCCESS_TITLE}
- {$SUCCESS} -
- {/if} - - {if isset($ERRORS) && count($ERRORS)} -
- -
{$ERRORS_TITLE}
-
    - {foreach from=$ERRORS item=error} -
  • {$error}
    • - {/foreach} -
-
- {/if} + + + {include file='includes/alerts.tpl'}
@@ -109,20 +79,25 @@
--> -
+
- -
+ +
-
-
-
+ +
+ + +
+ + {include file='footer.tpl'} - {include file='footer.tpl'} + +
+ - {include file='scripts.tpl'} diff --git a/upload/custom/panel_templates/Default/store/categories_new.tpl b/upload/custom/panel_templates/Default/store/categories_new.tpl index fd362a3..830fdb5 100644 --- a/upload/custom/panel_templates/Default/store/categories_new.tpl +++ b/upload/custom/panel_templates/Default/store/categories_new.tpl @@ -1,79 +1,49 @@ {include file='header.tpl'} - -
- {include file='navbar.tpl'} + + + + +
+ + {include file='sidebar.tpl'} -
-
-
-
-
-

{$PACKAGES}

-
-
-
    -
  1. {$DASHBOARD}
    2. -
  2. {$BUYCRAFT}
    3. -
  3. {$PACKAGES}
    4. -
-
-
-
-
+ +
-
+
+ + + {include file='navbar.tpl'} + +
- {if isset($NEW_UPDATE)} - {if $NEW_UPDATE_URGENT eq true} -
- {else} -
- - {/if} - {$NEW_UPDATE} -
- {$UPDATE} -
- {$CURRENT_VERSION}
- {$NEW_VERSION} -
- {/if} -
-
+ +
+

{$PACKAGES}

+
    +
  1. {$DASHBOARD}
    2. +
  2. {$STORE}
    3. +
  3. {$PACKAGES}
    4. +
+
+ + + {include file='includes/update.tpl'} + +
+
+
{$NEW_CATEGORY}
{$BACK}
- {if isset($SUCCESS)} -
- -
{$SUCCESS_TITLE}
- {$SUCCESS} -
- {/if} - - {if isset($ERRORS) && count($ERRORS)} -
- -
{$ERRORS_TITLE}
-
    - {foreach from=$ERRORS item=error} -
  • {$error}
    • - {/foreach} -
-
- {/if} + + {include file='includes/alerts.tpl'}
@@ -108,20 +78,25 @@
---> -
+
- -
+ +
-
-
-
+ +
+ + +
+ + {include file='footer.tpl'} - {include file='footer.tpl'} + +
+ - {include file='scripts.tpl'} diff --git a/upload/custom/panel_templates/Default/store/index.tpl b/upload/custom/panel_templates/Default/store/index.tpl index bfc0253..74a023c 100644 --- a/upload/custom/panel_templates/Default/store/index.tpl +++ b/upload/custom/panel_templates/Default/store/index.tpl @@ -1,72 +1,42 @@ {include file='header.tpl'} - -
- {include file='navbar.tpl'} + + + + +
+ + {include file='sidebar.tpl'} -
-
-
-
-
-

{$STORE}

-
-
-
    -
  1. {$DASHBOARD}
    2. -
  2. {$STORE}
    3. -
-
-
-
-
+ +
-
+
+ + + {include file='navbar.tpl'} + +
- {if isset($NEW_UPDATE)} - {if $NEW_UPDATE_URGENT eq true} -
- {else} -
- - {/if} - {$NEW_UPDATE} -
- {$UPDATE} -
- {$CURRENT_VERSION}
- {$NEW_VERSION} -
- {/if} - -
-
- {if isset($SUCCESS)} -
- -
{$SUCCESS_TITLE}
- {$SUCCESS} -
- {/if} - - {if isset($ERRORS) && count($ERRORS)} -
- -
{$ERRORS_TITLE}
-
    - {foreach from=$ERRORS item=error} -
  • {$error}
    • - {/foreach} -
-
- {/if} + + +
+

{$STORE}

+
    +
  1. {$DASHBOARD}
    2. +
  2. {$STORE}
    3. +
+
+ + + {include file='includes/update.tpl'} + +
+
+ + + {include file='includes/alerts.tpl'}
@@ -103,7 +73,7 @@
-
@@ -111,20 +81,25 @@
-
+
- -
+ +
-
-
-
+ +
+ + +
+ + {include file='footer.tpl'} - {include file='footer.tpl'} + +
+ - {include file='scripts.tpl'} diff --git a/upload/custom/panel_templates/Default/store/packages.tpl b/upload/custom/panel_templates/Default/store/packages.tpl index 4de7093..5f83184 100644 --- a/upload/custom/panel_templates/Default/store/packages.tpl +++ b/upload/custom/panel_templates/Default/store/packages.tpl @@ -1,50 +1,41 @@ {include file='header.tpl'} - -
- {include file='navbar.tpl'} + + + + +
+ + {include file='sidebar.tpl'} -
-
-
-
-
-

{$PACKAGES}

-
-
-
    -
  1. {$DASHBOARD}
    2. -
  2. {$STORE}
    3. -
  3. {$PACKAGES}
    4. -
-
-
-
-
+ +
-
+
+ + + {include file='navbar.tpl'} + +
- {if isset($NEW_UPDATE)} - {if $NEW_UPDATE_URGENT eq true} -
- {else} -
- - {/if} - {$NEW_UPDATE} -
- {$UPDATE} -
- {$CURRENT_VERSION}
- {$NEW_VERSION} -
- {/if} -
-
+ +
+

{$PACKAGES}

+
    +
  1. {$DASHBOARD}
    2. +
  2. {$STORE}
    3. +
  3. {$PACKAGES}
    4. +
+
+ + + {include file='includes/update.tpl'} + +
+
+ {$NEW_CATEGORY} {$NEW_PACKAGE} @@ -53,29 +44,8 @@

- {if isset($SUCCESS)} -
- -
{$SUCCESS_TITLE}
- {$SUCCESS} -
- {/if} - - {if isset($ERRORS) && count($ERRORS)} -
- -
{$ERRORS_TITLE}
-
    - {foreach from=$ERRORS item=error} -
  • {$error}
    • - {/foreach} -
-
- {/if} + + {include file='includes/alerts.tpl'} {if isset($NO_PACKAGES)}

{$NO_PACKAGES}

@@ -116,15 +86,25 @@ {/foreach} {/if} -
+
- -
+ +
-
-
+ +
+ + +
+ + {include file='footer.tpl'} + +
+ + +
- {include file='footer.tpl'} - - - - {include file='scripts.tpl'}