mirror of
				https://github.com/invoiceninja/invoiceninja.git
				synced 2025-11-03 23:27:31 -05:00 
			
		
		
		
	updates for cookie consent
This commit is contained in:
		
							parent
							
								
									b0933f7468
								
							
						
					
					
						commit
						ae73e414e9
					
				@ -167,7 +167,7 @@ class InvoiceFilters extends QueryFilters
 | 
				
			|||||||
                ->orderBy('due_date', 'ASC');
 | 
					                ->orderBy('due_date', 'ASC');
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public function payable(string $client_id)
 | 
					    public function payable(string $client_id = '')
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        if (strlen($client_id) == 0) {
 | 
					        if (strlen($client_id) == 0) {
 | 
				
			||||||
            return $this->builder;
 | 
					            return $this->builder;
 | 
				
			||||||
 | 
				
			|||||||
@ -108,9 +108,9 @@
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    "content": {
 | 
					                    "content": {
 | 
				
			||||||
                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
					                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
				
			||||||
                        "message": "This website uses cookies to ensure you get the best experience on our website.",
 | 
					                        "message": "{{ ctrans('texts.cookie_message')}}",
 | 
				
			||||||
                        "dismiss": "Got it!",
 | 
					                        "dismiss": "{{ ctrans('texts.got_it')}}",
 | 
				
			||||||
                        "link": "Learn more",
 | 
					                        "link": "{{ ctrans('texts.learn_more')}}",
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                })}
 | 
					                })}
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
				
			|||||||
@ -125,9 +125,9 @@
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    "content": {
 | 
					                    "content": {
 | 
				
			||||||
                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
					                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
				
			||||||
                        "message": "This website uses cookies to ensure you get the best experience on our website.",
 | 
					                        "message": "{{ ctrans('texts.cookie_message')}}",
 | 
				
			||||||
                        "dismiss": "Got it!",
 | 
					                        "dismiss": "{{ ctrans('texts.got_it')}}",
 | 
				
			||||||
                        "link": "Learn more",
 | 
					                        "link": "{{ ctrans('texts.learn_more')}}",
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                })}
 | 
					                })}
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
				
			|||||||
@ -110,9 +110,9 @@
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    "content": {
 | 
					                    "content": {
 | 
				
			||||||
                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
					                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
				
			||||||
                        "message": "This website uses cookies to ensure you get the best experience on our website.",
 | 
					                        "message": "{{ ctrans('texts.cookie_message')}}",
 | 
				
			||||||
                        "dismiss": "Got it!",
 | 
					                        "dismiss": "{{ ctrans('texts.got_it')}}",
 | 
				
			||||||
                        "link": "Learn more",
 | 
					                        "link": "{{ ctrans('texts.learn_more')}}",
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                })}
 | 
					                })}
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
				
			|||||||
@ -119,9 +119,9 @@
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    "content": {
 | 
					                    "content": {
 | 
				
			||||||
                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
					                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
				
			||||||
                        "message": "This website uses cookies to ensure you get the best experience on our website.",
 | 
					                        "message": "{{ ctrans('texts.cookie_message')}}",
 | 
				
			||||||
                        "dismiss": "Got it!",
 | 
					                        "dismiss": "{{ ctrans('texts.got_it')}}",
 | 
				
			||||||
                        "link": "Learn more",
 | 
					                        "link": "{{ ctrans('texts.learn_more')}}",
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                })}
 | 
					                })}
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
				
			|||||||
@ -126,9 +126,9 @@
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    "content": {
 | 
					                    "content": {
 | 
				
			||||||
                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
					                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
				
			||||||
                        "message": "This website uses cookies to ensure you get the best experience on our website.",
 | 
					                        "message": "{{ ctrans('texts.cookie_message')}}",
 | 
				
			||||||
                        "dismiss": "Got it!",
 | 
					                        "dismiss": "{{ ctrans('texts.got_it')}}",
 | 
				
			||||||
                        "link": "Learn more",
 | 
					                        "link": "{{ ctrans('texts.learn_more')}}",
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                })}
 | 
					                })}
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
				
			|||||||
@ -108,9 +108,9 @@
 | 
				
			|||||||
                    },
 | 
					                    },
 | 
				
			||||||
                    "content": {
 | 
					                    "content": {
 | 
				
			||||||
                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
					                        "href": "{{ config('ninja.privacy_policy_url.hosted') }}",
 | 
				
			||||||
                        "message": "This website uses cookies to ensure you get the best experience on our website.",
 | 
					                        "message": "{{ ctrans('texts.cookie_message')}}",
 | 
				
			||||||
                        "dismiss": "Got it!",
 | 
					                        "dismiss": "{{ ctrans('texts.got_it')}}",
 | 
				
			||||||
                        "link": "Learn more",
 | 
					                        "link": "{{ ctrans('texts.learn_more')}}",
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                })}
 | 
					                })}
 | 
				
			||||||
            );
 | 
					            );
 | 
				
			||||||
 | 
				
			|||||||
@ -186,7 +186,7 @@ Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale
 | 
				
			|||||||
    Route::put('expenses/{expense}/upload', [ExpenseController::class, 'upload']);
 | 
					    Route::put('expenses/{expense}/upload', [ExpenseController::class, 'upload']);
 | 
				
			||||||
    Route::post('expenses/bulk', [ExpenseController::class, 'bulk'])->name('expenses.bulk');
 | 
					    Route::post('expenses/bulk', [ExpenseController::class, 'bulk'])->name('expenses.bulk');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Route::post('export', [ExportController::class, 'index'])->middleware('throttle:2,1')->name('export.index');
 | 
					    Route::post('export', [ExportController::class, 'index'])->name('export.index');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Route::resource('expense_categories', ExpenseCategoryController::class); // name = (expense_categories. index / create / show / update / destroy / edit
 | 
					    Route::resource('expense_categories', ExpenseCategoryController::class); // name = (expense_categories. index / create / show / update / destroy / edit
 | 
				
			||||||
    Route::post('expense_categories/bulk', [ExpenseCategoryController::class, 'bulk'])->name('expense_categories.bulk');
 | 
					    Route::post('expense_categories/bulk', [ExpenseCategoryController::class, 'bulk'])->name('expense_categories.bulk');
 | 
				
			||||||
@ -196,7 +196,7 @@ Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale
 | 
				
			|||||||
    Route::put('group_settings/{group_setting}/upload', [GroupSettingController::class, 'upload'])->name('group_settings.upload');
 | 
					    Route::put('group_settings/{group_setting}/upload', [GroupSettingController::class, 'upload'])->name('group_settings.upload');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Route::post('import', [ImportController::class, 'import'])->name('import.import');
 | 
					    Route::post('import', [ImportController::class, 'import'])->name('import.import');
 | 
				
			||||||
    Route::post('import_json', [ImportJsonController::class, 'import'])->middleware('throttle:2,1')->name('import.import_json');
 | 
					    Route::post('import_json', [ImportJsonController::class, 'import'])->name('import.import_json');
 | 
				
			||||||
    Route::post('preimport', [ImportController::class, 'preimport'])->name('import.preimport');
 | 
					    Route::post('preimport', [ImportController::class, 'preimport'])->name('import.preimport');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Route::resource('invoices', InvoiceController::class); // name = (invoices. index / create / show / update / destroy / edit
 | 
					    Route::resource('invoices', InvoiceController::class); // name = (invoices. index / create / show / update / destroy / edit
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user