fix conflicts

code4romania · Jun 20, 2023 · ee5e4d7 · ee5e4d7
1 parent 80b5320
commit ee5e4d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php
@@ -71,6 +71,7 @@ public function store(RegistrationRequest $request): RedirectResponse
             $adminUsers = User::whereRole(UserRole::bb_admin)->get();
             Notification::send($adminUsers, new OrganizationCreatedAdmin($organization));
             $user->organization_id = $organization->id;
+            $user->save();
             return redirect(RouteServiceProvider::ONG);
 
         }

diff --git a/resources/js/Pages/AdminOng/Ong/EditOng.vue b/resources/js/Pages/AdminOng/Ong/EditOng.vue
@@ -124,7 +124,7 @@
                         <!-- Edit activity domains -->
                         <div class="bg-gray-100 px-4 py-6 grid grid-cols-12">
                             <dt class="col-span-12 md:col-span-5 text-base font-medium leading-6 text-gray-700">{{ $t('organization_activity_label') }}</dt>
-                            <dt class="col-span-12 md:col-span-6 text-base font-medium leading-6 text-gray-700">{{ form.activity_domains.map(item=>item.name).join(', ') }}</dt>
+                            <dt class="col-span-12 md:col-span-6 text-base font-medium leading-6 text-gray-700">{{ form.activity_domains.join(', ') }}</dt>
                             <EditModal
                                 @action="editField"
                                 class="col-span-1 flex justify-end"
@@ -304,7 +304,7 @@
                         <!-- Edit organizaton address -->
                         <div class="bg-gray-100 px-4 py-6 grid grid-cols-12">
                             <dt class="col-span-12 md:col-span-5 text-base font-medium leading-6 text-gray-700">{{ $t('organization_address_label') }}</dt>
-                            <dt class="col-span-12 md:col-span-6 text-base font-medium leading-6 text-gray-700">{{ form.street_address }}, {{ form.counties.map(item=>item.name).join(', ')}} </dt>
+                            <dt class="col-span-12 md:col-span-6 text-base font-medium leading-6 text-gray-700">{{ form.street_address }}, {{ form.counties?.map(item=>item.name).join(', ')}} </dt>
                             <EditModal
                                 @action="editField"
                                 class="col-span-1 flex justify-end"

diff --git a/resources/js/Pages/Auth/Register.vue b/resources/js/Pages/Auth/Register.vue
@@ -134,13 +134,16 @@ const google = () => {
 
 /** Create user. */
 const submit = () => {
-    console.log(form)
+    if (form.type==='donor')
+    {
+        delete form.ong;
+    }
     form.post(route('register'), {
         onError: (error) => {
 
         },
         onSuccess: (data) => {
-            current.value = steps.value.length - 1
+            // current.value = steps.value.length - 1
         },
         onFinish: () => {
         }