From ec75c3501771b9065537bfb8479844c697d4756f Mon Sep 17 00:00:00 2001 From: Wasis Haryo Sasoko Date: Sat, 9 Sep 2017 10:28:28 +0800 Subject: [PATCH 01/26] Update README.MD --- README.MD | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/README.MD b/README.MD index c7f4f62..3b3aae0 100644 --- a/README.MD +++ b/README.MD @@ -1,8 +1,6 @@ # Bootstrap theme for BoxBilling -This is an easily customisable Bootstrap theme for BoxBilling. - -![Dashboard](https://framapic.org/pwGGIsDG9g5v/GyObwZB9W4dm) +This is an easily customisable Bootstrap theme for BoxBilling. This theme looks is based on WHMCS. Please report issues and suggestions within this git. The theme is licensed under GPLv3 so please feed back your improvements to this git. @@ -18,7 +16,3 @@ Please report issues and suggestions within this git. The theme is licensed unde ## Installation - Copy the "bootstrap" folder in *bb-themes* - Configure the theme - -![Order](https://framapic.org/9hHZFbG1NY9t/iukgZlrehmWv) - -![Services](https://framapic.org/JH2twTKmobr9/AQ8wm8RzN4vb) \ No newline at end of file From 34b60a62c1dac07521c8d3f871e748e86bba0631 Mon Sep 17 00:00:00 2001 From: Wasis Haryo Sasoko Date: Sat, 9 Sep 2017 10:34:25 +0800 Subject: [PATCH 02/26] Initial Commit --- bootstrap/assets/css/bimasoft.css | 126 +++++++ bootstrap/assets/images/logo.png | Bin 4086 -> 0 bytes bootstrap/assets/images/logo_new.svg | 427 +++++++++++++++++++++++ bootstrap/config/settings_data.json | 1 + bootstrap/html/layout_default.phtml | 73 ++-- bootstrap/html/mod_index_dashboard.phtml | 3 +- bootstrap/html/mod_order_index.phtml | 18 +- bootstrap/html/partial_menu.phtml | 13 +- 8 files changed, 630 insertions(+), 31 deletions(-) create mode 100644 bootstrap/assets/css/bimasoft.css delete mode 100644 bootstrap/assets/images/logo.png create mode 100644 bootstrap/assets/images/logo_new.svg diff --git a/bootstrap/assets/css/bimasoft.css b/bootstrap/assets/css/bimasoft.css new file mode 100644 index 0000000..93c0f77 --- /dev/null +++ b/bootstrap/assets/css/bimasoft.css @@ -0,0 +1,126 @@ +.navbar-inverse { + background: none; + border: none; + box-shadow: none; + padding-top: 10px; +} + +body { + padding-top: 0; +} +.navbar-inverse .navbar-nav>li>a:hover, .navbar-inverse .navbar-nav>li>a:focus { + background: none; + color: #888; + text-decoration: underline; +} + +.navbar-inverse .navbar-nav>li>a +{ + color: #888; + text-shadow: none; + font-size: 12px; +} + +.nav>li>a { + padding: 5px 10px; +} + +.navbar2 { + background: #006687; + margin-bottom: 30px; +} + +.navbar2 .list-group { + margin-bottom: 0; +} + +.navbar2 .list-group:after { + content: ""; + clear: both; + display: block; +} + +.navbar2 .list-group-item { + float: left; + border: none; + background: none; +} + +.navbar2 a.list-group-item, .navbar2 button.list-group-item { + color: #fff; +} + +.navbar2 .list-group-item.active, .navbar2 .list-group-item.active:hover, .navbar2 .list-group-item.active:focus { + background: none; +} + +.navbar2 a.active.list-group-item:hover { + background: #fff; + color: #555; +} + +.navbar2 a.list-group-item:hover, +.navbar2 button.list-group-item:hover, +.navbar2 a.list-group-item:focus, +.navbar2 button.list-group-item:focus { + color: #555; +} + +.navbar2 .float-right { + float: right; +} +.page-header { + margin-top: 0; + font-size: 25px; + color: #033c73; +} + +.panel-default>.panel-heading { + font-size: 14px; + color: #000; + font-weight: bold; +} + +.fullname { + font-weight: bold; + color: #000; + margin-bottom: 10px; +} + +.layanan a:hover { + text-decoration: none; + background: #f3f3f3 +} + +.layanan a { + display: block; + color: #777; + border-top: solid 1px #ccc; + padding: 5px; + font-size: 12px; + padding-left: 20px; +} + +.panel-body.layanan { + padding: 0; +} + +.panel-body.categories { + padding: 0; +} + +.panel-body.categories a { + display: block; + color: #777; + border-top: solid 1px #ccc; + padding: 5px; + font-size: 13px; + padding-left: 20px; +} + +.panel-body.categories a:hover, +.panel-body.categories a:focus { + text-decoration: none; + background: #006687; + color: #fff; +} \ No newline at end of file diff --git a/bootstrap/assets/images/logo.png b/bootstrap/assets/images/logo.png deleted file mode 100644 index 2318975be098203f4c9aa896bc9df3a87139d151..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4086 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 diff --git a/bootstrap/assets/images/logo_new.svg b/bootstrap/assets/images/logo_new.svg new file mode 100644 index 0000000..9aa6e9c --- /dev/null +++ b/bootstrap/assets/images/logo_new.svg @@ -0,0 +1,427 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bootstrap/config/settings_data.json b/bootstrap/config/settings_data.json index e69de29..e806c3c 100644 --- a/bootstrap/config/settings_data.json +++ b/bootstrap/config/settings_data.json @@ -0,0 +1 @@ +{"presets":{"Default":{"theme":"cerulean","lumen":"journal","dash_services":"1","dash_support":"1","dash_invoices":"1","dash_orders":"1","dash_messages":"1","dash_kb":"1","dash_news":"1","dash_forum":"1","home_page":"order","home_sidemenu":"1","showcase_enabled":"0","showcase_heading":"","showcase_text":"","showcase_button_title":"","showcase_button_url":"","side_menu_home":"1","side_menu_order":"1","side_menu_blog":"1","side_menu_forum":"1","side_menu_kb":"1","side_menu_contact":"1","side_menu_services":"1","side_menu_support":"1","side_menu_invoices":"1","side_menu_register":"1","sidebar_note_enabled":"1","sidebar_note_title":"","sidebar_note_content":"","meta_title":"","meta_description":"","meta_keywords":"","meta_robots":"","meta_author":"","show_page_footer":"1","footer_branding_enabled":"1","footer_to_top_enabled":"1","footer_signature":"","footer_link_1_title":"","footer_link_1_page":"","footer_link_2_title":"","footer_link_2_page":"","footer_link_3_title":"","footer_link_3_page":"","footer_link_4_title":"","footer_link_4_page":"","footer_link_5_title":"","footer_link_5_page":"","inject_javascript":"","inject_css":""}},"current":"Default"} \ No newline at end of file diff --git a/bootstrap/html/layout_default.phtml b/bootstrap/html/layout_default.phtml index ec37e16..fb96202 100644 --- a/bootstrap/html/layout_default.phtml +++ b/bootstrap/html/layout_default.phtml @@ -1,4 +1,5 @@ {% set company = guest.system_company %} +{% set profile = client.client_get %} @@ -36,6 +37,9 @@ + + + @@ -89,7 +93,6 @@ - {{company.name}} @@ -131,18 +133,28 @@ {% block content_banner %}{% endblock %}
-
- +
+ {% if company.logo_url %}

