Merge branch 'develop' into barcode_settings_hide

2024-09-26 11:27:05 -07:00
parent c9854d43a5 ac6411743b
commit 44447b85c9
946 changed files with 7739 additions and 4396 deletions
@@ -181,7 +181,7 @@ class SettingsController extends Controller
        $settings->brand = 1;
        $settings->locale = $request->input('locale', 'en-US');
        $settings->default_currency = $request->input('default_currency', 'USD');
-        $settings->user_id = 1;
+        $settings->created_by = 1;
        $settings->email_domain = $request->input('email_domain');
        $settings->email_format = $request->input('email_format');
        $settings->next_auto_tag_base = 1;