viscous/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2026-03-03 02:47:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11529 from turbo124/v5-develop

Browse Source 
v5.12.42
This commit is contained in:
David Bomba
2026-01-02 08:26:00 +11:00
committed by GitHub
parent e53561f3d2 2214acaedd
commit 843290758a
5 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@@ -1 +1 @@
5.12.41
5.12.42

2
app/Services/EDocument/Standards/Validation/Peppol/EntityLevel.php
View File

@@ -271,7 +271,7 @@ class EntityLevel implements EntityLevelInterface
}
//test legal entity id present
if (!is_int($company->legal_entity_id)) {
if(isset($company->legal_entity_id) && intval($company->legal_entity_id) > 0){
$errors[] = ['field' => "You have not registered a legal entity id as yet."];
}

4
config/ninja.php
View File

@@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.12.41'),
'app_tag' => env('APP_TAG', '5.12.41'),
'app_version' => env('APP_VERSION', '5.12.42'),
'app_tag' => env('APP_TAG', '5.12.42'),
'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false),

28
resources/views/portal/ninja2020/plan/trial.blade.php
View File

@@ -1627,7 +1627,7 @@ Ensure the default browser behavior of the `hidden` attribute.
30 day money back guarantee!
</p>
<h3 class="text-[35px] font-bold leading-[1.35em] mb-[36px] text-black">
$12<span class="font-normal text-base ml-[10px] text-gray">Per month</span>
$14<span class="font-normal text-base ml-[10px] text-gray">Per month</span>
</h3>
<button
type="button"
@@ -1669,7 +1669,7 @@ Ensure the default browser behavior of the `hidden` attribute.
30 day money back guarantee!
</p>
<h3 class="text-[35px] font-bold leading-[1.35em] mb-[36px] text-black" id="m_plan_price">
$16<span class="font-normal text-base ml-[10px] text-gray">Per month</span>
$18<span class="font-normal text-base ml-[10px] text-gray">Per month</span>
</h3>
<form
id="plan-form"
@@ -1723,7 +1723,7 @@ Ensure the default browser behavior of the `hidden` attribute.
Pay annually for 10 months + 2 free!
</p>
<h3 class="text-[35px] font-bold leading-[1.35em] mb-[36px] text-black">
$120<span class="font-normal text-base ml-[10px] text-gray">Per year</span>
$140<span class="font-normal text-base ml-[10px] text-gray">Per year</span>
</h3>
<button
type="button"
@@ -1764,7 +1764,7 @@ Ensure the default browser behavior of the `hidden` attribute.
Pay annually for 10 months + 2 free!
</p>
<h3 class="text-[35px] font-bold leading-[1.35em] mb-[36px] text-black" id="y_plan_price">
$160<span class="font-normal text-base ml-[10px] text-gray">Per Year</span>
$180<span class="font-normal text-base ml-[10px] text-gray">Per Year</span>
</h3>
<form
id="plan-form"
@@ -1981,17 +1981,17 @@ document.getElementById('handleProYearlyClick').addEventListener('click', functi
});
const price_map = new Map();
//monthly
price_map.set('7LDdwRb1YK', '$16 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('MVyb8mdvAZ', '$28 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('WpmbkR5azJ', '$36 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('k8mepY2aMy', '$48 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('MVyb8VlevA', '$64 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('7LDdwRb1YK', '$18 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('MVyb8mdvAZ', '$32 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('WpmbkR5azJ', '$54 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('k8mepY2aMy', '$84 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
price_map.set('MVyb8VlevA', '$96 <span class="font-normal text-base ml-[10px] text-gray">Per month</span>');
//yearly
price_map.set('LYqaQWldnj', '$160 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('kQBeX6mbyK', '$280 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('GELe32Qd69', '$360 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('MVyb86oevA', '$480 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('VWPe9WPbLy', '$640 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('LYqaQWldnj', '$180 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('kQBeX6mbyK', '$320 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('GELe32Qd69', '$540 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('MVyb86oevA', '$840 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
price_map.set('VWPe9WPbLy', '$960 <span class="font-normal text-base ml-[10px] text-gray">Per year</span>');
</script>

22
resources/views/portal/ninja2020/subscriptions/ninja_plan.blade.php
View File

@@ -56,7 +56,7 @@ input:checked ~ .dot {
Pro Plan
</h3>
<p class="text-5xl font-bold text-center text-white">
$12
$14
</p>
<p class="text-xs text-center uppercase text-white">
monthly
@@ -95,7 +95,7 @@ input:checked ~ .dot {
Enterprise Plan
</h3>
<p class="text-5xl font-bold text-center text-white" id="m_plan_price">
$14
$18
</p>
<p class="text-xs text-center uppercase text-white">
monthly
@@ -139,7 +139,7 @@ input:checked ~ .dot {
Pro Plan
</h3>
<p class="text-5xl font-bold text-center text-white">
$120
$140
</p>
<p class="text-xs text-center uppercase text-white">
yearly
@@ -275,15 +275,15 @@ document.getElementById('handleProYearlyClick').addEventListener('click', functi
});
const price_map = new Map();
//monthly
price_map.set('7LDdwRb1YK', '$14');
price_map.set('MVyb8mdvAZ', '$26');
price_map.set('WpmbkR5azJ', '$36');
price_map.set('k8mepY2aMy', '$44');
price_map.set('7LDdwRb1YK', '$16');
price_map.set('MVyb8mdvAZ', '$32');
price_map.set('WpmbkR5azJ', '$54');
price_map.set('k8mepY2aMy', '$84');
//yearly
price_map.set('LYqaQWldnj', '$140');
price_map.set('kQBeX6mbyK', '$260');
price_map.set('GELe32Qd69', '$360');
price_map.set('MVyb86oevA', '$440');
price_map.set('LYqaQWldnj', '$160');
price_map.set('kQBeX6mbyK', '$320');
price_map.set('GELe32Qd69', '$540');
price_map.set('MVyb86oevA', '$840');
</script>