{{company.name}}

+ {% else %}

{{company.name}}

+ {% endif %} +
+
+
+
+
+
+
- +
+
+
+
+ {% if side_menu == 'hidden' %}
{% else %} -
- {% if company.logo_url %}

{{company.name}}

- {% else %}

{{company.name}}

- {% endif %} - +
+ - {% block sidebar %}{% endblock %} - + + +
+
  Informasi Anda
+
+
{{ profile.first_name }} {{ profile.last_name }}
+
{{ profile.address_1 }}
+
{{ profile.address_2 }}
+
{{ profile.city }}
+
{{ profile.state }}
+
{{ profile.postcode }}
+
{{ profile.country }}
+
+
+ +
+
  Shortcuts
+
+ Pesan Layanan Baru + Daftarkan Domain Baru + Logout +
+
+ {% if settings.sidebar_note_enabled %} -
-

{{ settings.sidebar_note_title }}

-

{{ settings.sidebar_note_content }}

-
{% endif %} - - {% block sidebar2 %}{% endblock %} + + {% if false %} + {% block sidebar %}{% endblock %} + {% block sidebar2 %}{% endblock %} + {% endif %}
{% endif %} diff --git a/bootstrap/html/mod_index_dashboard.phtml b/bootstrap/html/mod_index_dashboard.phtml index d76c24c..2a295dc 100644 --- a/bootstrap/html/mod_index_dashboard.phtml +++ b/bootstrap/html/mod_index_dashboard.phtml @@ -2,6 +2,7 @@ {% extends request.ajax or (not client and settings.home_page != "menuicons") ? "layout_blank.phtml" : "layout_default.phtml" %} {% block meta_title %}{% trans 'Client Area' %}{% endblock %} {% import "macro_functions.phtml" as mf %} +{% set profile = client.client_get %} {% if not settings.home_sidemenu %} {% if not client %}{% set side_menu = 'hidden' %}{% endif %} @@ -12,7 +13,7 @@ {% if client %}
-

