From af381d8e7a48225468d61f7044910290cf39128e Mon Sep 17 00:00:00 2001
From: merve karaman <107546467+mervekaraman@users.noreply.github.com>
Date: Thu, 24 Aug 2023 10:36:27 +0300
Subject: [PATCH 1/2] Loading color fixed
---
resources/assets/js/views/wizard/Finish.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/resources/assets/js/views/wizard/Finish.vue b/resources/assets/js/views/wizard/Finish.vue
index cb75fec9a..feed8dd27 100644
--- a/resources/assets/js/views/wizard/Finish.vue
+++ b/resources/assets/js/views/wizard/Finish.vue
@@ -54,7 +54,7 @@
@click="finish()"
style="top: 5.9rem"
>
-
+
{{ translations.company.skip }}
@@ -67,7 +67,7 @@
@click="finish()"
style="top: 5.9rem;"
>
-
+
{{ translations.finish.create_first_invoice }}
From bddab363800a226f99ebaa107b4c94f1dbdb691c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?=
<53110792+CihanSenturk@users.noreply.github.com>
Date: Thu, 24 Aug 2023 11:51:30 +0300
Subject: [PATCH 2/2] added relationship to app history model
---
app/Models/Module/ModuleHistory.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/app/Models/Module/ModuleHistory.php b/app/Models/Module/ModuleHistory.php
index 124593a5b..9cefc835c 100644
--- a/app/Models/Module/ModuleHistory.php
+++ b/app/Models/Module/ModuleHistory.php
@@ -14,4 +14,9 @@ class ModuleHistory extends Model
* @var array
*/
protected $fillable = ['company_id', 'module_id', 'version', 'description', 'created_from', 'created_by'];
+
+ public function module()
+ {
+ return $this->belongsTo('App\Models\Module\Module');
+ }
}