mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Minor adjustments for bank transaction rules permissions?
This commit is contained in:
parent
c7595b7032
commit
0d6b8140a0
@ -519,7 +519,7 @@ class BaseController extends Controller
|
||||
'company.bank_transaction_rules'=> function ($query) use ($updated_at, $user) {
|
||||
$query->where('updated_at', '>=', $updated_at);
|
||||
|
||||
if (! $user->isAdmin()) {
|
||||
if (! $user->isAdmin() && !$user->hasIntersectPermissions(['create_bank_transaction','edit_bank_transaction','view_bank_transaction'])) {
|
||||
$query->where('bank_transaction_rules.user_id', $user->id);
|
||||
}
|
||||
},
|
||||
@ -627,7 +627,7 @@ class BaseController extends Controller
|
||||
}
|
||||
},
|
||||
'company.bank_transaction_rules'=> function ($query) use ($user) {
|
||||
if (! $user->isAdmin()) {
|
||||
if (! $user->isAdmin() && !$user->hasIntersectPermissions(['create_bank_transaction','edit_bank_transaction','view_bank_transaction'])) {
|
||||
$query->where('bank_transaction_rules.user_id', $user->id);
|
||||
}
|
||||
},
|
||||
|
@ -90,15 +90,10 @@ class RecurringService
|
||||
public function deletePdf()
|
||||
{
|
||||
$this->recurring_entity->invitations->each(function ($invitation) {
|
||||
// (new UnlinkFile(config('filesystems.default'), $this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf'))->handle();
|
||||
|
||||
//30-06-2023
|
||||
try {
|
||||
Storage::disk(config('filesystems.default'))->delete($this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf');
|
||||
// if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
|
||||
// }
|
||||
|
||||
// if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
|
||||
Storage::disk('public')->delete($this->recurring_entity->client->recurring_invoice_filepath($invitation) . $this->recurring_entity->numberFormatter().'.pdf');
|
||||
if (Ninja::isHosted()) {
|
||||
}
|
||||
|
@ -60,6 +60,53 @@ class RecurringInvoiceTest extends TestCase
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function testStartDate()
|
||||
{
|
||||
$line_items = [];
|
||||
|
||||
$item = InvoiceItemFactory::create();
|
||||
$item->quantity = 1;
|
||||
$item->cost = 10;
|
||||
$item->task_id = $this->encodePrimaryKey($this->task->id);
|
||||
$item->expense_id = $this->encodePrimaryKey($this->expense->id);
|
||||
$item->notes = "Hello this is the month of :MONTH";
|
||||
|
||||
$line_items[] = $item;
|
||||
|
||||
|
||||
$data = [
|
||||
'frequency_id' => 1,
|
||||
'status_id' => 1,
|
||||
'discount' => 0,
|
||||
'is_amount_discount' => 1,
|
||||
'po_number' => '3434343',
|
||||
'public_notes' => 'notes',
|
||||
'is_deleted' => 0,
|
||||
'custom_value1' => 0,
|
||||
'custom_value2' => 0,
|
||||
'custom_value3' => 0,
|
||||
'custom_value4' => 0,
|
||||
'status' => 1,
|
||||
'client_id' => $this->encodePrimaryKey($this->client->id),
|
||||
'line_items' => $line_items,
|
||||
'remaining_cycles' => -1,
|
||||
'date' => '0001-01-01',
|
||||
'due_date' => '0001-01-01',
|
||||
];
|
||||
|
||||
$response = $this->withHeaders([
|
||||
'X-API-SECRET' => config('ninja.api_secret'),
|
||||
'X-API-TOKEN' => $this->token,
|
||||
])->post('/api/v1/recurring_invoices/', $data)
|
||||
->assertStatus(200);
|
||||
|
||||
$arr = $response->json();
|
||||
|
||||
$this->assertEquals('0001-01-01', $arr['data']['date']);
|
||||
|
||||
}
|
||||
|
||||
public function testNextSendDateCatch()
|
||||
{
|
||||
$line_items = [];
|
||||
|
Loading…
x
Reference in New Issue
Block a user