{% trans 'Dashboard' %}

+

Selamat Datang Kembali, {{ profile.first_name }} {{ profile.last_name }}

{% else %} diff --git a/bootstrap/html/mod_order_index.phtml b/bootstrap/html/mod_order_index.phtml index 4f0e8b9..d8175e0 100644 --- a/bootstrap/html/mod_order_index.phtml +++ b/bootstrap/html/mod_order_index.phtml @@ -81,6 +81,21 @@
+ + {% endblock %} @@ -88,4 +103,5 @@
{% include 'partial_currency.phtml' %}
-{% endblock %} \ No newline at end of file +{% endblock %} + diff --git a/bootstrap/html/partial_menu.phtml b/bootstrap/html/partial_menu.phtml index e85f891..ea3d241 100644 --- a/bootstrap/html/partial_menu.phtml +++ b/bootstrap/html/partial_menu.phtml @@ -5,17 +5,12 @@ {% if settings.side_menu_forum and guest.extension_is_on({"mod":"forum"}) %} {% trans 'Forum' %}{% endif %} {% if settings.side_menu_kb and guest.extension_is_on({"mod":"kb"}) %} {% trans 'Knowledge Base' %}{% endif %} {% if settings.side_menu_contact %} {% trans 'Contact us' %}{% endif %} -
{% if client %} -
- {% if settings.side_menu_services %} {% trans 'Services' %}{% endif %} - {% if settings.side_menu_support %} {% trans 'Support' %}{% endif %} - {% if settings.side_menu_invoices %} {% trans 'Invoices' %}{% endif %} + {% if settings.side_menu_invoices %} {% trans 'Invoices' %}{% endif %} + {% if settings.side_menu_support %} {% trans 'Support' %}{% endif %} + {% if settings.side_menu_services %} {% trans 'Services' %}{% endif %} -
{% else %} -
- {% if settings.side_menu_register %}{% trans 'Sign in / Register' %}{% endif %} -
{% endif %} +
From 1095417ebc084ac580ac0077e26e7f8a698e9919 Mon Sep 17 00:00:00 2001 From: Wasis Haryo Sasoko Date: Sat, 9 Sep 2017 10:35:27 +0800 Subject: [PATCH 03/26] X --- .gitattributes | 17 ----------------- .gitignore | 47 ----------------------------------------------- 2 files changed, 64 deletions(-) delete mode 100644 .gitattributes delete mode 100644 .gitignore diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index bdb0cab..0000000 --- a/.gitattributes +++ /dev/null @@ -1,17 +0,0 @@ -# Auto detect text files and perform LF normalization -* text=auto - -# Custom for Visual Studio -*.cs diff=csharp - -# Standard to msysgit -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore deleted file mode 100644 index cd2946a..0000000 --- a/.gitignore +++ /dev/null @@ -1,47 +0,0 @@ -# Windows image file caches -Thumbs.db -ehthumbs.db - -# Folder config file -Desktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# ========================= -# Operating System Files -# ========================= - -# OSX -# ========================= - -.DS_Store -.AppleDouble -.LSOverride - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk From 9049a70ff1c7d8cff58f5215688b11fd5eef89fb Mon Sep 17 00:00:00 2001 From: Wasis Haryo Sasoko Date: Mon, 11 Sep 2017 14:45:54 +0800 Subject: [PATCH 04/26] Update --- bootstrap/assets/css/bimasoft.css | 222 ++++++++++++++++ bootstrap/html/layout_default.phtml | 12 +- bootstrap/html/mod_index_dashboard.phtml | 316 +++++++++++++---------- bootstrap/html/mod_support_ticket.phtml | 157 ++++++++--- 4 files changed, 536 insertions(+), 171 deletions(-) diff --git a/bootstrap/assets/css/bimasoft.css b/bootstrap/assets/css/bimasoft.css index 93c0f77..6cccdad 100644 --- a/bootstrap/assets/css/bimasoft.css +++ b/bootstrap/assets/css/bimasoft.css @@ -123,4 +123,226 @@ body { text-decoration: none; background: #006687; color: #fff; +} + +.panel-primary>.panel-heading#replyticket { + background: #d9edf7; + color : #31708f; + font-weight: bold; +} + +.panel.panel-techsupport { + border: 1px solid #CCE4FC; +} + + + +.panel.panel-techsupport .panel-heading { + background: #F2F9FF; +} + +.panel.panel-client { + border: 1px solid #ccc; +} + +.panel.panel-client .panel-heading { + background: #f8f8f8; +} + +#ticketinfo { + font-size: 14px; +} + +#ticketinfo p { + margin : 0; + padding: 8px 15px; +} + +#ticketinfo p:nth-child(even) { + background: #efefef; +} + +#ticket-info-footer { + text-align: center; +} + +#ticket-info-footer .btn { + padding : 5px 15px; +} + +#close-ticket-a { + display: none; +} + +.tiles { + margin : 0 15px 15px 15px; +} + +.tiles .tile { + padding: 12px 20px; + background-color: #f8f8f8; + border-right: 1px solid #ccc; +} + +.tile .icon { + position: absolute; + top: 10px; + right: 10px; + font-size: 48px; + line-height: 1; + color: #ccc; +} + +.tile .stat { + margin-top: 20px; + font-size: 40px; + line-height: 1; +} + +a .stat { + color: #058; +} + +.tile .title { + font-weight: bold; + color: #888; + text-transform: uppercase; + font-size: 12px; +} + +.tiles .tile:hover { + background-color: #eee; + cursor: pointer; +} + +.tiles .tile .highlight { + margin-top: 4px; + height: 2px; + border-radius: 2px; +} + +.bg-color-blue { + background-color: #5bc0de; +} + +.bg-color-green { + background-color: #5cb85c; +} + +.bg-color-red { + background-color: #d9534f; +} + +.bg-color-gold { + background-color: #f0ad4e; +} + +.tiles a:hover, +.tiles a:focus { + color: #157ab5; + text-decoration: none; +} + +.client-home-panels .panel-default>.panel-heading { + background-color: #fff; + border-color: #ddd; + padding: 10px 15px; +} + +.client-home-panels .panel-default>.panel-heading h4 { + color: #333; + font-weight: bold; + font-size: 16px; + margin: 0; +} + +a:hover { + text-decoration: none; +} + +.last-updated { + display: block; + font-size: 12px; + color: #888; + margin-top: 3px; +} + +#dashboard-support .list-group-item { + padding: 5px 10px; +} + +.bg-color-gold { + background: #f0ad4e; +} + +.panel.panel-accent-gold { + border-top: 3px solid #f0ad4e; +} + +.panel.panel-accent-red { + border-top: 3px solid #c71c22; +} + +.panel.panel-accent-blue { + border-top: 3px solid #5bc0de; +} + +.panel.panel-accent-green { + border-top: 3px solid #468847; +} + +.panel.panel-accent-grey { + border-top: 3px solid #999999; +} + +.home-kb-search .form-control { + background-color: #444; + color: #fff; + padding-left: 50px; + width: 100%; + border-radius: 6px !important; + border: 0; + padding: 11px 50px; + height: auto; + margin-bottom: 15px; +} + +.home-kb-search i { + position: absolute; + left: 17px; + color: #777; + top: 14px; + z-index: 20; + font-size: 18px;; +} + +.home-kb-search .input-group { + width: 100%; + position: relative; +} + + +.dash-news a { + font-size: 12px; + text-align: left; +} + +.dash-news a.list-group-item { + padding: 5px 15px; + color: #555; +} + +.footer-btn { + display: block; + width: 100%; + padding: 7px; + color: #fff; + background: #5cb85c; + font-size:12px; + border-radius: 4px; +} + +.footer-btn:hover { + background: #398439; + color: #fff; } \ No newline at end of file diff --git a/bootstrap/html/layout_default.phtml b/bootstrap/html/layout_default.phtml index fb96202..4749505 100644 --- a/bootstrap/html/layout_default.phtml +++ b/bootstrap/html/layout_default.phtml @@ -167,7 +167,7 @@ {% endif %}--> - + {% if profile.first_name %}
  Informasi Anda
