@@ -29,7 +29,7 @@ |
||
29 | 29 | $paymentMethod = $request->payment_method; |
30 | 30 | |
31 | 31 | $subscription = $user->newSubscription('default', $plan_id) |
32 | - ->trialDays(14); |
|
32 | + ->trialDays(14); |
|
33 | 33 | |
34 | 34 | if ($couponId = $request->input('coupon_id')) { |
35 | 35 | $subscription->withCoupon($couponId); |
@@ -19,7 +19,7 @@ |
||
19 | 19 | $user = auth()->user(); |
20 | 20 | |
21 | 21 | try { |
22 | - $user->createAsStripeCustomer(); |
|
22 | + $user->createAsStripeCustomer(); |
|
23 | 23 | } catch(\Exception $e) { |
24 | 24 | } |
25 | 25 |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | } |
347 | 347 | if(! $user->isAdmin()){ |
348 | 348 | |
349 | - $tenants = Tenant::find($main_company->id); |
|
349 | + $tenants = Tenant::find($main_company->id); |
|
350 | 350 | } |
351 | 351 | if ($user->isAdmin()) { |
352 | 352 | $tenants = null; |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | if ($main_company === null && ! $user->isAdmin()) { |
355 | 355 | // if (($main_company == null||$tenants=='') && ! $user->isAdmin()) { |
356 | 356 | // if ($main_company == null) { |
357 | - $this->create_company($user); |
|
357 | + $this->create_company($user); |
|
358 | 358 | } else { |
359 | 359 | if ($tenants && ! $user->isAdmin()) { |
360 | 360 | // $c = DB::connection('tenantdb',$tenants->tenancy_db_name)->table('users')->count(); |
@@ -20,14 +20,14 @@ |
||
20 | 20 | public function create() |
21 | 21 | { |
22 | 22 | return $this->form |
23 | - // ->options('type_id', Type::all()) |
|
23 | + // ->options('type_id', Type::all()) |
|
24 | 24 | ->create(); |
25 | 25 | } |
26 | 26 | |
27 | 27 | public function edit(Note $note) |
28 | 28 | { |
29 | 29 | return $this->form |
30 | - // ->options('type_id', Type::all()) |
|
30 | + // ->options('type_id', Type::all()) |
|
31 | 31 | ->edit($note); |
32 | 32 | } |
33 | 33 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | public function edit(Repository $repository) |
28 | 28 | { |
29 | 29 | return $this->form |
30 | - // ->options('type_id', Type::all()) |
|
30 | + // ->options('type_id', Type::all()) |
|
31 | 31 | ->edit($repository); |
32 | 32 | } |
33 | 33 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | return $this->form |
24 | 24 | ->options('husband_id', Person::all()) |
25 | 25 | ->options('wife_id', Person::all()) |
26 | - // ->options('type_id', Type::all()) |
|
26 | + // ->options('type_id', Type::all()) |
|
27 | 27 | ->options('child_id', Person::all()) |
28 | 28 | ->create(); |
29 | 29 | } |
@@ -34,8 +34,8 @@ discard block |
||
34 | 34 | ->options('husband_id', Person::all()) |
35 | 35 | ->options('wife_id', Person::all()) |
36 | 36 | ->append('family_id', $family->id) |
37 | - ->value('child_id', $family->children) |
|
38 | - ->options('child_id', Person::all()) |
|
37 | + ->value('child_id', $family->children) |
|
38 | + ->options('child_id', Person::all()) |
|
39 | 39 | ->edit($family); |
40 | 40 | } |
41 | 41 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | public function create() |
24 | 24 | { |
25 | 25 | return $this->form |
26 | - // ->options('type_id', Type::all()) |
|
26 | + // ->options('type_id', Type::all()) |
|
27 | 27 | ->options('author_id', Author::all()) |
28 | 28 | ->options('publication_id', Publication::all()) |
29 | 29 | ->options('repository_id', Repository::all()) |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | public function edit(Source $source) |
34 | 34 | { |
35 | 35 | return $this->form |
36 | - // ->options('type_id', Type::all()) |
|
36 | + // ->options('type_id', Type::all()) |
|
37 | 37 | ->options('author_id', Author::all()) |
38 | 38 | ->options('publication_id', Publication::all()) |
39 | 39 | ->options('repository_id', Repository::all()) |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | $result = exec('python3 dna.py '.$this->var_name.' '.$dna->variable_name.' '.$this->file_name.' '.$dna->file_name); |
53 | 53 | // $resultData = json_decode($result, true, 512, JSON_THROW_ON_ERROR); |
54 | 54 | $resultData = json_decode($result, true); |
55 | - // chmod(storage_path('/app/public/dna/output/shared_dna_'.$this->var_name.'_'.$dna->variable_name.'_'.$this->file_name.'_'.$dna->file_name), 0777); |
|
55 | + // chmod(storage_path('/app/public/dna/output/shared_dna_'.$this->var_name.'_'.$dna->variable_name.'_'.$this->file_name.'_'.$dna->file_name), 0777); |
|
56 | 56 | |
57 | 57 | $dm = new DM(); |
58 | 58 | $dm->user_id = $user->id; |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | // $dm->image = 'shared_dna_'.$this->var_name.'_'.$dna->variable_name.'.png'; |
64 | 64 | // $dm->image = 'shared_dna_'.$this->var_name.'_'.$dna->variable_name.'_0p75cM_1100snps_GRCh37_HapMap2.png'; |
65 | 65 | $dm->image = env('APP_URL').'/storage/dna/output/shared_dna_'.$this->var_name.'_'. |
66 | - $dna->variable_name.'_0p75cM_1100snps_GRCh37_HapMap2.png'; |
|
66 | + $dna->variable_name.'_0p75cM_1100snps_GRCh37_HapMap2.png'; |
|
67 | 67 | // $dm->file1 = 'discordant_snps_'.$this->var_name.'_'.$dna->variable_name.'_GRCh37.csv'; |
68 | 68 | $dm->file1 = 'discordant_snps_'.$this->var_name.'_'.$dna->variable_name.'_GRCh37.csv'; |
69 | 69 | // $dm->file2 = 'shared_dna_one_chrom_'.$this->var_name.'_'.$dna->variable_name.'_GRCh37.csv'; |
@@ -68,7 +68,7 @@ |
||
68 | 68 | // Log::info("content from getGedcomPerson function => \n $content"); |
69 | 69 | // var_dump(\Storage::disk('public')->path($this->file), "job"); |
70 | 70 | $manager->storage()->put($this->file, $content); |
71 | - // $filePath = 'public/' . $this->file; |
|
71 | + // $filePath = 'public/' . $this->file; |
|
72 | 72 | // $filePath = $manager->storage()->path($filePath); |
73 | 73 | // chmod_r('/home/genealogia/domains/api.genealogia.co.uk/genealogy/storage/tenants/'); |
74 | 74 | exec("chmod -R 0777 ". storage_path('/tenants/')); |