From 63cf7e8c3b41d30e400816948a337c8e702536c9 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 21 Apr 2023 19:13:03 +0000 Subject: [PATCH] prepare workflows --- Admin/Install/Admin.install.json | 0 Admin/Install/Admin.php | 0 Admin/Install/Media/lang.php | 0 Admin/Install/Workflow.install.json | 6 ++++-- Admin/Install/db.mysql.sql | 0 Admin/Install/db.psql.sql | 0 Models/Bill.php | 1 - Models/BillElement.php | 4 +--- Models/BillPaymentStatus.php | 0 Models/NullSubscription.php | 0 Models/Subscription.php | 0 Models/SubscriptionMapper.php | 0 12 files changed, 5 insertions(+), 6 deletions(-) mode change 100644 => 100755 Admin/Install/Admin.install.json mode change 100644 => 100755 Admin/Install/Admin.php mode change 100644 => 100755 Admin/Install/Media/lang.php mode change 100644 => 100755 Admin/Install/db.mysql.sql mode change 100644 => 100755 Admin/Install/db.psql.sql mode change 100644 => 100755 Models/BillPaymentStatus.php mode change 100644 => 100755 Models/NullSubscription.php mode change 100644 => 100755 Models/Subscription.php mode change 100644 => 100755 Models/SubscriptionMapper.php diff --git a/Admin/Install/Admin.install.json b/Admin/Install/Admin.install.json old mode 100644 new mode 100755 diff --git a/Admin/Install/Admin.php b/Admin/Install/Admin.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Media/lang.php b/Admin/Install/Media/lang.php old mode 100644 new mode 100755 diff --git a/Admin/Install/Workflow.install.json b/Admin/Install/Workflow.install.json index 37cea90..4a752dd 100755 --- a/Admin/Install/Workflow.install.json +++ b/Admin/Install/Workflow.install.json @@ -35,8 +35,9 @@ "en": "Finds subscriptions", "de": "Findet Abonnements" }, - "function_type": "API", + "function_type": "Api", "function": "apiSubscriptionFind", + "module": "Billing", "inputs": [ "date_start", "date_end", @@ -115,8 +116,9 @@ "en": "Creates invoices for subscriptions", "de": "Erstellt Rechnungen für Abonnements" }, - "function_type": "API", + "function_type": "Api", "function": "apiInvoiceFromSubscriptionCreate", + "module": "Billing", "inputs": [ "subscription[]", "{*}" diff --git a/Admin/Install/db.mysql.sql b/Admin/Install/db.mysql.sql old mode 100644 new mode 100755 diff --git a/Admin/Install/db.psql.sql b/Admin/Install/db.psql.sql old mode 100644 new mode 100755 diff --git a/Models/Bill.php b/Models/Bill.php index d88e80b..6e26a2e 100755 --- a/Models/Bill.php +++ b/Models/Bill.php @@ -16,7 +16,6 @@ namespace Modules\Billing\Models; use Modules\Admin\Models\Account; use Modules\Admin\Models\NullAccount; -use Modules\Billing\Models\Attribute\BillAttribute; use Modules\ClientManagement\Models\Client; use Modules\Editor\Models\EditorDoc; use Modules\Media\Models\Collection; diff --git a/Models/BillElement.php b/Models/BillElement.php index c66d85c..dca2117 100755 --- a/Models/BillElement.php +++ b/Models/BillElement.php @@ -280,9 +280,7 @@ class BillElement implements \JsonSerializable $element->subscription->start = $element->quantity; $element->subscription->end = $element->quantity; $element->subscription->quantity = $element->quantity; - $element->subscription->autoRenew = $item->getAttribute('subscription_renewal_type')->value->getValue() === 1 - ? true - : false; + $element->subscription->autoRenew = $item->getAttribute('subscription_renewal_type')->value->getValue() === 1; } return $element; diff --git a/Models/BillPaymentStatus.php b/Models/BillPaymentStatus.php old mode 100644 new mode 100755 diff --git a/Models/NullSubscription.php b/Models/NullSubscription.php old mode 100644 new mode 100755 diff --git a/Models/Subscription.php b/Models/Subscription.php old mode 100644 new mode 100755 diff --git a/Models/SubscriptionMapper.php b/Models/SubscriptionMapper.php old mode 100644 new mode 100755