@@ -179,14 +179,20 @@
{{ profile.postcode }}
{{ profile.country }}
+
+   Update +
+ {% endif %}
  Shortcuts
Pesan Layanan Baru - Daftarkan Domain Baru - Logout + Pesan Domain + {% if profile.first_name %} + Logout + {% endif %}
diff --git a/bootstrap/html/mod_index_dashboard.phtml b/bootstrap/html/mod_index_dashboard.phtml index 2a295dc..9917d6a 100644 --- a/bootstrap/html/mod_index_dashboard.phtml +++ b/bootstrap/html/mod_index_dashboard.phtml @@ -38,157 +38,205 @@
{% endif %} -
- - {% if settings.dash_services %} -
-
-
-

- {% trans 'Services' %} - {% if client.order_get_list({"expiring":1}).total > 0 %} - {{ client.order_get_list({"expiring":1}).total }} {% trans 'Soon expires' %} - {% endif %} - {% trans 'All services' %} -

-
-
- {% set services = client.order_get_list({"per_page":10, "page":request.page, "hide_addons":1, "status":"active"}) %} - {% for i, service in services.list %} - {{service.title}} #{{ service.id }} - {% endfor %} - {% trans 'New order' %} -
-
-
- {% endif %} +
- {% if settings.dash_support %} -
-
-
-

