Skip to content

Commit

Permalink
Merge pull request #602 from PAWECOGmbH/bugfixes/pt-some-fixes
Browse files Browse the repository at this point in the history 
Bugfixes/pt some fixes
  • Loading branch information
@ptruessel
ptruessel authored Jan 8, 2025
2 parents f18d6f2 + 7cc7255 commit b5b17a5
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 30 deletions.
7 changes: 3 additions & 4 deletions www/backend/core/com/invoices.cfc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,7 @@ component displayname="invoices" output="false" {
local.total_text = "Total";
}

/* try { */

try {


queryExecute(
Expand Down Expand Up @@ -246,12 +245,12 @@ component displayname="invoices" output="false" {
)


/* } catch (any e) {
} catch (any e) {

local.argsReturnValue['message'] = e.message;
return argsReturnValue;

} */
}

// Recalculating
local.recalc = recalculateInvoice(local.invoiceID);
Expand Down
4 changes: 2 additions & 2 deletions www/backend/core/views/navigation.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@
</span>
</a>
<div class="dropdown-menu">
<cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
<cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
<div class="dropdown-divider"></div>
</cfif>
<cfif len(trim(i.moduleData.settingPath))>
Expand Down
4 changes: 2 additions & 2 deletions www/backend/core/views/navigationCombined.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@
</span>
</a>
<div class="dropdown-menu">
<cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
<cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
<div class="dropdown-divider"></div>
</cfif>
<cfif len(trim(i.moduleData.settingPath))>
Expand Down
4 changes: 2 additions & 2 deletions www/backend/core/views/navigationCondensed.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</span>
</a>
<div class="dropdown-menu">
<cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
<cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
<div class="dropdown-divider"></div>
</cfif>
<cfif len(trim(i.moduleData.settingPath))>
Expand Down
4 changes: 2 additions & 2 deletions www/backend/core/views/navigationVertical.cfm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
</span>
</a>
<div class="dropdown-menu">
<cfif fileExists(expandPath('/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/modules/#i.moduleData.table_prefix#/navigation.cfm">
<cfif fileExists(expandPath('backend/modules/#i.moduleData.table_prefix#/navigation.cfm'))>
<cfinclude template="/backend/modules/#i.moduleData.table_prefix#/navigation.cfm">
<div class="dropdown-divider"></div>
</cfif>
<cfif len(trim(i.moduleData.settingPath))>
Expand Down
4 changes: 2 additions & 2 deletions www/frontend/default_theme/templates/forms/login.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<cfoutput>

<div class="container py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card wd-50">
<div class="card">

<div class="card-header">
#getTrans('formSignIn')#
Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/forms/mfa.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container-sm py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card">

Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/forms/password_1.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card">

Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/forms/password_2.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card">

Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/forms/register_1.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card">

Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/forms/register_2.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card">

Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/forms/register_3.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="card">

Expand Down
14 changes: 6 additions & 8 deletions www/frontend/default_theme/templates/plans/box.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

<!--- Set the css class for recommended plan, if there is one --->
<cfset recommClass1 = "">
<cfset recommClass2 = "">
Expand All @@ -7,19 +6,18 @@
<cfset recommClass2 = "text-bg-primary border-primary">
</cfif>


<cfoutput>
<div class="col">
<div class="col d-flex align-items-stretch">

<div class="card mb-4 rounded-3 shadow-sm #recommClass1#">
<div class="card mb-4 rounded-3 shadow-sm #recommClass1# d-flex flex-column">

<div class="card-header py-3 #recommClass2#">
<h4 class="my-0 fw-normal">#i.planName#</h4>
</div>

<div class="card-body">
<div class="card-body d-flex flex-column">

<div class="row align-items-center mb-3">
<div class="row align-items-center mb-3 flex-grow-1">

<!--- Price on request --->
<cfif i.onRequest>
Expand Down Expand Up @@ -59,15 +57,15 @@
</div>

<!--- Longer description with optional check signs --->
<div class="planDescription text-start mb-4">
<div class="planDescription text-start mb-4 flex-grow-1">
#i.description#
</div>

<!--- Button | please keep the class 'bookingButton' --->
<a type="button"
data-monthly="#i.bookingLinkM#"
data-yearly="#i.bookingLinkY#"
class="bookingButton w-100 btn btn-lg btn-outline-primary mb-3">
class="bookingButton w-100 btn btn-lg btn-outline-primary mt-auto mb-3">
#i.dynBookingButtonText#
</a>

Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/plans/plan_boxes.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<cfoutput>
<div class="container py-3">
<main>
<div class="row row-cols-1 row-cols-md-4 mb-3 text-center">
<div class="row row-cols-1 row-cols-sm-2 row-cols-md-3 row-cols-lg-4 mb-3 text-center">

<!--- Include of the boxes --->
<cfloop array="#planData#" index="i">
Expand Down
2 changes: 1 addition & 1 deletion www/frontend/default_theme/templates/plans/toggle.cfm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<cfoutput>

<div class="container-sm py-4 px-3 mx-auto w-25">
<div class="container py-4 px-3 mx-auto my-5" style="max-width: 500px;">

<div class="mb-5">
<div class="btn-group w-100 mt-3" role="group">
Expand Down

0 comments on commit b5b17a5

Please sign in to comment.