- {% trans 'Support' %} - {% if client.support_ticket_get_list({"status":'on_hold'}).total > 0 %} - {{ client.support_ticket_get_list({"status":'on_hold'}).total }} {{ mf.status_name("on_hold") }} - {% endif %} - {% trans 'All tickets' %} -

-
-
- {% set tickets_on_hold = client.support_ticket_get_list({"status":'on_hold'}) %} - {% for i, ticket in tickets_on_hold.list %} - {{ticket.subject}} {{ticket.helpdesk.name}} {{ mf.status_name(ticket.status) }} - {% endfor %} - {% set tickets_open = client.support_ticket_get_list({"status":'open'}) %} - {% for i, ticket in tickets_open.list %} - {{ticket.subject}} {{ticket.helpdesk.name}} - {% endfor %} - {% trans 'New ticket' %} +
+
+
+
+ +
+
+ {{ client.order_get_list().total }} +
+
Services
+
+ +
+
+ +
+
0
+
Domains
+
+ +
+
+ +
+
0
+
Tickets
+
+ +
+
+ +
+
+ {{ client.invoice_get_list({"status":"unpaid"}).total }} +
+
Invoices
+
+ +
- {% endif %} - - {% if settings.dash_invoices %} -
-
-
-

- {% trans 'Invoices' %} - {% if client.invoice_get_list({"status":"unpaid"}).total > 0 %} - {{ client.invoice_get_list({"status":"unpaid"}).total }} {% trans 'Unpaid' %} - {% endif %} - {% trans 'All Invoices' %} -

-
-
- {% set unpaid_invoices = client.invoice_get_list({"status":"unpaid", "per_page":10}).list %} - {% for i, invoice in unpaid_invoices %} - - {{ "Invoice #%05s"|format(invoice.id) }} -

{% trans 'Due Date' %}: {{ invoice.due_at|date("d/m/Y") }} - {{ invoice.total | money(invoice.currency) }}

- - {% endfor %} - {% if client.invoice_get_list({"status":"unpaid"}).total > 0 %}{{ client.invoice_get_list({"status":"unpaid"}).total }} {% trans 'Unpaid' %}{% endif %} + +
+ {% if settings.dash_kb and guest.extension_is_on({"mod":'kb'}) %} +
+
+ +
-
+ + {% endif %}
- {% endif %} - - {% if settings.dash_orders %} -
-
-
-

- {% trans 'Recent orders' %} - {% trans 'New order' %} -

-
-
- {% for i, order in client.order_get_list({"per_page":5, "page":request.page, "hide_addons":1}).list %} - - {{ order.title|truncate(30) }} - {{ mf.status_name(order.status) }} - - {% endfor %} + +
+
+ {% if settings.dash_services %} +
+
+
+

+ Your Active Product/Services + {% if client.order_get_list({"expiring":1}).total > 0 %} + {{ client.order_get_list({"expiring":1}).total }} {% trans 'Soon expires' %} + {% endif %} + + View All + +

+
+
+ {% set services = client.order_get_list({"per_page":10, "page":request.page, "hide_addons":1, "status":"active"}) %} + {% for i, service in services.list %} + {{service.title}} #{{ service.id }} + {% endfor %} +
+
+
-
-
- {% endif %} - - {% if settings.dash_messages %} -
-
-
-

- {% trans 'Recent emails' %} - {% trans 'Emails' %} -

+ {% endif %} + + {% if settings.dash_invoices %} +
+
+
+

+ {% trans 'Invoices' %} + {% if client.invoice_get_list({"status":"unpaid"}).total > 0 %} + {{ client.invoice_get_list({"status":"unpaid"}).total }} {% trans 'Unpaid' %} + {% endif %} + {% trans 'All Invoices' %} +

+
+
+ {% set unpaid_invoices = client.invoice_get_list({"status":"unpaid", "per_page":10}).list %} + {% for i, invoice in unpaid_invoices %} + + {{ "Invoice #%05s"|format(invoice.id) }} +

{% trans 'Due Date' %}: {{ invoice.due_at|date("d/m/Y") }} - {{ invoice.total | money(invoice.currency) }}

+ + {% endfor %} +
+
+
-
- {% for i, email in client.email_get_list({"per_page":5}).list %} - - {{email.subject|truncate(30)}} - {{ email.created_at|timeago }} {% trans 'ago' %} - - {% endfor %} + {% endif %} +
+
+
+

+ News +

+
+
+ {% set posts = guest.news_get_list({"page":request.page,"per_page": 5}) %} + {% for i, post in posts.list %} + {{post.title}}
+ {{post.updated_at|date('Y-m-d h:i')}} + {% endfor %} +
+
+
-
+
- {% endif %} - {% if settings.dash_kb and guest.extension_is_on({"mod":'kb'}) %}
-
-
-

- {% trans 'Knowledge Base' %} - {% trans 'Knowledge Base' %} -

+
+ {% if settings.dash_support %} +
+
+
+

+ Recent Support Tickets + + Open New Ticket + +

+
+
+ {% set tickets_on_hold = client.support_ticket_get_list({"status":'on_hold'}) %} + + {% set j = 0 %} + + + {% for i, ticket in tickets_on_hold.list %} + #{{ ticket.id }} - {{ticket.subject}} - {{ticket.helpdesk.name}} AnsweredLast Updated : {{ ticket.updated_at|timeago }} {% trans 'ago' %} + + {% set j = j + 1 %} + + {% endfor %} + + {% set tickets_open = client.support_ticket_get_list({"status":'open'}) %} + {% for i, ticket in tickets_open.list %} + #{{ ticket.id }} - {{ticket.subject}} - {{ticket.helpdesk.name}} OpenLast Updated : {{ ticket.updated_at|timeago }} {% trans 'ago' %} + {% set j = j + 1 %} + {% endfor %} + + + {% set tickets_closed = client.support_ticket_get_list({"status":'closed'}) %} + {% for i, ticket in tickets_closed.list %} + + {% if j<= 4 %} + #{{ ticket.id }} - {{ticket.subject}} - {{ticket.helpdesk.name}} {{ mf.status_name(ticket.status) }}Last Updated : {{ ticket.updated_at|timeago }} {% trans 'ago' %} + {% set j = j + 1 %} + {% endif %} + {% endfor %} +
+
+
-
- -
-
- - - - -
-
- - {% for i, category in guest.kb_category_get_list.list %} - {{category.title}} -
- {% for i, article in category.articles %} - {{article.title}} - {% endfor %} + {% endif %} + + {% if settings.dash_orders %} +
+
+
+

+ {% trans 'Recent orders' %} + {% trans 'New order' %} +

- {% endfor %} +
+ {% for i, order in client.order_get_list({"per_page":5, "page":request.page, "hide_addons":1}).list %} + + {{ order.title|truncate(30) }} + {{ mf.status_name(order.status) }} + + {% endfor %} +
+
+ {% endif %} +
- {% endif %} + {% if settings.dash_new and guest.extension_is_on({"mod":'news'}) %}
diff --git a/bootstrap/html/mod_support_ticket.phtml b/bootstrap/html/mod_support_ticket.phtml index 8ddca9d..eca941f 100644 --- a/bootstrap/html/mod_support_ticket.phtml +++ b/bootstrap/html/mod_support_ticket.phtml @@ -7,7 +7,7 @@
-

{{ ticket.subject }} +

View Ticket - {{ ticket.subject }} {{ticket.helpdesk.name}}

    @@ -19,22 +19,51 @@ {% endblock %} {% block content %} -
      -
    • {% trans 'Status' %}:{{ mf.status_name(ticket.status) }}
      • -
    • {{ticket.created_at|date('Y-m-d h:i')}}
      • - {% if ticket.rel_type == 'order' and ticket.rel_id %}
    • {% trans 'Related to' %}: {% trans 'Service #' %} {{ ticket.rel_id }}
      • {% endif %} -
    -
    -
    + {% if ticket.status != "closed" %} +
    +
    +
      Reply
    +
    +
    +
    +
    + +
    +
    + +
    + Cancel
    +
    +
    +
    + +
    + {% else %} +
    +
    + Ticket ini sudah ditutup. Silakan Submit Ticket Baru Apabila Masih Terdapat Kendala. +

    {{ ticket.updated_at|timeago }} {% trans 'ago' %}

    +
    +
    + {% endif %} +
    {% for i, message in ticket.messages %} -
    -
    -
    - {{ message.author.name }} - {{ message.author.name }} +
    +
    +
    +
    +
    + + + +
     {{ message.author.name }}
    {% if message.author.name != (profile.first_name ~ " " ~ profile.last_name) %}Tech Support{% else %}Client{% endif %}
    +
    +
    {{ message.created_at }} +
    +
    {{ message.content|bbmd }} @@ -42,26 +71,6 @@
    {% endfor %} - {% if ticket.status != "closed" %} -
    -
    -
    -
    - -
    -
    - - -
    -
    - {% else %} -
    -
    - {{ mf.status_name(ticket.status) }} -

    {{ ticket.updated_at|timeago }} {% trans 'ago' %}

    -
    -
    - {% endif %}
    @@ -71,7 +80,87 @@
    {% trans 'Tickets list' %} {% if ticket.status != 'closed' %} - {% trans 'Close ticket' %} + {% trans 'Close ticket' %} {% endif %}
    + + + + + {% endblock %} \ No newline at end of file From 9c1f3bbf676c6b62bcd5c7fb7c9187a886497875 Mon Sep 17 00:00:00 2001 From: Wasis Haryo Sasoko Date: Mon, 11 Sep 2017 17:03:14 +0800 Subject: [PATCH 05/26] Halaman Order - Not Done --- bootstrap/assets/css/bimasoft.css | 27 ++++++++- bootstrap/html/layout_default.phtml | 6 +- bootstrap/html/mod_client_profile.phtml | 28 ++++++--- bootstrap/html/mod_index_dashboard.phtml | 42 +++++++++++-- bootstrap/html/mod_order_index.phtml | 75 ++++++++++++------------ 5 files changed, 122 insertions(+), 56 deletions(-) diff --git a/bootstrap/assets/css/bimasoft.css b/bootstrap/assets/css/bimasoft.css index 6cccdad..2f6d84b 100644 --- a/bootstrap/assets/css/bimasoft.css +++ b/bootstrap/assets/css/bimasoft.css @@ -2,11 +2,12 @@ background: none; border: none; box-shadow: none; - padding-top: 10px; + margin-bottom: 0; + min-height: 0; } body { - padding-top: 0; + padding-top: 10px; } .navbar-inverse .navbar-nav>li>a:hover, .navbar-inverse .navbar-nav>li>a:focus { background: none; @@ -345,4 +346,26 @@ a:hover { .footer-btn:hover { background: #398439; color: #fff; +} + +#my-accounts-panel ul { + list-style: none; + padding: 0; + margin-bottom: 0; +} + +.list-group-item:last-child, .list-group-item:first-child { + border-radius: 0; +} + +#service-all { + display: none; +} + +#company-logo h1 { + margin-top: -20px; +} + +.list-group-item.category-group-item { + border: none; } \ No newline at end of file diff --git a/bootstrap/html/layout_default.phtml b/bootstrap/html/layout_default.phtml index 4749505..f800531 100644 --- a/bootstrap/html/layout_default.phtml +++ b/bootstrap/html/layout_default.phtml @@ -83,7 +83,7 @@ {% endif %} -