From 957ac9f5d8a940671e9e3cbe86ad61b51f47cc3f Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 7 Jan 2020 11:13:47 +1100 Subject: [PATCH] Fix for password protected authorization (#3198) * Remove unnecessary save() on invoice * Update copyright * Working on Credit Repository * Implement credits as a paymentable entity * Add credit_id to transformer * fix rules for update payment * Fix random deleted_at keys in transformers * Fix for password_protect check --- app/Console/Kernel.php | 2 +- app/DataMapper/BaseSettings.php | 2 +- app/DataMapper/ClientSettings.php | 2 +- app/DataMapper/CompanySettings.php | 2 +- app/DataMapper/DefaultSettings.php | 2 +- app/DataMapper/EmailTemplateDefaults.php | 2 +- app/DataMapper/FeesAndLimits.php | 2 +- app/DataMapper/InvoiceItem.php | 2 +- app/DataMapper/PaymentMethodMeta.php | 2 +- app/DataMapper/PaymentTransaction.php | 2 +- app/Events/Account/AccountCreated.php | 2 +- app/Events/Client/ClientWasArchived.php | 2 +- app/Events/Client/ClientWasCreated.php | 2 +- app/Events/Client/ClientWasDeleted.php | 2 +- app/Events/Client/ClientWasRestored.php | 2 +- app/Events/Client/ClientWasUpdated.php | 2 +- app/Events/Contact/ContactLoggedIn.php | 2 +- app/Events/Expense/ExpenseWasArchived.php | 2 +- app/Events/Expense/ExpenseWasCreated.php | 2 +- app/Events/Expense/ExpenseWasDeleted.php | 2 +- app/Events/Expense/ExpenseWasRestored.php | 2 +- app/Events/Expense/ExpenseWasUpdated.php | 2 +- app/Events/Invoice/InvoiceWasArchived.php | 2 +- app/Events/Invoice/InvoiceWasCreated.php | 2 +- app/Events/Invoice/InvoiceWasDeleted.php | 2 +- app/Events/Invoice/InvoiceWasEmailed.php | 2 +- .../Invoice/InvoiceWasEmailedAndFailed.php | 2 +- app/Events/Invoice/InvoiceWasMarkedSent.php | 2 +- app/Events/Invoice/InvoiceWasPaid.php | 2 +- app/Events/Invoice/InvoiceWasRestored.php | 2 +- app/Events/Invoice/InvoiceWasUpdated.php | 2 +- app/Events/Payment/PaymentCompleted.php | 2 +- app/Events/Payment/PaymentFailed.php | 2 +- app/Events/Payment/PaymentWasArchived.php | 2 +- app/Events/Payment/PaymentWasCreated.php | 2 +- app/Events/Payment/PaymentWasDeleted.php | 2 +- app/Events/Payment/PaymentWasRefunded.php | 2 +- app/Events/Payment/PaymentWasRestored.php | 2 +- app/Events/Payment/PaymentWasVoided.php | 2 +- app/Events/Product/ProductWasCreated.php | 2 +- app/Events/Product/ProductWasDeleted.php | 2 +- app/Events/Product/ProductWasUpdated.php | 2 +- app/Events/Quote/QuoteWasArchived.php | 2 +- app/Events/Quote/QuoteWasCreated.php | 2 +- app/Events/Quote/QuoteWasDeleted.php | 2 +- app/Events/Quote/QuoteWasEmailed.php | 2 +- app/Events/Quote/QuoteWasRestored.php | 2 +- app/Events/Quote/QuoteWasUpdated.php | 2 +- app/Events/Task/TaskWasArchived.php | 2 +- app/Events/Task/TaskWasCreated.php | 2 +- app/Events/Task/TaskWasDeleted.php | 2 +- app/Events/Task/TaskWasRestored.php | 2 +- app/Events/Task/TaskWasUpdated.php | 2 +- app/Events/User/UserLoggedIn.php | 2 +- app/Events/User/UserWasArchived.php | 2 +- app/Events/User/UserWasCreated.php | 2 +- app/Events/User/UserWasDeleted.php | 2 +- app/Events/User/UserWasRestored.php | 2 +- app/Events/User/UserWasUpdated.php | 2 +- app/Events/Vendor/VendorWasArchived.php | 2 +- app/Events/Vendor/VendorWasCreated.php | 2 +- app/Events/Vendor/VendorWasDeleted.php | 2 +- app/Events/Vendor/VendorWasRestored.php | 2 +- app/Events/Vendor/VendorWasUpdated.php | 2 +- app/Exceptions/Handler.php | 2 +- app/Factory/ClientContactFactory.php | 2 +- app/Factory/ClientFactory.php | 2 +- app/Factory/CloneInvoiceFactory.php | 2 +- app/Factory/CloneInvoiceToQuoteFactory.php | 2 +- app/Factory/CompanyFactory.php | 2 +- app/Factory/CompanyGatewayFactory.php | 2 +- app/Factory/CompanyLedgerFactory.php | 2 +- app/Factory/CompanyUserFactory.php | 2 +- app/Factory/CreditFactory.php | 2 +- app/Factory/CreditInvitationFactory.php | 38 ++++++ app/Factory/GroupSettingFactory.php | 2 +- app/Factory/InvoiceFactory.php | 2 +- app/Factory/InvoiceInvitationFactory.php | 2 +- app/Factory/InvoiceItemFactory.php | 2 +- .../InvoiceToRecurringInvoiceFactory.php | 2 +- app/Factory/PaymentFactory.php | 2 +- app/Factory/ProductFactory.php | 2 +- app/Factory/QuoteFactory.php | 2 +- app/Factory/QuoteInvitationFactory.php | 2 +- app/Factory/RecurringInvoiceFactory.php | 2 +- .../RecurringInvoiceToInvoiceFactory.php | 2 +- app/Factory/RecurringQuoteFactory.php | 2 +- app/Factory/TaxRateFactory.php | 2 +- app/Factory/UserFactory.php | 2 +- app/Filters/ClientFilters.php | 2 +- app/Filters/InvoiceFilters.php | 2 +- app/Filters/PaymentFilters.php | 2 +- app/Filters/ProductFilters.php | 2 +- app/Filters/QueryFilters.php | 2 +- app/Filters/QuoteFilters.php | 2 +- app/Filters/RecurringInvoiceFilters.php | 2 +- app/Filters/RecurringQuoteFilters.php | 2 +- app/Filters/UserFilters.php | 2 +- app/Helpers/Invoice/Balancer.php | 2 +- app/Helpers/Invoice/CustomValuer.php | 2 +- app/Helpers/Invoice/Discounter.php | 2 +- app/Helpers/Invoice/InvoiceItemSum.php | 2 +- .../Invoice/InvoiceItemSumInclusive.php | 2 +- app/Helpers/Invoice/InvoiceSum.php | 2 +- app/Helpers/Invoice/InvoiceSumInclusive.php | 2 +- app/Helpers/Invoice/Taxer.php | 2 +- app/Helpers/Mail/GmailTransport.php | 2 +- app/Helpers/Mail/GmailTransportConfig.php | 2 +- app/Helpers/TranslationHelper.php | 2 +- app/Http/Controllers/AccountController.php | 2 +- app/Http/Controllers/ActivityController.php | 2 +- .../Auth/ContactForgotPasswordController.php | 2 +- .../Auth/ContactLoginController.php | 2 +- .../Auth/ContactResetPasswordController.php | 2 +- .../Auth/ForgotPasswordController.php | 2 +- app/Http/Controllers/Auth/LoginController.php | 2 +- .../Controllers/Auth/RegisterController.php | 2 +- .../Auth/ResetPasswordController.php | 2 +- .../Auth/VerificationController.php | 2 +- app/Http/Controllers/BaseController.php | 8 +- app/Http/Controllers/ClientController.php | 2 +- .../ClientPortal/DashboardController.php | 2 +- .../ClientPortal/DocumentController.php | 2 +- .../ClientPortal/InvitationController.php | 2 +- .../ClientPortal/InvoiceController.php | 2 +- .../ClientPortal/PaymentController.php | 2 +- .../ClientPortal/PaymentHookController.php | 2 +- .../ClientPortal/PaymentMethodController.php | 2 +- .../ClientPortal/ProfileController.php | 2 +- .../RecurringInvoiceController.php | 2 +- .../Controllers/ClientStatementController.php | 2 +- app/Http/Controllers/CompanyController.php | 2 +- .../Controllers/CompanyGatewayController.php | 2 +- .../Controllers/Contact/InvoiceController.php | 2 +- .../Controllers/Contact/LoginController.php | 2 +- app/Http/Controllers/Controller.php | 2 +- app/Http/Controllers/DashboardController.php | 2 +- .../Controllers/GroupSettingController.php | 2 +- app/Http/Controllers/InvoiceController.php | 2 +- app/Http/Controllers/MigrationController.php | 2 +- app/Http/Controllers/PaymentController.php | 2 +- app/Http/Controllers/ProductController.php | 2 +- app/Http/Controllers/QuoteController.php | 2 +- .../RecurringInvoiceController.php | 2 +- .../Controllers/RecurringQuoteController.php | 2 +- app/Http/Controllers/SettingsController.php | 2 +- app/Http/Controllers/TaxRateController.php | 2 +- app/Http/Controllers/TemplateController.php | 2 +- .../Controllers/Traits/VerifiesUserEmail.php | 2 +- .../Controllers/TranslationController.php | 2 +- app/Http/Controllers/UserController.php | 2 +- .../Controllers/UserProfileController.php | 2 +- app/Http/Kernel.php | 2 +- app/Http/Middleware/ApiSecretCheck.php | 2 +- app/Http/Middleware/Authenticate.php | 2 +- .../Middleware/CheckForMaintenanceMode.php | 2 +- app/Http/Middleware/ClientPortalEnabled.php | 2 +- app/Http/Middleware/ContactSetDb.php | 2 +- app/Http/Middleware/ContactTokenAuth.php | 2 +- app/Http/Middleware/EncryptCookies.php | 2 +- app/Http/Middleware/PasswordProtection.php | 4 +- app/Http/Middleware/QueryLogging.php | 2 +- .../Middleware/RedirectIfAuthenticated.php | 2 +- app/Http/Middleware/SetDb.php | 2 +- app/Http/Middleware/SetDomainNameDb.php | 2 +- app/Http/Middleware/SetEmailDb.php | 2 +- app/Http/Middleware/SetInviteDb.php | 2 +- app/Http/Middleware/StartupCheck.php | 2 +- app/Http/Middleware/TokenAuth.php | 2 +- app/Http/Middleware/TrimStrings.php | 2 +- app/Http/Middleware/TrustProxies.php | 2 +- app/Http/Middleware/UrlSetDb.php | 2 +- app/Http/Middleware/VerifyCsrfToken.php | 2 +- .../Requests/Account/CreateAccountRequest.php | 2 +- .../Requests/Activity/ShowActivityRequest.php | 2 +- .../Requests/Client/CreateClientRequest.php | 2 +- .../Requests/Client/DestroyClientRequest.php | 2 +- .../Requests/Client/EditClientRequest.php | 2 +- .../Requests/Client/ShowClientRequest.php | 2 +- .../Requests/Client/StoreClientRequest.php | 2 +- .../Requests/Client/UpdateClientRequest.php | 2 +- .../ClientPortal/ShowInvoiceRequest.php | 2 +- .../ShowRecurringInvoiceRequest.php | 2 +- .../ClientPortal/StoreDocumentRequest.php | 2 +- .../ClientPortal/UpdateClientRequest.php | 2 +- .../ClientPortal/UpdateContactRequest.php | 2 +- .../Requests/Company/CreateCompanyRequest.php | 2 +- .../Company/DestroyCompanyRequest.php | 2 +- .../Requests/Company/EditCompanyRequest.php | 2 +- .../Requests/Company/ShowCompanyRequest.php | 2 +- .../Requests/Company/StoreCompanyRequest.php | 2 +- .../Requests/Company/UpdateCompanyRequest.php | 2 +- .../CreateCompanyGatewayRequest.php | 2 +- .../DestroyCompanyGatewayRequest.php | 2 +- .../EditCompanyGatewayRequest.php | 2 +- .../ShowCompanyGatewayRequest.php | 2 +- .../StoreCompanyGatewayRequest.php | 2 +- .../UpdateCompanyGatewayRequest.php | 2 +- .../CreateGroupSettingRequest.php | 2 +- .../DestroyGroupSettingRequest.php | 2 +- .../GroupSetting/EditGroupSettingRequest.php | 2 +- .../GroupSetting/ShowGroupSettingRequest.php | 2 +- .../GroupSetting/StoreGroupSettingRequest.php | 2 +- .../UpdateGroupSettingRequest.php | 2 +- .../Requests/Invoice/ActionInvoiceRequest.php | 2 +- .../Requests/Invoice/CreateInvoiceRequest.php | 2 +- .../Invoice/DestroyInvoiceRequest.php | 2 +- .../Requests/Invoice/EditInvoiceRequest.php | 2 +- .../Requests/Invoice/ShowInvoiceRequest.php | 2 +- .../Requests/Invoice/StoreInvoiceRequest.php | 2 +- .../Requests/Invoice/UpdateInvoiceRequest.php | 2 +- .../Requests/Payment/ActionPaymentRequest.php | 2 +- .../Requests/Payment/CreatePaymentRequest.php | 2 +- .../Payment/DestroyPaymentRequest.php | 2 +- .../Requests/Payment/EditPaymentRequest.php | 2 +- .../Requests/Payment/ShowPaymentRequest.php | 2 +- .../Requests/Payment/StorePaymentRequest.php | 2 +- .../Requests/Payment/UpdatePaymentRequest.php | 7 +- .../Requests/Product/CreateProductRequest.php | 2 +- .../Requests/Product/EditProductRequest.php | 2 +- .../Requests/Product/ShowProductRequest.php | 2 +- .../Requests/Product/StoreProductRequest.php | 2 +- .../Requests/Product/UpdateProductRequest.php | 2 +- .../Requests/Quote/ActionQuoteRequest.php | 2 +- .../Requests/Quote/CreateQuoteRequest.php | 2 +- .../Requests/Quote/DestroyQuoteRequest.php | 2 +- app/Http/Requests/Quote/EditQuoteRequest.php | 2 +- app/Http/Requests/Quote/ShowQuoteRequest.php | 2 +- app/Http/Requests/Quote/StoreQuoteRequest.php | 2 +- .../Requests/Quote/UpdateQuoteRequest.php | 2 +- .../ActionRecurringInvoiceRequest.php | 2 +- .../CreateRecurringInvoiceRequest.php | 2 +- .../DestroyRecurringInvoiceRequest.php | 2 +- .../EditRecurringInvoiceRequest.php | 2 +- .../ShowRecurringInvoiceRequest.php | 2 +- .../StoreRecurringInvoiceRequest.php | 2 +- .../UpdateRecurringInvoiceRequest.php | 2 +- .../ActionRecurringQuoteRequest.php | 2 +- .../CreateRecurringQuoteRequest.php | 2 +- .../DestroyRecurringQuoteRequest.php | 2 +- .../EditRecurringQuoteRequest.php | 2 +- .../ShowRecurringQuoteRequest.php | 2 +- .../StoreRecurringQuoteRequest.php | 2 +- .../UpdateRecurringQuoteRequest.php | 2 +- app/Http/Requests/Request.php | 2 +- .../Requests/TaxRate/CreateTaxRateRequest.php | 2 +- .../TaxRate/DestroyTaxRateRequest.php | 2 +- .../Requests/TaxRate/EditTaxRateRequest.php | 2 +- .../Requests/TaxRate/ShowTaxRateRequest.php | 2 +- .../Requests/TaxRate/StoreTaxRateRequest.php | 2 +- .../Requests/TaxRate/UpdateTaxRateRequest.php | 2 +- .../User/AttachCompanyUserRequest.php | 2 +- app/Http/Requests/User/CreateUserRequest.php | 2 +- app/Http/Requests/User/DestroyUserRequest.php | 2 +- .../User/DetachCompanyUserRequest.php | 2 +- app/Http/Requests/User/EditUserRequest.php | 2 +- app/Http/Requests/User/ShowUserRequest.php | 2 +- app/Http/Requests/User/StoreUserRequest.php | 2 +- app/Http/Requests/User/UpdateUserRequest.php | 2 +- .../ValidationRules/NewUniqueUserRule.php | 2 +- app/Http/ValidationRules/UniqueUserRule.php | 2 +- .../ValidClientGroupSettingsRule.php | 2 +- .../ValidCompanyGatewayFeesAndLimitsRule.php | 2 +- .../ValidPayableInvoicesRule.php | 2 +- .../ValidationRules/ValidSettingsRule.php | 2 +- .../ValidationRules/ValidUserForCompany.php | 2 +- app/Http/ViewComposers/HeaderComposer.php | 2 +- app/Http/ViewComposers/PortalComposer.php | 2 +- .../ViewComposers/TranslationComposer.php | 2 +- app/Jobs/Account/CreateAccount.php | 2 +- app/Jobs/Client/UpdateClientBalance.php | 2 +- app/Jobs/Client/UpdateClientPaidToDate.php | 2 +- app/Jobs/Company/CreateCompany.php | 2 +- app/Jobs/Company/CreateCompanyToken.php | 2 +- .../UpdateCompanyLedgerWithInvoice.php | 2 +- .../UpdateCompanyLedgerWithPayment.php | 2 +- app/Jobs/Cron/RecurringInvoicesCron.php | 2 +- app/Jobs/Invitation/MarkOpened.php | 2 +- app/Jobs/Invoice/ApplyClientPayment.php | 2 +- app/Jobs/Invoice/ApplyInvoiceNumber.php | 2 +- app/Jobs/Invoice/ApplyInvoicePayment.php | 6 +- app/Jobs/Invoice/ApplyPaymentToInvoice.php | 2 +- app/Jobs/Invoice/CreateInvoiceInvitations.php | 2 +- app/Jobs/Invoice/CreateInvoicePdf.php | 2 +- app/Jobs/Invoice/EmailInvoice.php | 2 +- app/Jobs/Invoice/InvoiceNotification.php | 2 +- app/Jobs/Invoice/MarkInvoicePaid.php | 2 +- app/Jobs/Invoice/ReverseInvoicePayment.php | 2 +- app/Jobs/Invoice/StoreInvoice.php | 2 +- app/Jobs/Invoice/UpdateInvoicePayment.php | 2 +- app/Jobs/Payment/PaymentNotification.php | 2 +- app/Jobs/Product/UpdateOrCreateProduct.php | 2 +- app/Jobs/Quote/ApplyQuoteNumber.php | 2 +- app/Jobs/Quote/CreateQuoteInvitations.php | 2 +- app/Jobs/RecurringInvoice/SendRecurring.php | 2 +- app/Jobs/User/CreateUser.php | 2 +- app/Jobs/Util/SystemLogger.php | 2 +- app/Jobs/Util/UploadAvatar.php | 2 +- app/Jobs/Util/UploadFile.php | 2 +- app/Libraries/MultiDB.php | 2 +- app/Libraries/OAuth.php | 2 +- app/Libraries/OAuth/OAuth.php | 2 +- app/Libraries/OFX.php | 2 +- .../Activity/CreatedClientActivity.php | 2 +- .../Activity/PaymentCreatedActivity.php | 2 +- .../Activity/PaymentDeletedActivity.php | 2 +- .../Contact/UpdateContactLastLogin.php | 2 +- .../Invoice/CreateInvoiceActivity.php | 2 +- .../Invoice/CreateInvoiceHtmlBackup.php | 2 +- .../Invoice/CreateInvoiceInvitation.php | 2 +- app/Listeners/Invoice/CreateInvoicePdf.php | 2 +- .../Invoice/InvoiceEmailActivity.php | 2 +- .../Invoice/InvoiceEmailFailedActivity.php | 2 +- .../Invoice/UpdateInvoiceActivity.php | 2 +- .../Invoice/UpdateInvoiceInvitations.php | 2 +- .../SendVerificationNotification.php | 2 +- app/Listeners/User/ArchivedUserActivity.php | 2 +- app/Listeners/User/CreatedUserActivity.php | 2 +- app/Listeners/User/DeletedUserActivity.php | 2 +- app/Listeners/User/RestoredUserActivity.php | 2 +- app/Listeners/User/UpdateUserLastLogin.php | 2 +- app/Listeners/User/UpdatedUserActivity.php | 2 +- app/Mail/BouncedEmail.php | 2 +- app/Mail/VerifyUser.php | 2 +- app/Models/Account.php | 2 +- app/Models/Activity.php | 2 +- app/Models/Backup.php | 2 +- app/Models/Bank.php | 2 +- app/Models/BankAccount.php | 2 +- app/Models/BankSubaccount.php | 2 +- app/Models/BaseModel.php | 2 +- app/Models/Client.php | 2 +- app/Models/ClientContact.php | 2 +- app/Models/ClientGatewayToken.php | 2 +- app/Models/Company.php | 6 +- app/Models/CompanyGateway.php | 2 +- app/Models/CompanyLedger.php | 2 +- app/Models/CompanyToken.php | 2 +- app/Models/CompanyUser.php | 2 +- app/Models/Country.php | 2 +- app/Models/Credit.php | 102 ++++++++++++++- app/Models/CreditInvitation.php | 83 ++++++++++++ app/Models/Creditable.php | 19 --- app/Models/Currency.php | 2 +- app/Models/Document.php | 2 +- app/Models/Expense.php | 2 +- app/Models/Filterable.php | 2 +- app/Models/Gateway.php | 2 +- app/Models/GatewayType.php | 2 +- app/Models/GroupSetting.php | 2 +- app/Models/Industry.php | 2 +- app/Models/Invoice.php | 4 +- app/Models/InvoiceInvitation.php | 4 +- app/Models/Language.php | 2 +- app/Models/Payment.php | 9 +- app/Models/PaymentLibrary.php | 2 +- app/Models/PaymentTerm.php | 2 +- app/Models/PaymentType.php | 2 +- app/Models/Paymentable.php | 16 ++- app/Models/Presenters/AccountPresenter.php | 2 +- .../Presenters/ClientContactPresenter.php | 2 +- app/Models/Presenters/ClientPresenter.php | 2 +- app/Models/Presenters/CompanyPresenter.php | 2 +- app/Models/Presenters/EntityPresenter.php | 2 +- app/Models/Presenters/InvoicePresenter.php | 2 +- app/Models/Presenters/UserPresenter.php | 2 +- app/Models/Product.php | 2 +- app/Models/Proposal.php | 2 +- app/Models/Quote.php | 3 +- app/Models/QuoteInvitation.php | 3 +- app/Models/RecurringInvoice.php | 2 +- app/Models/RecurringInvoiceInvitation.php | 2 +- app/Models/RecurringQuote.php | 2 +- app/Models/Size.php | 2 +- app/Models/StaticModel.php | 2 +- app/Models/SystemLog.php | 2 +- app/Models/Task.php | 2 +- app/Models/TaxRate.php | 2 +- app/Models/Timezone.php | 2 +- app/Models/User.php | 4 +- app/Observers/AccountObserver.php | 2 +- app/Observers/ClientContactObserver.php | 2 +- app/Observers/ClientObserver.php | 2 +- app/Observers/CompanyObserver.php | 2 +- app/Observers/CompanyTokenObserver.php | 2 +- app/Observers/ExpenseObserver.php | 2 +- app/Observers/InvoiceObserver.php | 2 +- app/Observers/PaymentObserver.php | 2 +- app/Observers/ProductObserver.php | 2 +- app/Observers/ProposalObserver.php | 2 +- app/Observers/QuoteObserver.php | 2 +- app/Observers/TaskObserver.php | 2 +- app/Observers/UserObserver.php | 2 +- app/PaymentDrivers/BasePaymentDriver.php | 2 +- .../PayPalExpressPaymentDriver.php | 2 +- app/PaymentDrivers/StripePaymentDriver.php | 2 +- app/Policies/ActivityPolicy.php | 2 +- app/Policies/ClientPolicy.php | 2 +- app/Policies/CompanyGatewayPolicy.php | 2 +- app/Policies/CompanyPolicy.php | 2 +- app/Policies/EntityPolicy.php | 2 +- app/Policies/GroupSettingPolicy.php | 2 +- app/Policies/InvoicePolicy.php | 2 +- app/Policies/PaymentPolicy.php | 2 +- app/Policies/ProductPolicy.php | 2 +- app/Policies/QuotePolicy.php | 2 +- app/Policies/RecurringInvoicePolicy.php | 2 +- app/Policies/RecurringQuotePolicy.php | 2 +- app/Policies/TaxRatePolicy.php | 2 +- app/Policies/UserPolicy.php | 2 +- app/Providers/AppServiceProvider.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- app/Providers/BroadcastServiceProvider.php | 2 +- app/Providers/ComposerServiceProvider.php | 2 +- app/Providers/EventServiceProvider.php | 2 +- app/Providers/MultiDatabaseUserProvider.php | 2 +- app/Providers/RouteServiceProvider.php | 2 +- .../SendConfirmationNotification.php | 2 +- app/Providers/UserSignedUp.php | 2 +- app/Repositories/AccountRepository.php | 2 +- app/Repositories/ActivityRepository.php | 2 +- app/Repositories/BaseRepository.php | 2 +- app/Repositories/ClientContactRepository.php | 2 +- app/Repositories/ClientRepository.php | 2 +- app/Repositories/CompanyRepository.php | 2 +- app/Repositories/CreditRepository.php | 52 +++++++- app/Repositories/GroupSettingRepository.php | 2 +- app/Repositories/InvoiceRepository.php | 5 +- app/Repositories/PaymentRepository.php | 12 +- app/Repositories/ProductRepository.php | 2 +- app/Repositories/QuoteRepository.php | 8 +- .../RecurringInvoiceRepository.php | 2 +- app/Repositories/RecurringQuoteRepository.php | 2 +- app/Repositories/UserRepository.php | 2 +- app/Transformers/AccountTransformer.php | 2 +- app/Transformers/ArraySerializer.php | 2 +- .../ClientContactLoginTransformer.php | 2 +- app/Transformers/ClientContactTransformer.php | 2 +- .../ClientGatewayTokenTransformer.php | 2 +- app/Transformers/ClientTransformer.php | 4 +- .../CompanyGatewayTransformer.php | 4 +- app/Transformers/CompanyTokenTransformer.php | 2 +- app/Transformers/CompanyTransformer.php | 4 +- app/Transformers/CompanyUserTransformer.php | 4 +- .../Contact/InvoiceTransformer.php | 2 +- app/Transformers/CreditTransformer.php | 123 ++++++++++++++++++ app/Transformers/DocumentTransformer.php | 2 +- app/Transformers/EntityTransformer.php | 2 +- app/Transformers/GatewayTransformer.php | 2 +- app/Transformers/GroupSettingTransformer.php | 2 +- .../InvoiceInvitationTransformer.php | 2 +- app/Transformers/InvoiceItemTransformer.php | 2 +- app/Transformers/InvoiceTransformer.php | 2 +- app/Transformers/PaymentTransformer.php | 2 +- app/Transformers/PaymentableTransformer.php | 12 +- app/Transformers/ProductTransformer.php | 2 +- .../QuoteInvitationTransformer.php | 2 +- app/Transformers/QuoteTransformer.php | 3 +- .../RecurringInvoiceTransformer.php | 2 +- .../RecurringQuoteTransformer.php | 2 +- app/Transformers/TaxRateTransformer.php | 2 +- app/Transformers/UserTransformer.php | 4 +- app/Utils/Ninja.php | 2 +- app/Utils/Number.php | 2 +- app/Utils/Statics.php | 2 +- app/Utils/SystemHealth.php | 2 +- app/Utils/Traits/ChecksEntityStatus.php | 2 +- app/Utils/Traits/CleanLineItems.php | 2 +- app/Utils/Traits/ClientGroupSettingsSaver.php | 2 +- .../CompanyGatewayFeesAndLimitsSaver.php | 2 +- app/Utils/Traits/CompanySettingsSaver.php | 2 +- app/Utils/Traits/GeneratesCounter.php | 2 +- app/Utils/Traits/Inviteable.php | 2 +- app/Utils/Traits/InvoiceEmailBuilder.php | 2 +- app/Utils/Traits/MakesDates.php | 2 +- app/Utils/Traits/MakesHash.php | 2 +- app/Utils/Traits/MakesHeaderData.php | 2 +- app/Utils/Traits/MakesInvoiceHtml.php | 2 +- app/Utils/Traits/MakesInvoiceValues.php | 2 +- app/Utils/Traits/MakesMenu.php | 2 +- app/Utils/Traits/MakesReminders.php | 2 +- app/Utils/Traits/NumberFormatter.php | 2 +- app/Utils/Traits/SettingsSaver.php | 2 +- app/Utils/Traits/SystemLogTrait.php | 2 +- app/Utils/Traits/ThrottlesEmail.php | 2 +- app/Utils/Traits/Uploadable.php | 2 +- app/Utils/Traits/UserSessionAttributes.php | 2 +- app/Utils/Traits/UserSettings.php | 2 +- app/Utils/TranslationHelper.php | 2 +- .../2014_10_13_000000_create_users_table.php | 46 +++++-- tests/MockAccountData.php | 2 +- 491 files changed, 972 insertions(+), 549 deletions(-) create mode 100644 app/Factory/CreditInvitationFactory.php create mode 100644 app/Models/CreditInvitation.php delete mode 100644 app/Models/Creditable.php create mode 100644 app/Transformers/CreditTransformer.php diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index e10e34625..0c546c0c8 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/BaseSettings.php b/app/DataMapper/BaseSettings.php index 5175cd701..4559bb900 100644 --- a/app/DataMapper/BaseSettings.php +++ b/app/DataMapper/BaseSettings.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/ClientSettings.php b/app/DataMapper/ClientSettings.php index 96e591ece..2a6cca64d 100644 --- a/app/DataMapper/ClientSettings.php +++ b/app/DataMapper/ClientSettings.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php index 75c0c4b9b..be41e8b8c 100644 --- a/app/DataMapper/CompanySettings.php +++ b/app/DataMapper/CompanySettings.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/DefaultSettings.php b/app/DataMapper/DefaultSettings.php index f73bdc7df..b5c8ca2b0 100644 --- a/app/DataMapper/DefaultSettings.php +++ b/app/DataMapper/DefaultSettings.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/EmailTemplateDefaults.php b/app/DataMapper/EmailTemplateDefaults.php index 423c465fa..758875711 100644 --- a/app/DataMapper/EmailTemplateDefaults.php +++ b/app/DataMapper/EmailTemplateDefaults.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/FeesAndLimits.php b/app/DataMapper/FeesAndLimits.php index 370ed326e..83289706b 100644 --- a/app/DataMapper/FeesAndLimits.php +++ b/app/DataMapper/FeesAndLimits.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/InvoiceItem.php b/app/DataMapper/InvoiceItem.php index 96048850b..f15e288a1 100644 --- a/app/DataMapper/InvoiceItem.php +++ b/app/DataMapper/InvoiceItem.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/PaymentMethodMeta.php b/app/DataMapper/PaymentMethodMeta.php index 28c8a0c8a..5e2ea40f1 100644 --- a/app/DataMapper/PaymentMethodMeta.php +++ b/app/DataMapper/PaymentMethodMeta.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/DataMapper/PaymentTransaction.php b/app/DataMapper/PaymentTransaction.php index dd4b9645d..f3aa177f4 100644 --- a/app/DataMapper/PaymentTransaction.php +++ b/app/DataMapper/PaymentTransaction.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Account/AccountCreated.php b/app/Events/Account/AccountCreated.php index 2e29a1def..e641c04cc 100644 --- a/app/Events/Account/AccountCreated.php +++ b/app/Events/Account/AccountCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Client/ClientWasArchived.php b/app/Events/Client/ClientWasArchived.php index 2d675766f..83430c3d7 100644 --- a/app/Events/Client/ClientWasArchived.php +++ b/app/Events/Client/ClientWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Client/ClientWasCreated.php b/app/Events/Client/ClientWasCreated.php index 2846e56eb..94c7e6c3b 100644 --- a/app/Events/Client/ClientWasCreated.php +++ b/app/Events/Client/ClientWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Client/ClientWasDeleted.php b/app/Events/Client/ClientWasDeleted.php index c0e0b93f3..1766ed586 100644 --- a/app/Events/Client/ClientWasDeleted.php +++ b/app/Events/Client/ClientWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Client/ClientWasRestored.php b/app/Events/Client/ClientWasRestored.php index efcf1ca39..464e6045e 100644 --- a/app/Events/Client/ClientWasRestored.php +++ b/app/Events/Client/ClientWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Client/ClientWasUpdated.php b/app/Events/Client/ClientWasUpdated.php index 34cbf4154..0dbd33c81 100644 --- a/app/Events/Client/ClientWasUpdated.php +++ b/app/Events/Client/ClientWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Contact/ContactLoggedIn.php b/app/Events/Contact/ContactLoggedIn.php index 7b7082a8c..4f7a7626a 100644 --- a/app/Events/Contact/ContactLoggedIn.php +++ b/app/Events/Contact/ContactLoggedIn.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Expense/ExpenseWasArchived.php b/app/Events/Expense/ExpenseWasArchived.php index 26b86c7c1..803bf8494 100644 --- a/app/Events/Expense/ExpenseWasArchived.php +++ b/app/Events/Expense/ExpenseWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Expense/ExpenseWasCreated.php b/app/Events/Expense/ExpenseWasCreated.php index 495a9701f..f689e198c 100644 --- a/app/Events/Expense/ExpenseWasCreated.php +++ b/app/Events/Expense/ExpenseWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Expense/ExpenseWasDeleted.php b/app/Events/Expense/ExpenseWasDeleted.php index 002a640ee..429419762 100644 --- a/app/Events/Expense/ExpenseWasDeleted.php +++ b/app/Events/Expense/ExpenseWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Expense/ExpenseWasRestored.php b/app/Events/Expense/ExpenseWasRestored.php index 39e057f65..f7e455010 100644 --- a/app/Events/Expense/ExpenseWasRestored.php +++ b/app/Events/Expense/ExpenseWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Expense/ExpenseWasUpdated.php b/app/Events/Expense/ExpenseWasUpdated.php index bf57048f6..3d4bbec8b 100644 --- a/app/Events/Expense/ExpenseWasUpdated.php +++ b/app/Events/Expense/ExpenseWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasArchived.php b/app/Events/Invoice/InvoiceWasArchived.php index 15c52e8a9..aff124235 100644 --- a/app/Events/Invoice/InvoiceWasArchived.php +++ b/app/Events/Invoice/InvoiceWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasCreated.php b/app/Events/Invoice/InvoiceWasCreated.php index f2eeb94a9..5b2d1c023 100644 --- a/app/Events/Invoice/InvoiceWasCreated.php +++ b/app/Events/Invoice/InvoiceWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasDeleted.php b/app/Events/Invoice/InvoiceWasDeleted.php index b9d3b33fb..12575aa06 100644 --- a/app/Events/Invoice/InvoiceWasDeleted.php +++ b/app/Events/Invoice/InvoiceWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasEmailed.php b/app/Events/Invoice/InvoiceWasEmailed.php index c6344db9a..b3ae8f158 100644 --- a/app/Events/Invoice/InvoiceWasEmailed.php +++ b/app/Events/Invoice/InvoiceWasEmailed.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasEmailedAndFailed.php b/app/Events/Invoice/InvoiceWasEmailedAndFailed.php index da729b205..b9f0e34f7 100644 --- a/app/Events/Invoice/InvoiceWasEmailedAndFailed.php +++ b/app/Events/Invoice/InvoiceWasEmailedAndFailed.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasMarkedSent.php b/app/Events/Invoice/InvoiceWasMarkedSent.php index ba8e457ed..350204966 100644 --- a/app/Events/Invoice/InvoiceWasMarkedSent.php +++ b/app/Events/Invoice/InvoiceWasMarkedSent.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasPaid.php b/app/Events/Invoice/InvoiceWasPaid.php index 64d52c8ec..309f72bf9 100644 --- a/app/Events/Invoice/InvoiceWasPaid.php +++ b/app/Events/Invoice/InvoiceWasPaid.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasRestored.php b/app/Events/Invoice/InvoiceWasRestored.php index af4e5884c..56c16f06e 100644 --- a/app/Events/Invoice/InvoiceWasRestored.php +++ b/app/Events/Invoice/InvoiceWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Invoice/InvoiceWasUpdated.php b/app/Events/Invoice/InvoiceWasUpdated.php index dd95c7a1c..d9bd7b946 100644 --- a/app/Events/Invoice/InvoiceWasUpdated.php +++ b/app/Events/Invoice/InvoiceWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentCompleted.php b/app/Events/Payment/PaymentCompleted.php index d9a1701e5..d94fc13e9 100644 --- a/app/Events/Payment/PaymentCompleted.php +++ b/app/Events/Payment/PaymentCompleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentFailed.php b/app/Events/Payment/PaymentFailed.php index 7c0e4ed62..e7575b6f4 100644 --- a/app/Events/Payment/PaymentFailed.php +++ b/app/Events/Payment/PaymentFailed.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentWasArchived.php b/app/Events/Payment/PaymentWasArchived.php index c5626f322..64e527cb2 100644 --- a/app/Events/Payment/PaymentWasArchived.php +++ b/app/Events/Payment/PaymentWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentWasCreated.php b/app/Events/Payment/PaymentWasCreated.php index fc08999c7..92940cd80 100644 --- a/app/Events/Payment/PaymentWasCreated.php +++ b/app/Events/Payment/PaymentWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentWasDeleted.php b/app/Events/Payment/PaymentWasDeleted.php index 8eff5c59c..3315de999 100644 --- a/app/Events/Payment/PaymentWasDeleted.php +++ b/app/Events/Payment/PaymentWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentWasRefunded.php b/app/Events/Payment/PaymentWasRefunded.php index 21f6f9d24..4a75ded34 100644 --- a/app/Events/Payment/PaymentWasRefunded.php +++ b/app/Events/Payment/PaymentWasRefunded.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentWasRestored.php b/app/Events/Payment/PaymentWasRestored.php index feed1a9f5..caf993c55 100644 --- a/app/Events/Payment/PaymentWasRestored.php +++ b/app/Events/Payment/PaymentWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Payment/PaymentWasVoided.php b/app/Events/Payment/PaymentWasVoided.php index 7d5cfde10..a718253e2 100644 --- a/app/Events/Payment/PaymentWasVoided.php +++ b/app/Events/Payment/PaymentWasVoided.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Product/ProductWasCreated.php b/app/Events/Product/ProductWasCreated.php index bc97a60b4..07b1fcf11 100644 --- a/app/Events/Product/ProductWasCreated.php +++ b/app/Events/Product/ProductWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Product/ProductWasDeleted.php b/app/Events/Product/ProductWasDeleted.php index aed262cea..3c4dae126 100644 --- a/app/Events/Product/ProductWasDeleted.php +++ b/app/Events/Product/ProductWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Product/ProductWasUpdated.php b/app/Events/Product/ProductWasUpdated.php index 4655008d7..2aa27106a 100644 --- a/app/Events/Product/ProductWasUpdated.php +++ b/app/Events/Product/ProductWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Quote/QuoteWasArchived.php b/app/Events/Quote/QuoteWasArchived.php index 759415e5c..3a1b2745a 100644 --- a/app/Events/Quote/QuoteWasArchived.php +++ b/app/Events/Quote/QuoteWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Quote/QuoteWasCreated.php b/app/Events/Quote/QuoteWasCreated.php index 58f66a854..94cfb2ffc 100644 --- a/app/Events/Quote/QuoteWasCreated.php +++ b/app/Events/Quote/QuoteWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Quote/QuoteWasDeleted.php b/app/Events/Quote/QuoteWasDeleted.php index dad2f0515..c037180a7 100644 --- a/app/Events/Quote/QuoteWasDeleted.php +++ b/app/Events/Quote/QuoteWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Quote/QuoteWasEmailed.php b/app/Events/Quote/QuoteWasEmailed.php index de5cf8d56..db0bd4c08 100644 --- a/app/Events/Quote/QuoteWasEmailed.php +++ b/app/Events/Quote/QuoteWasEmailed.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Quote/QuoteWasRestored.php b/app/Events/Quote/QuoteWasRestored.php index 9e001d573..7af7fb27c 100644 --- a/app/Events/Quote/QuoteWasRestored.php +++ b/app/Events/Quote/QuoteWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Quote/QuoteWasUpdated.php b/app/Events/Quote/QuoteWasUpdated.php index 546a2ac69..38300cf2b 100644 --- a/app/Events/Quote/QuoteWasUpdated.php +++ b/app/Events/Quote/QuoteWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Task/TaskWasArchived.php b/app/Events/Task/TaskWasArchived.php index 456a351f2..7bc3d39d3 100644 --- a/app/Events/Task/TaskWasArchived.php +++ b/app/Events/Task/TaskWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Task/TaskWasCreated.php b/app/Events/Task/TaskWasCreated.php index e519e9d37..5ae3f4d21 100644 --- a/app/Events/Task/TaskWasCreated.php +++ b/app/Events/Task/TaskWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Task/TaskWasDeleted.php b/app/Events/Task/TaskWasDeleted.php index 135a0ab30..9cc8b3379 100644 --- a/app/Events/Task/TaskWasDeleted.php +++ b/app/Events/Task/TaskWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Task/TaskWasRestored.php b/app/Events/Task/TaskWasRestored.php index 09b065ffd..4abd97984 100644 --- a/app/Events/Task/TaskWasRestored.php +++ b/app/Events/Task/TaskWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Task/TaskWasUpdated.php b/app/Events/Task/TaskWasUpdated.php index fe305a22b..688c6bf05 100644 --- a/app/Events/Task/TaskWasUpdated.php +++ b/app/Events/Task/TaskWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/User/UserLoggedIn.php b/app/Events/User/UserLoggedIn.php index ffe70e9b3..3e23ed79d 100644 --- a/app/Events/User/UserLoggedIn.php +++ b/app/Events/User/UserLoggedIn.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/User/UserWasArchived.php b/app/Events/User/UserWasArchived.php index 040879404..93e3b660d 100644 --- a/app/Events/User/UserWasArchived.php +++ b/app/Events/User/UserWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/User/UserWasCreated.php b/app/Events/User/UserWasCreated.php index 7e35b8940..f33f751c0 100644 --- a/app/Events/User/UserWasCreated.php +++ b/app/Events/User/UserWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/User/UserWasDeleted.php b/app/Events/User/UserWasDeleted.php index f6a04ceab..f96acfc83 100644 --- a/app/Events/User/UserWasDeleted.php +++ b/app/Events/User/UserWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/User/UserWasRestored.php b/app/Events/User/UserWasRestored.php index 758208722..56d51411c 100644 --- a/app/Events/User/UserWasRestored.php +++ b/app/Events/User/UserWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/User/UserWasUpdated.php b/app/Events/User/UserWasUpdated.php index 0b0a985e8..03fa6c514 100644 --- a/app/Events/User/UserWasUpdated.php +++ b/app/Events/User/UserWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Vendor/VendorWasArchived.php b/app/Events/Vendor/VendorWasArchived.php index 16858d4cc..beac2117c 100644 --- a/app/Events/Vendor/VendorWasArchived.php +++ b/app/Events/Vendor/VendorWasArchived.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Vendor/VendorWasCreated.php b/app/Events/Vendor/VendorWasCreated.php index 287913969..5a7d090d7 100644 --- a/app/Events/Vendor/VendorWasCreated.php +++ b/app/Events/Vendor/VendorWasCreated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Vendor/VendorWasDeleted.php b/app/Events/Vendor/VendorWasDeleted.php index 7f8cd99a8..3e1eebdeb 100644 --- a/app/Events/Vendor/VendorWasDeleted.php +++ b/app/Events/Vendor/VendorWasDeleted.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Vendor/VendorWasRestored.php b/app/Events/Vendor/VendorWasRestored.php index 6a7b8d22e..a5324ff94 100644 --- a/app/Events/Vendor/VendorWasRestored.php +++ b/app/Events/Vendor/VendorWasRestored.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Events/Vendor/VendorWasUpdated.php b/app/Events/Vendor/VendorWasUpdated.php index 103eb501d..744304afc 100644 --- a/app/Events/Vendor/VendorWasUpdated.php +++ b/app/Events/Vendor/VendorWasUpdated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index eb0c9533d..e863fa5e4 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/ClientContactFactory.php b/app/Factory/ClientContactFactory.php index 680897792..0bcce6425 100644 --- a/app/Factory/ClientContactFactory.php +++ b/app/Factory/ClientContactFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/ClientFactory.php b/app/Factory/ClientFactory.php index fdc1fb746..88a28b013 100644 --- a/app/Factory/ClientFactory.php +++ b/app/Factory/ClientFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CloneInvoiceFactory.php b/app/Factory/CloneInvoiceFactory.php index 4bd7b24ca..707b1801f 100644 --- a/app/Factory/CloneInvoiceFactory.php +++ b/app/Factory/CloneInvoiceFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CloneInvoiceToQuoteFactory.php b/app/Factory/CloneInvoiceToQuoteFactory.php index fe029540c..abee62f38 100644 --- a/app/Factory/CloneInvoiceToQuoteFactory.php +++ b/app/Factory/CloneInvoiceToQuoteFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CompanyFactory.php b/app/Factory/CompanyFactory.php index 0503c215f..03b84ac41 100644 --- a/app/Factory/CompanyFactory.php +++ b/app/Factory/CompanyFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CompanyGatewayFactory.php b/app/Factory/CompanyGatewayFactory.php index 0462c897a..4c483f2e0 100644 --- a/app/Factory/CompanyGatewayFactory.php +++ b/app/Factory/CompanyGatewayFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CompanyLedgerFactory.php b/app/Factory/CompanyLedgerFactory.php index e92e0de1b..0c978894a 100644 --- a/app/Factory/CompanyLedgerFactory.php +++ b/app/Factory/CompanyLedgerFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CompanyUserFactory.php b/app/Factory/CompanyUserFactory.php index 6f94eb613..b6924015c 100644 --- a/app/Factory/CompanyUserFactory.php +++ b/app/Factory/CompanyUserFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CreditFactory.php b/app/Factory/CreditFactory.php index 2c4a59787..9e6d5902d 100644 --- a/app/Factory/CreditFactory.php +++ b/app/Factory/CreditFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/CreditInvitationFactory.php b/app/Factory/CreditInvitationFactory.php new file mode 100644 index 000000000..181f153f3 --- /dev/null +++ b/app/Factory/CreditInvitationFactory.php @@ -0,0 +1,38 @@ +company_id = $company_id; + $ci->user_id = $user_id; + $ci->client_contact_id = null; + $ci->credit_id = null; + $ci->key = Str::random(config('ninja.key_length')); + $ci->transaction_reference = null; + $ci->message_id = null; + $ci->email_error = ''; + $ci->signature_base64 = ''; + $ci->signature_date = null; + $ci->sent_date = null; + $ci->viewed_date = null; + $ci->opened_date = null; + + return $ci; + } +} diff --git a/app/Factory/GroupSettingFactory.php b/app/Factory/GroupSettingFactory.php index 9c7d4b52e..f39f70328 100644 --- a/app/Factory/GroupSettingFactory.php +++ b/app/Factory/GroupSettingFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/InvoiceFactory.php b/app/Factory/InvoiceFactory.php index 93f468e89..aa289c365 100644 --- a/app/Factory/InvoiceFactory.php +++ b/app/Factory/InvoiceFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/InvoiceInvitationFactory.php b/app/Factory/InvoiceInvitationFactory.php index b3b99db7b..286204a7b 100644 --- a/app/Factory/InvoiceInvitationFactory.php +++ b/app/Factory/InvoiceInvitationFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/InvoiceItemFactory.php b/app/Factory/InvoiceItemFactory.php index 24bb555db..bce8eba36 100644 --- a/app/Factory/InvoiceItemFactory.php +++ b/app/Factory/InvoiceItemFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/InvoiceToRecurringInvoiceFactory.php b/app/Factory/InvoiceToRecurringInvoiceFactory.php index e21b7727f..3ef61eb6a 100644 --- a/app/Factory/InvoiceToRecurringInvoiceFactory.php +++ b/app/Factory/InvoiceToRecurringInvoiceFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/PaymentFactory.php b/app/Factory/PaymentFactory.php index 35fe2f864..c7efeab90 100644 --- a/app/Factory/PaymentFactory.php +++ b/app/Factory/PaymentFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/ProductFactory.php b/app/Factory/ProductFactory.php index bfe381fa1..7f2ff7440 100644 --- a/app/Factory/ProductFactory.php +++ b/app/Factory/ProductFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/QuoteFactory.php b/app/Factory/QuoteFactory.php index a2e3c74aa..6587e64cf 100644 --- a/app/Factory/QuoteFactory.php +++ b/app/Factory/QuoteFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/QuoteInvitationFactory.php b/app/Factory/QuoteInvitationFactory.php index 2553cfb5b..0e52c54dd 100644 --- a/app/Factory/QuoteInvitationFactory.php +++ b/app/Factory/QuoteInvitationFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Quote Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Quote Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/RecurringInvoiceFactory.php b/app/Factory/RecurringInvoiceFactory.php index 40a89e925..198566feb 100644 --- a/app/Factory/RecurringInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php index 62c8f1666..40b7ba444 100644 --- a/app/Factory/RecurringInvoiceToInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/RecurringQuoteFactory.php b/app/Factory/RecurringQuoteFactory.php index c7e2b9902..ebbef2d60 100644 --- a/app/Factory/RecurringQuoteFactory.php +++ b/app/Factory/RecurringQuoteFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/TaxRateFactory.php b/app/Factory/TaxRateFactory.php index df2038840..9588f18a6 100644 --- a/app/Factory/TaxRateFactory.php +++ b/app/Factory/TaxRateFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Factory/UserFactory.php b/app/Factory/UserFactory.php index 03fa2101f..9b57d186b 100644 --- a/app/Factory/UserFactory.php +++ b/app/Factory/UserFactory.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php index 2e8bd93c3..216fbc140 100644 --- a/app/Filters/ClientFilters.php +++ b/app/Filters/ClientFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php index c6ad15433..df727032a 100644 --- a/app/Filters/InvoiceFilters.php +++ b/app/Filters/InvoiceFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php index 6efc87c3f..557486baf 100644 --- a/app/Filters/PaymentFilters.php +++ b/app/Filters/PaymentFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/ProductFilters.php b/app/Filters/ProductFilters.php index ed0939baf..28740c70e 100644 --- a/app/Filters/ProductFilters.php +++ b/app/Filters/ProductFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php index e4804ee66..4e79b6376 100644 --- a/app/Filters/QueryFilters.php +++ b/app/Filters/QueryFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php index 0a478078b..47259be2b 100644 --- a/app/Filters/QuoteFilters.php +++ b/app/Filters/QuoteFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php index 9a0f9d603..0f5358088 100644 --- a/app/Filters/RecurringInvoiceFilters.php +++ b/app/Filters/RecurringInvoiceFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php index c44cd656d..5f2190cb0 100644 --- a/app/Filters/RecurringQuoteFilters.php +++ b/app/Filters/RecurringQuoteFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php index 0dfd5363e..c53102cd4 100644 --- a/app/Filters/UserFilters.php +++ b/app/Filters/UserFilters.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/Balancer.php b/app/Helpers/Invoice/Balancer.php index 70b953f6b..be9b11c33 100644 --- a/app/Helpers/Invoice/Balancer.php +++ b/app/Helpers/Invoice/Balancer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/CustomValuer.php b/app/Helpers/Invoice/CustomValuer.php index 0c6741870..1e434a644 100644 --- a/app/Helpers/Invoice/CustomValuer.php +++ b/app/Helpers/Invoice/CustomValuer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/Discounter.php b/app/Helpers/Invoice/Discounter.php index 4e7ec8b74..c5be18873 100644 --- a/app/Helpers/Invoice/Discounter.php +++ b/app/Helpers/Invoice/Discounter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php index 6f770d179..df8e3358f 100644 --- a/app/Helpers/Invoice/InvoiceItemSum.php +++ b/app/Helpers/Invoice/InvoiceItemSum.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/InvoiceItemSumInclusive.php b/app/Helpers/Invoice/InvoiceItemSumInclusive.php index 3bdf5d2ef..8adc3a9a2 100644 --- a/app/Helpers/Invoice/InvoiceItemSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceItemSumInclusive.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/InvoiceSum.php b/app/Helpers/Invoice/InvoiceSum.php index 9e31c8897..7a7942ceb 100644 --- a/app/Helpers/Invoice/InvoiceSum.php +++ b/app/Helpers/Invoice/InvoiceSum.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/InvoiceSumInclusive.php b/app/Helpers/Invoice/InvoiceSumInclusive.php index 1c3965491..34823612f 100644 --- a/app/Helpers/Invoice/InvoiceSumInclusive.php +++ b/app/Helpers/Invoice/InvoiceSumInclusive.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Invoice/Taxer.php b/app/Helpers/Invoice/Taxer.php index 0433f6c6a..68c46fd4d 100644 --- a/app/Helpers/Invoice/Taxer.php +++ b/app/Helpers/Invoice/Taxer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Mail/GmailTransport.php b/app/Helpers/Mail/GmailTransport.php index df53d578b..722c8c755 100644 --- a/app/Helpers/Mail/GmailTransport.php +++ b/app/Helpers/Mail/GmailTransport.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/Mail/GmailTransportConfig.php b/app/Helpers/Mail/GmailTransportConfig.php index 944f7759f..759b040e7 100644 --- a/app/Helpers/Mail/GmailTransportConfig.php +++ b/app/Helpers/Mail/GmailTransportConfig.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Helpers/TranslationHelper.php b/app/Helpers/TranslationHelper.php index b81286f85..7d5c1b657 100644 --- a/app/Helpers/TranslationHelper.php +++ b/app/Helpers/TranslationHelper.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 6dbed0708..891e9be19 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php index 9d769fc14..0a23c3bdf 100644 --- a/app/Http/Controllers/ActivityController.php +++ b/app/Http/Controllers/ActivityController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/ContactForgotPasswordController.php b/app/Http/Controllers/Auth/ContactForgotPasswordController.php index 90f0cdf34..82e6607f7 100644 --- a/app/Http/Controllers/Auth/ContactForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ContactForgotPasswordController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php index 7031ad6b4..0c4aeaf82 100644 --- a/app/Http/Controllers/Auth/ContactLoginController.php +++ b/app/Http/Controllers/Auth/ContactLoginController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/ContactResetPasswordController.php b/app/Http/Controllers/Auth/ContactResetPasswordController.php index 58f249590..8ba1d6794 100644 --- a/app/Http/Controllers/Auth/ContactResetPasswordController.php +++ b/app/Http/Controllers/Auth/ContactResetPasswordController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index eed1e5983..9b5b2875e 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 123f7c9e3..38a0e22b9 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 723a2ef8a..db715d45c 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 9e5f57ced..0a4b30fed 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Auth/VerificationController.php b/app/Http/Controllers/Auth/VerificationController.php index 15b3544e6..8fae147e0 100644 --- a/app/Http/Controllers/Auth/VerificationController.php +++ b/app/Http/Controllers/Auth/VerificationController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 3cc4aa63c..51c741452 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -70,7 +70,7 @@ class BaseController extends Controller if (request()->has('first_load') && request()->input('first_load') == 'true') { /* For very large accounts, we reduce the includes automatically */ - if (auth()->user()->getCompany()->clients->count() > 1000) { + if (auth()->user()->getCompany()->clients->count() < 1000) { $include = [ 'account', 'user.company_user', @@ -83,7 +83,8 @@ class BaseController extends Controller 'company.clients', 'company.products', 'company.invoices', - 'company.payments', + //'company.payments', + 'company.payments.paymentables', 'company.quotes', ]; } else { @@ -100,6 +101,7 @@ class BaseController extends Controller // 'company.products', // 'company.invoices', // 'company.payments', + // 'company.payments.paymentables', // 'company.quotes', ]; } diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index a66285f6a..cb61ddb3d 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/DashboardController.php b/app/Http/Controllers/ClientPortal/DashboardController.php index c92d867ba..735f9bcf2 100644 --- a/app/Http/Controllers/ClientPortal/DashboardController.php +++ b/app/Http/Controllers/ClientPortal/DashboardController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/DocumentController.php b/app/Http/Controllers/ClientPortal/DocumentController.php index 43e86afc5..ec5a5fc0a 100644 --- a/app/Http/Controllers/ClientPortal/DocumentController.php +++ b/app/Http/Controllers/ClientPortal/DocumentController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/InvitationController.php b/app/Http/Controllers/ClientPortal/InvitationController.php index 765f4793f..431e04e13 100644 --- a/app/Http/Controllers/ClientPortal/InvitationController.php +++ b/app/Http/Controllers/ClientPortal/InvitationController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index e47cb0236..48572b54a 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php index f109d1592..cf94d8e79 100644 --- a/app/Http/Controllers/ClientPortal/PaymentController.php +++ b/app/Http/Controllers/ClientPortal/PaymentController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/PaymentHookController.php b/app/Http/Controllers/ClientPortal/PaymentHookController.php index d24add3e2..18f4f49d4 100644 --- a/app/Http/Controllers/ClientPortal/PaymentHookController.php +++ b/app/Http/Controllers/ClientPortal/PaymentHookController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/PaymentMethodController.php b/app/Http/Controllers/ClientPortal/PaymentMethodController.php index d0e151201..fb837de64 100644 --- a/app/Http/Controllers/ClientPortal/PaymentMethodController.php +++ b/app/Http/Controllers/ClientPortal/PaymentMethodController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/ProfileController.php b/app/Http/Controllers/ClientPortal/ProfileController.php index 189323d64..2e80fa42c 100644 --- a/app/Http/Controllers/ClientPortal/ProfileController.php +++ b/app/Http/Controllers/ClientPortal/ProfileController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php b/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php index 1725a6242..52407639e 100644 --- a/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php +++ b/app/Http/Controllers/ClientPortal/RecurringInvoiceController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ClientStatementController.php b/app/Http/Controllers/ClientStatementController.php index b555b5857..8a379aec6 100644 --- a/app/Http/Controllers/ClientStatementController.php +++ b/app/Http/Controllers/ClientStatementController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 64d2a0466..e245dc89e 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/CompanyGatewayController.php b/app/Http/Controllers/CompanyGatewayController.php index c2bea86c1..16b13b41e 100644 --- a/app/Http/Controllers/CompanyGatewayController.php +++ b/app/Http/Controllers/CompanyGatewayController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Contact/InvoiceController.php b/app/Http/Controllers/Contact/InvoiceController.php index db5056496..b034f85d9 100644 --- a/app/Http/Controllers/Contact/InvoiceController.php +++ b/app/Http/Controllers/Contact/InvoiceController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Contact/LoginController.php b/app/Http/Controllers/Contact/LoginController.php index 8bfe2a7a0..792b51191 100644 --- a/app/Http/Controllers/Contact/LoginController.php +++ b/app/Http/Controllers/Contact/LoginController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 55b86c606..eed57d149 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 091a30360..ecb3acc5b 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/GroupSettingController.php b/app/Http/Controllers/GroupSettingController.php index f1b8fd36c..c0fab0ad4 100644 --- a/app/Http/Controllers/GroupSettingController.php +++ b/app/Http/Controllers/GroupSettingController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index f46ea51fe..6266bdf11 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index dd1546a8e..ed53635ae 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 346322cae..83920a59f 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php index c1f6128da..d46786425 100644 --- a/app/Http/Controllers/ProductController.php +++ b/app/Http/Controllers/ProductController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index a3a741427..7c845adde 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/RecurringInvoiceController.php b/app/Http/Controllers/RecurringInvoiceController.php index 271f668bd..a90a8d4e1 100644 --- a/app/Http/Controllers/RecurringInvoiceController.php +++ b/app/Http/Controllers/RecurringInvoiceController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/RecurringQuoteController.php b/app/Http/Controllers/RecurringQuoteController.php index a6ffc50ff..82ad2c48e 100644 --- a/app/Http/Controllers/RecurringQuoteController.php +++ b/app/Http/Controllers/RecurringQuoteController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 9c1dc0910..7a11e93b6 100644 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/TaxRateController.php b/app/Http/Controllers/TaxRateController.php index 183f9d114..039f0c0ee 100644 --- a/app/Http/Controllers/TaxRateController.php +++ b/app/Http/Controllers/TaxRateController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/TemplateController.php b/app/Http/Controllers/TemplateController.php index 4a0c75b8b..e2c7dba9b 100644 --- a/app/Http/Controllers/TemplateController.php +++ b/app/Http/Controllers/TemplateController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php index f4866a331..edb558f60 100644 --- a/app/Http/Controllers/Traits/VerifiesUserEmail.php +++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/TranslationController.php b/app/Http/Controllers/TranslationController.php index fe8ab33ea..a2741ab11 100644 --- a/app/Http/Controllers/TranslationController.php +++ b/app/Http/Controllers/TranslationController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ab048b92d..042e90420 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Controllers/UserProfileController.php b/app/Http/Controllers/UserProfileController.php index 19a16562a..ccd750e8c 100644 --- a/app/Http/Controllers/UserProfileController.php +++ b/app/Http/Controllers/UserProfileController.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 451bf8170..90699f8b3 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/ApiSecretCheck.php b/app/Http/Middleware/ApiSecretCheck.php index 0747ff811..e964e42e4 100644 --- a/app/Http/Middleware/ApiSecretCheck.php +++ b/app/Http/Middleware/ApiSecretCheck.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 2521f7078..98b026e6b 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php index 5a296a540..3346ac028 100644 --- a/app/Http/Middleware/CheckForMaintenanceMode.php +++ b/app/Http/Middleware/CheckForMaintenanceMode.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/ClientPortalEnabled.php b/app/Http/Middleware/ClientPortalEnabled.php index 55f459212..94dce6ca8 100644 --- a/app/Http/Middleware/ClientPortalEnabled.php +++ b/app/Http/Middleware/ClientPortalEnabled.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/ContactSetDb.php b/app/Http/Middleware/ContactSetDb.php index 092020d2f..302f20450 100644 --- a/app/Http/Middleware/ContactSetDb.php +++ b/app/Http/Middleware/ContactSetDb.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/ContactTokenAuth.php b/app/Http/Middleware/ContactTokenAuth.php index 1f0d56ba6..08392b016 100644 --- a/app/Http/Middleware/ContactTokenAuth.php +++ b/app/Http/Middleware/ContactTokenAuth.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index e969b3a47..400e0af7f 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/PasswordProtection.php b/app/Http/Middleware/PasswordProtection.php index ee9f308cc..2efe9c74a 100644 --- a/app/Http/Middleware/PasswordProtection.php +++ b/app/Http/Middleware/PasswordProtection.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -36,7 +36,7 @@ class PasswordProtection ]; if ($request->header('X-API-PASSWORD')) { - if ($request->header('X-API-PASSWORD') != auth()->user()->password) { + if (!Hash::check($request->header('X-API-PASSWORD'), auth()->user()->password)) { return response()->json($error, 403); } } elseif (Cache::get(auth()->user()->email."_logged_in")) { diff --git a/app/Http/Middleware/QueryLogging.php b/app/Http/Middleware/QueryLogging.php index e4c84cc88..bae6d524a 100644 --- a/app/Http/Middleware/QueryLogging.php +++ b/app/Http/Middleware/QueryLogging.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index a3805acae..b8ced8331 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/SetDb.php b/app/Http/Middleware/SetDb.php index 6a0abe80c..4dccaf4ac 100644 --- a/app/Http/Middleware/SetDb.php +++ b/app/Http/Middleware/SetDb.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/SetDomainNameDb.php b/app/Http/Middleware/SetDomainNameDb.php index 4d8b78f49..f9ce79510 100644 --- a/app/Http/Middleware/SetDomainNameDb.php +++ b/app/Http/Middleware/SetDomainNameDb.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/SetEmailDb.php b/app/Http/Middleware/SetEmailDb.php index 349692674..03c4320ed 100644 --- a/app/Http/Middleware/SetEmailDb.php +++ b/app/Http/Middleware/SetEmailDb.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/SetInviteDb.php b/app/Http/Middleware/SetInviteDb.php index 518c9a0ba..4f9bc5c6e 100644 --- a/app/Http/Middleware/SetInviteDb.php +++ b/app/Http/Middleware/SetInviteDb.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/StartupCheck.php b/app/Http/Middleware/StartupCheck.php index a10e6f03c..c8ce3c08a 100644 --- a/app/Http/Middleware/StartupCheck.php +++ b/app/Http/Middleware/StartupCheck.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/TokenAuth.php b/app/Http/Middleware/TokenAuth.php index 6843f6eec..eee270c4b 100644 --- a/app/Http/Middleware/TokenAuth.php +++ b/app/Http/Middleware/TokenAuth.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php index 4f009cdc3..a398e4c12 100644 --- a/app/Http/Middleware/TrimStrings.php +++ b/app/Http/Middleware/TrimStrings.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 0bf3132db..4ee5b1149 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/UrlSetDb.php b/app/Http/Middleware/UrlSetDb.php index 6b21d683f..85e531618 100644 --- a/app/Http/Middleware/UrlSetDb.php +++ b/app/Http/Middleware/UrlSetDb.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index d56c36644..89fd64e33 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Account/CreateAccountRequest.php b/app/Http/Requests/Account/CreateAccountRequest.php index 288a0ba2a..298e28c3e 100644 --- a/app/Http/Requests/Account/CreateAccountRequest.php +++ b/app/Http/Requests/Account/CreateAccountRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Activity/ShowActivityRequest.php b/app/Http/Requests/Activity/ShowActivityRequest.php index 13f7306b5..959bb5120 100644 --- a/app/Http/Requests/Activity/ShowActivityRequest.php +++ b/app/Http/Requests/Activity/ShowActivityRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Client/CreateClientRequest.php b/app/Http/Requests/Client/CreateClientRequest.php index 1e7d4ffd9..f66679c00 100644 --- a/app/Http/Requests/Client/CreateClientRequest.php +++ b/app/Http/Requests/Client/CreateClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Client/DestroyClientRequest.php b/app/Http/Requests/Client/DestroyClientRequest.php index 2f5890db9..ecdbf6919 100644 --- a/app/Http/Requests/Client/DestroyClientRequest.php +++ b/app/Http/Requests/Client/DestroyClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Client/EditClientRequest.php b/app/Http/Requests/Client/EditClientRequest.php index ed392ee90..df08ada7f 100644 --- a/app/Http/Requests/Client/EditClientRequest.php +++ b/app/Http/Requests/Client/EditClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Client/ShowClientRequest.php b/app/Http/Requests/Client/ShowClientRequest.php index 8a0e1c2e4..2012ee8a4 100644 --- a/app/Http/Requests/Client/ShowClientRequest.php +++ b/app/Http/Requests/Client/ShowClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Client/StoreClientRequest.php b/app/Http/Requests/Client/StoreClientRequest.php index ab9dd6ef1..8a7c6d611 100644 --- a/app/Http/Requests/Client/StoreClientRequest.php +++ b/app/Http/Requests/Client/StoreClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Client/UpdateClientRequest.php b/app/Http/Requests/Client/UpdateClientRequest.php index 07eb49d58..5bc9afe6d 100644 --- a/app/Http/Requests/Client/UpdateClientRequest.php +++ b/app/Http/Requests/Client/UpdateClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php b/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php index 0220d5299..150138928 100644 --- a/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php +++ b/app/Http/Requests/ClientPortal/ShowInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php b/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php index 1fe08d43c..62dae1377 100644 --- a/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php +++ b/app/Http/Requests/ClientPortal/ShowRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/ClientPortal/StoreDocumentRequest.php b/app/Http/Requests/ClientPortal/StoreDocumentRequest.php index 3b7bcfb3c..9ccdd18a8 100644 --- a/app/Http/Requests/ClientPortal/StoreDocumentRequest.php +++ b/app/Http/Requests/ClientPortal/StoreDocumentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/ClientPortal/UpdateClientRequest.php b/app/Http/Requests/ClientPortal/UpdateClientRequest.php index f7b26bde7..de0b8c9c7 100644 --- a/app/Http/Requests/ClientPortal/UpdateClientRequest.php +++ b/app/Http/Requests/ClientPortal/UpdateClientRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/ClientPortal/UpdateContactRequest.php b/app/Http/Requests/ClientPortal/UpdateContactRequest.php index 1a0a113f3..282b55abc 100644 --- a/app/Http/Requests/ClientPortal/UpdateContactRequest.php +++ b/app/Http/Requests/ClientPortal/UpdateContactRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Company/CreateCompanyRequest.php b/app/Http/Requests/Company/CreateCompanyRequest.php index 137cc2d12..c7fc0df2b 100644 --- a/app/Http/Requests/Company/CreateCompanyRequest.php +++ b/app/Http/Requests/Company/CreateCompanyRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Company/DestroyCompanyRequest.php b/app/Http/Requests/Company/DestroyCompanyRequest.php index 715394dae..6613b6ca9 100644 --- a/app/Http/Requests/Company/DestroyCompanyRequest.php +++ b/app/Http/Requests/Company/DestroyCompanyRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Company/EditCompanyRequest.php b/app/Http/Requests/Company/EditCompanyRequest.php index 525d33c1a..28befc00a 100644 --- a/app/Http/Requests/Company/EditCompanyRequest.php +++ b/app/Http/Requests/Company/EditCompanyRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Company/ShowCompanyRequest.php b/app/Http/Requests/Company/ShowCompanyRequest.php index ff65b17cb..affd4f7d4 100644 --- a/app/Http/Requests/Company/ShowCompanyRequest.php +++ b/app/Http/Requests/Company/ShowCompanyRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Company/StoreCompanyRequest.php b/app/Http/Requests/Company/StoreCompanyRequest.php index da723f53d..e45630c8c 100644 --- a/app/Http/Requests/Company/StoreCompanyRequest.php +++ b/app/Http/Requests/Company/StoreCompanyRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Company/UpdateCompanyRequest.php b/app/Http/Requests/Company/UpdateCompanyRequest.php index 5499d6262..28e14f4b1 100644 --- a/app/Http/Requests/Company/UpdateCompanyRequest.php +++ b/app/Http/Requests/Company/UpdateCompanyRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php index 12429bab3..65316a38b 100644 --- a/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/CreateCompanyGatewayRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php index fee928c43..015ee9070 100644 --- a/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/DestroyCompanyGatewayRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php index 3f691b6ae..0bc18c742 100644 --- a/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/EditCompanyGatewayRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php index 8d9240b8a..c2bdc0eb2 100644 --- a/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/ShowCompanyGatewayRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php index e7941f459..47513d4f4 100644 --- a/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/StoreCompanyGatewayRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php index 5749ef0a5..cf7107b80 100644 --- a/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php +++ b/app/Http/Requests/CompanyGateway/UpdateCompanyGatewayRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php index 34d52ccaa..f9ddb53eb 100644 --- a/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/CreateGroupSettingRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php b/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php index 55c5640af..903c682f8 100644 --- a/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/DestroyGroupSettingRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php b/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php index da191fd69..1a63aad84 100644 --- a/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/EditGroupSettingRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php b/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php index 4021ac8a7..4405d70bc 100644 --- a/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/ShowGroupSettingRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php index 45688fafd..4c2f9b9b3 100644 --- a/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/StoreGroupSettingRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php index b9d1d8e93..5a286999f 100644 --- a/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php +++ b/app/Http/Requests/GroupSetting/UpdateGroupSettingRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/ActionInvoiceRequest.php b/app/Http/Requests/Invoice/ActionInvoiceRequest.php index 843654c4e..018e6062a 100644 --- a/app/Http/Requests/Invoice/ActionInvoiceRequest.php +++ b/app/Http/Requests/Invoice/ActionInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/CreateInvoiceRequest.php b/app/Http/Requests/Invoice/CreateInvoiceRequest.php index 425d56b52..f80abbea2 100644 --- a/app/Http/Requests/Invoice/CreateInvoiceRequest.php +++ b/app/Http/Requests/Invoice/CreateInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/DestroyInvoiceRequest.php b/app/Http/Requests/Invoice/DestroyInvoiceRequest.php index 4957b167e..2a7455ead 100644 --- a/app/Http/Requests/Invoice/DestroyInvoiceRequest.php +++ b/app/Http/Requests/Invoice/DestroyInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/EditInvoiceRequest.php b/app/Http/Requests/Invoice/EditInvoiceRequest.php index c268cd274..ae679dd69 100644 --- a/app/Http/Requests/Invoice/EditInvoiceRequest.php +++ b/app/Http/Requests/Invoice/EditInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/ShowInvoiceRequest.php b/app/Http/Requests/Invoice/ShowInvoiceRequest.php index 15afbf323..4121dd12a 100644 --- a/app/Http/Requests/Invoice/ShowInvoiceRequest.php +++ b/app/Http/Requests/Invoice/ShowInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/StoreInvoiceRequest.php b/app/Http/Requests/Invoice/StoreInvoiceRequest.php index d17f1e970..db65ca870 100644 --- a/app/Http/Requests/Invoice/StoreInvoiceRequest.php +++ b/app/Http/Requests/Invoice/StoreInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php index 133540fe1..d42127423 100644 --- a/app/Http/Requests/Invoice/UpdateInvoiceRequest.php +++ b/app/Http/Requests/Invoice/UpdateInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/ActionPaymentRequest.php b/app/Http/Requests/Payment/ActionPaymentRequest.php index a69312b5a..d0aacd23f 100644 --- a/app/Http/Requests/Payment/ActionPaymentRequest.php +++ b/app/Http/Requests/Payment/ActionPaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/CreatePaymentRequest.php b/app/Http/Requests/Payment/CreatePaymentRequest.php index 7385b356b..0cca1ff08 100644 --- a/app/Http/Requests/Payment/CreatePaymentRequest.php +++ b/app/Http/Requests/Payment/CreatePaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/DestroyPaymentRequest.php b/app/Http/Requests/Payment/DestroyPaymentRequest.php index cfafcb269..f1bf3122e 100644 --- a/app/Http/Requests/Payment/DestroyPaymentRequest.php +++ b/app/Http/Requests/Payment/DestroyPaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/EditPaymentRequest.php b/app/Http/Requests/Payment/EditPaymentRequest.php index ef0490f4c..374bc5d26 100644 --- a/app/Http/Requests/Payment/EditPaymentRequest.php +++ b/app/Http/Requests/Payment/EditPaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/ShowPaymentRequest.php b/app/Http/Requests/Payment/ShowPaymentRequest.php index 6cdcbc5d6..80541d34f 100644 --- a/app/Http/Requests/Payment/ShowPaymentRequest.php +++ b/app/Http/Requests/Payment/ShowPaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/StorePaymentRequest.php b/app/Http/Requests/Payment/StorePaymentRequest.php index 3f5b10ae2..efd242ae8 100644 --- a/app/Http/Requests/Payment/StorePaymentRequest.php +++ b/app/Http/Requests/Payment/StorePaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Payment/UpdatePaymentRequest.php b/app/Http/Requests/Payment/UpdatePaymentRequest.php index a4f82ac93..2ac08e514 100644 --- a/app/Http/Requests/Payment/UpdatePaymentRequest.php +++ b/app/Http/Requests/Payment/UpdatePaymentRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -35,10 +35,7 @@ class UpdatePaymentRequest extends Request { return [ 'documents' => 'mimes:png,ai,svg,jpeg,tiff,pdf,gif,psd,txt,doc,xls,ppt,xlsx,docx,pptx', - 'client_id' => 'integer|nullable', - 'type_id' => 'integer|nullable', - 'amount' => 'numeric', - 'date' => 'required', + 'client_id' => 'required', ]; } } diff --git a/app/Http/Requests/Product/CreateProductRequest.php b/app/Http/Requests/Product/CreateProductRequest.php index 207dd5ff6..df9ee2938 100644 --- a/app/Http/Requests/Product/CreateProductRequest.php +++ b/app/Http/Requests/Product/CreateProductRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Product/EditProductRequest.php b/app/Http/Requests/Product/EditProductRequest.php index e613ad17c..8fa07d752 100644 --- a/app/Http/Requests/Product/EditProductRequest.php +++ b/app/Http/Requests/Product/EditProductRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Product/ShowProductRequest.php b/app/Http/Requests/Product/ShowProductRequest.php index 919a88cb5..46971e98e 100644 --- a/app/Http/Requests/Product/ShowProductRequest.php +++ b/app/Http/Requests/Product/ShowProductRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Product/StoreProductRequest.php b/app/Http/Requests/Product/StoreProductRequest.php index 49361848d..a50b76513 100644 --- a/app/Http/Requests/Product/StoreProductRequest.php +++ b/app/Http/Requests/Product/StoreProductRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Product/UpdateProductRequest.php b/app/Http/Requests/Product/UpdateProductRequest.php index 743057037..3d67b871e 100644 --- a/app/Http/Requests/Product/UpdateProductRequest.php +++ b/app/Http/Requests/Product/UpdateProductRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/ActionQuoteRequest.php b/app/Http/Requests/Quote/ActionQuoteRequest.php index 570d46428..befb247f2 100644 --- a/app/Http/Requests/Quote/ActionQuoteRequest.php +++ b/app/Http/Requests/Quote/ActionQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/CreateQuoteRequest.php b/app/Http/Requests/Quote/CreateQuoteRequest.php index f4c229393..d0fae300a 100644 --- a/app/Http/Requests/Quote/CreateQuoteRequest.php +++ b/app/Http/Requests/Quote/CreateQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/DestroyQuoteRequest.php b/app/Http/Requests/Quote/DestroyQuoteRequest.php index 91d185488..88d93663b 100644 --- a/app/Http/Requests/Quote/DestroyQuoteRequest.php +++ b/app/Http/Requests/Quote/DestroyQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/EditQuoteRequest.php b/app/Http/Requests/Quote/EditQuoteRequest.php index 3b1552329..94ebc46c9 100644 --- a/app/Http/Requests/Quote/EditQuoteRequest.php +++ b/app/Http/Requests/Quote/EditQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/ShowQuoteRequest.php b/app/Http/Requests/Quote/ShowQuoteRequest.php index d7d6ad36b..7940868b3 100644 --- a/app/Http/Requests/Quote/ShowQuoteRequest.php +++ b/app/Http/Requests/Quote/ShowQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/StoreQuoteRequest.php b/app/Http/Requests/Quote/StoreQuoteRequest.php index 2169e23c0..ae0dbd87d 100644 --- a/app/Http/Requests/Quote/StoreQuoteRequest.php +++ b/app/Http/Requests/Quote/StoreQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Quote/UpdateQuoteRequest.php b/app/Http/Requests/Quote/UpdateQuoteRequest.php index 4538bd7cb..18aedba9c 100644 --- a/app/Http/Requests/Quote/UpdateQuoteRequest.php +++ b/app/Http/Requests/Quote/UpdateQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php index 9555dae5f..7521ef3a1 100644 --- a/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/ActionRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/CreateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/CreateRecurringInvoiceRequest.php index 7ca35b66c..b2bc25a75 100644 --- a/app/Http/Requests/RecurringInvoice/CreateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/CreateRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php index 3f8bf1ca3..7ab727210 100644 --- a/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/DestroyRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php index a4c00e982..3d3e9aadc 100644 --- a/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/EditRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php index 2d21e60c5..8a4a9a69a 100644 --- a/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/ShowRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php index 8bbb20eae..ccc98188b 100644 --- a/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/StoreRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php index 9dfc1a5b1..5a57576c6 100644 --- a/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php +++ b/app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php index 4466284ba..405bcbc3b 100644 --- a/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/ActionRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/CreateRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/CreateRecurringQuoteRequest.php index 1267cf016..dc7218f8d 100644 --- a/app/Http/Requests/RecurringQuote/CreateRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/CreateRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php index e5d0ef756..07286d37b 100644 --- a/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/DestroyRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php index 92bbcbea4..bfbf02947 100644 --- a/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/EditRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php index 5aae595c8..0d28df3d8 100644 --- a/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/ShowRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php index d9ca38404..d73ccdcbe 100644 --- a/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/StoreRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php index e3cad6ccf..1cf0eab88 100644 --- a/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php +++ b/app/Http/Requests/RecurringQuote/UpdateRecurringQuoteRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/Request.php b/app/Http/Requests/Request.php index fb6e17cd0..4857b0874 100644 --- a/app/Http/Requests/Request.php +++ b/app/Http/Requests/Request.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/TaxRate/CreateTaxRateRequest.php b/app/Http/Requests/TaxRate/CreateTaxRateRequest.php index b1c872aa8..464b86728 100644 --- a/app/Http/Requests/TaxRate/CreateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/CreateTaxRateRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/TaxRate/DestroyTaxRateRequest.php b/app/Http/Requests/TaxRate/DestroyTaxRateRequest.php index f9887f53c..2ac6a7396 100644 --- a/app/Http/Requests/TaxRate/DestroyTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/DestroyTaxRateRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/TaxRate/EditTaxRateRequest.php b/app/Http/Requests/TaxRate/EditTaxRateRequest.php index cda60db0f..ecfdec9cd 100644 --- a/app/Http/Requests/TaxRate/EditTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/EditTaxRateRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/TaxRate/ShowTaxRateRequest.php b/app/Http/Requests/TaxRate/ShowTaxRateRequest.php index 97c92aada..31816f0d5 100644 --- a/app/Http/Requests/TaxRate/ShowTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/ShowTaxRateRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/TaxRate/StoreTaxRateRequest.php b/app/Http/Requests/TaxRate/StoreTaxRateRequest.php index d1d6ab58e..e9a6d2d64 100644 --- a/app/Http/Requests/TaxRate/StoreTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/StoreTaxRateRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php index f96e98630..5e6a1927d 100644 --- a/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php +++ b/app/Http/Requests/TaxRate/UpdateTaxRateRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/AttachCompanyUserRequest.php b/app/Http/Requests/User/AttachCompanyUserRequest.php index f64f7e10c..7cf74cb09 100644 --- a/app/Http/Requests/User/AttachCompanyUserRequest.php +++ b/app/Http/Requests/User/AttachCompanyUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/CreateUserRequest.php b/app/Http/Requests/User/CreateUserRequest.php index 8b2d775b6..df7c8325e 100644 --- a/app/Http/Requests/User/CreateUserRequest.php +++ b/app/Http/Requests/User/CreateUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/DestroyUserRequest.php b/app/Http/Requests/User/DestroyUserRequest.php index 30c9bad3c..b917f6331 100644 --- a/app/Http/Requests/User/DestroyUserRequest.php +++ b/app/Http/Requests/User/DestroyUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/DetachCompanyUserRequest.php b/app/Http/Requests/User/DetachCompanyUserRequest.php index bdc4ff1cc..75b53c293 100644 --- a/app/Http/Requests/User/DetachCompanyUserRequest.php +++ b/app/Http/Requests/User/DetachCompanyUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/EditUserRequest.php b/app/Http/Requests/User/EditUserRequest.php index 3d3248157..9d82de767 100644 --- a/app/Http/Requests/User/EditUserRequest.php +++ b/app/Http/Requests/User/EditUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/ShowUserRequest.php b/app/Http/Requests/User/ShowUserRequest.php index 51b45923e..66108c985 100644 --- a/app/Http/Requests/User/ShowUserRequest.php +++ b/app/Http/Requests/User/ShowUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php index 2ae504d13..aa8f8f3f0 100644 --- a/app/Http/Requests/User/StoreUserRequest.php +++ b/app/Http/Requests/User/StoreUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php index d28f99093..364bc803b 100644 --- a/app/Http/Requests/User/UpdateUserRequest.php +++ b/app/Http/Requests/User/UpdateUserRequest.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/NewUniqueUserRule.php b/app/Http/ValidationRules/NewUniqueUserRule.php index 53545bf5e..c8165ed32 100644 --- a/app/Http/ValidationRules/NewUniqueUserRule.php +++ b/app/Http/ValidationRules/NewUniqueUserRule.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/UniqueUserRule.php b/app/Http/ValidationRules/UniqueUserRule.php index b4855905e..d038b7870 100644 --- a/app/Http/ValidationRules/UniqueUserRule.php +++ b/app/Http/ValidationRules/UniqueUserRule.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/ValidClientGroupSettingsRule.php b/app/Http/ValidationRules/ValidClientGroupSettingsRule.php index 4df868050..006b06784 100644 --- a/app/Http/ValidationRules/ValidClientGroupSettingsRule.php +++ b/app/Http/ValidationRules/ValidClientGroupSettingsRule.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/ValidCompanyGatewayFeesAndLimitsRule.php b/app/Http/ValidationRules/ValidCompanyGatewayFeesAndLimitsRule.php index 1fb48de90..fcc7ea6b3 100644 --- a/app/Http/ValidationRules/ValidCompanyGatewayFeesAndLimitsRule.php +++ b/app/Http/ValidationRules/ValidCompanyGatewayFeesAndLimitsRule.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/ValidPayableInvoicesRule.php b/app/Http/ValidationRules/ValidPayableInvoicesRule.php index 7d1256e1b..52f0940fa 100644 --- a/app/Http/ValidationRules/ValidPayableInvoicesRule.php +++ b/app/Http/ValidationRules/ValidPayableInvoicesRule.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/ValidSettingsRule.php b/app/Http/ValidationRules/ValidSettingsRule.php index 5e0d634a3..388a63328 100644 --- a/app/Http/ValidationRules/ValidSettingsRule.php +++ b/app/Http/ValidationRules/ValidSettingsRule.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ValidationRules/ValidUserForCompany.php b/app/Http/ValidationRules/ValidUserForCompany.php index 0c9168b5c..398d9e8df 100644 --- a/app/Http/ValidationRules/ValidUserForCompany.php +++ b/app/Http/ValidationRules/ValidUserForCompany.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ViewComposers/HeaderComposer.php b/app/Http/ViewComposers/HeaderComposer.php index 4e657ac5b..3fe1efb54 100644 --- a/app/Http/ViewComposers/HeaderComposer.php +++ b/app/Http/ViewComposers/HeaderComposer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ViewComposers/PortalComposer.php b/app/Http/ViewComposers/PortalComposer.php index 6d0caf628..1ccce4925 100644 --- a/app/Http/ViewComposers/PortalComposer.php +++ b/app/Http/ViewComposers/PortalComposer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Http/ViewComposers/TranslationComposer.php b/app/Http/ViewComposers/TranslationComposer.php index e426d1f78..6f56b5e8a 100644 --- a/app/Http/ViewComposers/TranslationComposer.php +++ b/app/Http/ViewComposers/TranslationComposer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Account/CreateAccount.php b/app/Jobs/Account/CreateAccount.php index dec11a211..1a3612c85 100644 --- a/app/Jobs/Account/CreateAccount.php +++ b/app/Jobs/Account/CreateAccount.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Client/UpdateClientBalance.php b/app/Jobs/Client/UpdateClientBalance.php index 07884bed8..da2201357 100644 --- a/app/Jobs/Client/UpdateClientBalance.php +++ b/app/Jobs/Client/UpdateClientBalance.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Client/UpdateClientPaidToDate.php b/app/Jobs/Client/UpdateClientPaidToDate.php index 9f308b4b4..d1d184deb 100644 --- a/app/Jobs/Client/UpdateClientPaidToDate.php +++ b/app/Jobs/Client/UpdateClientPaidToDate.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Company/CreateCompany.php b/app/Jobs/Company/CreateCompany.php index 6ab42cef4..dcd7e2be1 100644 --- a/app/Jobs/Company/CreateCompany.php +++ b/app/Jobs/Company/CreateCompany.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Company/CreateCompanyToken.php b/app/Jobs/Company/CreateCompanyToken.php index b9d8ce2d7..1a68f66f2 100644 --- a/app/Jobs/Company/CreateCompanyToken.php +++ b/app/Jobs/Company/CreateCompanyToken.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Company/UpdateCompanyLedgerWithInvoice.php b/app/Jobs/Company/UpdateCompanyLedgerWithInvoice.php index 9356e2234..390ae5368 100644 --- a/app/Jobs/Company/UpdateCompanyLedgerWithInvoice.php +++ b/app/Jobs/Company/UpdateCompanyLedgerWithInvoice.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Company/UpdateCompanyLedgerWithPayment.php b/app/Jobs/Company/UpdateCompanyLedgerWithPayment.php index c55376681..1b61202e4 100644 --- a/app/Jobs/Company/UpdateCompanyLedgerWithPayment.php +++ b/app/Jobs/Company/UpdateCompanyLedgerWithPayment.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Cron/RecurringInvoicesCron.php b/app/Jobs/Cron/RecurringInvoicesCron.php index 1065e6774..7f40088f4 100644 --- a/app/Jobs/Cron/RecurringInvoicesCron.php +++ b/app/Jobs/Cron/RecurringInvoicesCron.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invitation/MarkOpened.php b/app/Jobs/Invitation/MarkOpened.php index d57e2e4f1..c2a7bf894 100644 --- a/app/Jobs/Invitation/MarkOpened.php +++ b/app/Jobs/Invitation/MarkOpened.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/ApplyClientPayment.php b/app/Jobs/Invoice/ApplyClientPayment.php index 18b2ced27..32b97cf93 100644 --- a/app/Jobs/Invoice/ApplyClientPayment.php +++ b/app/Jobs/Invoice/ApplyClientPayment.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/ApplyInvoiceNumber.php b/app/Jobs/Invoice/ApplyInvoiceNumber.php index 3542c4206..f142f7909 100644 --- a/app/Jobs/Invoice/ApplyInvoiceNumber.php +++ b/app/Jobs/Invoice/ApplyInvoiceNumber.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/ApplyInvoicePayment.php b/app/Jobs/Invoice/ApplyInvoicePayment.php index a48aa437a..95819576c 100644 --- a/app/Jobs/Invoice/ApplyInvoicePayment.php +++ b/app/Jobs/Invoice/ApplyInvoicePayment.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -100,9 +100,7 @@ class ApplyInvoicePayment implements ShouldQueue $this->invoice->clearPartial(); $this->invoice->updateBalance($this->amount*-1); } - - $this->invoice->save(); - + /* Update Payment Applied Amount*/ $this->payment->applied += $this->amount; $this->payment->save(); diff --git a/app/Jobs/Invoice/ApplyPaymentToInvoice.php b/app/Jobs/Invoice/ApplyPaymentToInvoice.php index 3adfea8d6..38f84150f 100644 --- a/app/Jobs/Invoice/ApplyPaymentToInvoice.php +++ b/app/Jobs/Invoice/ApplyPaymentToInvoice.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/CreateInvoiceInvitations.php b/app/Jobs/Invoice/CreateInvoiceInvitations.php index 3cc8310e2..87931d313 100644 --- a/app/Jobs/Invoice/CreateInvoiceInvitations.php +++ b/app/Jobs/Invoice/CreateInvoiceInvitations.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php index 74d9953ee..aac6feddd 100644 --- a/app/Jobs/Invoice/CreateInvoicePdf.php +++ b/app/Jobs/Invoice/CreateInvoicePdf.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/EmailInvoice.php b/app/Jobs/Invoice/EmailInvoice.php index 85ee18670..80b0e95f7 100644 --- a/app/Jobs/Invoice/EmailInvoice.php +++ b/app/Jobs/Invoice/EmailInvoice.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/InvoiceNotification.php b/app/Jobs/Invoice/InvoiceNotification.php index f710e1032..dd3110903 100644 --- a/app/Jobs/Invoice/InvoiceNotification.php +++ b/app/Jobs/Invoice/InvoiceNotification.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/MarkInvoicePaid.php b/app/Jobs/Invoice/MarkInvoicePaid.php index 5ccf42c32..f1001101b 100644 --- a/app/Jobs/Invoice/MarkInvoicePaid.php +++ b/app/Jobs/Invoice/MarkInvoicePaid.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/ReverseInvoicePayment.php b/app/Jobs/Invoice/ReverseInvoicePayment.php index c50945f66..28f880ab4 100644 --- a/app/Jobs/Invoice/ReverseInvoicePayment.php +++ b/app/Jobs/Invoice/ReverseInvoicePayment.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/StoreInvoice.php b/app/Jobs/Invoice/StoreInvoice.php index 782590c9d..287bb699d 100644 --- a/app/Jobs/Invoice/StoreInvoice.php +++ b/app/Jobs/Invoice/StoreInvoice.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Invoice/UpdateInvoicePayment.php b/app/Jobs/Invoice/UpdateInvoicePayment.php index 7fc8b95e9..64c953b05 100644 --- a/app/Jobs/Invoice/UpdateInvoicePayment.php +++ b/app/Jobs/Invoice/UpdateInvoicePayment.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Payment/PaymentNotification.php b/app/Jobs/Payment/PaymentNotification.php index ea7f8d2fb..dee4f9790 100644 --- a/app/Jobs/Payment/PaymentNotification.php +++ b/app/Jobs/Payment/PaymentNotification.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php index 46add4a55..82016d166 100644 --- a/app/Jobs/Product/UpdateOrCreateProduct.php +++ b/app/Jobs/Product/UpdateOrCreateProduct.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Quote/ApplyQuoteNumber.php b/app/Jobs/Quote/ApplyQuoteNumber.php index 06ce21b0d..7660cdcde 100644 --- a/app/Jobs/Quote/ApplyQuoteNumber.php +++ b/app/Jobs/Quote/ApplyQuoteNumber.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Quote Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Quote Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Quote/CreateQuoteInvitations.php b/app/Jobs/Quote/CreateQuoteInvitations.php index 09caa5d94..d3f817231 100644 --- a/app/Jobs/Quote/CreateQuoteInvitations.php +++ b/app/Jobs/Quote/CreateQuoteInvitations.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Quote Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Quote Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 1a8801d2c..ddff73891 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/User/CreateUser.php b/app/Jobs/User/CreateUser.php index 7acef0fc2..2a18225ed 100644 --- a/app/Jobs/User/CreateUser.php +++ b/app/Jobs/User/CreateUser.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Util/SystemLogger.php b/app/Jobs/Util/SystemLogger.php index 9be35e866..d7036ddee 100644 --- a/app/Jobs/Util/SystemLogger.php +++ b/app/Jobs/Util/SystemLogger.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Util/UploadAvatar.php b/app/Jobs/Util/UploadAvatar.php index e4f0c499a..033907df6 100644 --- a/app/Jobs/Util/UploadAvatar.php +++ b/app/Jobs/Util/UploadAvatar.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Jobs/Util/UploadFile.php b/app/Jobs/Util/UploadFile.php index 9462cb5db..30cddeb10 100644 --- a/app/Jobs/Util/UploadFile.php +++ b/app/Jobs/Util/UploadFile.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Libraries/MultiDB.php b/app/Libraries/MultiDB.php index e2581f2b7..f73758867 100644 --- a/app/Libraries/MultiDB.php +++ b/app/Libraries/MultiDB.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Libraries/OAuth.php b/app/Libraries/OAuth.php index eb923245f..c2d977452 100644 --- a/app/Libraries/OAuth.php +++ b/app/Libraries/OAuth.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Libraries/OAuth/OAuth.php b/app/Libraries/OAuth/OAuth.php index 81c413ec5..2c4d83fc2 100644 --- a/app/Libraries/OAuth/OAuth.php +++ b/app/Libraries/OAuth/OAuth.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Libraries/OFX.php b/app/Libraries/OFX.php index c773c5903..04c3662b2 100644 --- a/app/Libraries/OFX.php +++ b/app/Libraries/OFX.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Activity/CreatedClientActivity.php b/app/Listeners/Activity/CreatedClientActivity.php index a2d7aeb8c..e12d29f5c 100644 --- a/app/Listeners/Activity/CreatedClientActivity.php +++ b/app/Listeners/Activity/CreatedClientActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Activity/PaymentCreatedActivity.php b/app/Listeners/Activity/PaymentCreatedActivity.php index f06698404..52e1434c6 100644 --- a/app/Listeners/Activity/PaymentCreatedActivity.php +++ b/app/Listeners/Activity/PaymentCreatedActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Activity/PaymentDeletedActivity.php b/app/Listeners/Activity/PaymentDeletedActivity.php index 9196b3083..b37b05ffa 100644 --- a/app/Listeners/Activity/PaymentDeletedActivity.php +++ b/app/Listeners/Activity/PaymentDeletedActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Contact/UpdateContactLastLogin.php b/app/Listeners/Contact/UpdateContactLastLogin.php index 217cc402a..a1fb9c14a 100644 --- a/app/Listeners/Contact/UpdateContactLastLogin.php +++ b/app/Listeners/Contact/UpdateContactLastLogin.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/CreateInvoiceActivity.php b/app/Listeners/Invoice/CreateInvoiceActivity.php index 00ac39e26..dc4af0a69 100644 --- a/app/Listeners/Invoice/CreateInvoiceActivity.php +++ b/app/Listeners/Invoice/CreateInvoiceActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/CreateInvoiceHtmlBackup.php b/app/Listeners/Invoice/CreateInvoiceHtmlBackup.php index 42efcc1de..4e015245d 100644 --- a/app/Listeners/Invoice/CreateInvoiceHtmlBackup.php +++ b/app/Listeners/Invoice/CreateInvoiceHtmlBackup.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/CreateInvoiceInvitation.php b/app/Listeners/Invoice/CreateInvoiceInvitation.php index 8efe56436..4aa1667bd 100644 --- a/app/Listeners/Invoice/CreateInvoiceInvitation.php +++ b/app/Listeners/Invoice/CreateInvoiceInvitation.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/CreateInvoicePdf.php b/app/Listeners/Invoice/CreateInvoicePdf.php index ecf3ce4d3..af88e7c57 100644 --- a/app/Listeners/Invoice/CreateInvoicePdf.php +++ b/app/Listeners/Invoice/CreateInvoicePdf.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/InvoiceEmailActivity.php b/app/Listeners/Invoice/InvoiceEmailActivity.php index 2c02e93d3..5d8c2e07d 100644 --- a/app/Listeners/Invoice/InvoiceEmailActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php index b5bb53557..f7c098fc7 100644 --- a/app/Listeners/Invoice/InvoiceEmailFailedActivity.php +++ b/app/Listeners/Invoice/InvoiceEmailFailedActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/UpdateInvoiceActivity.php b/app/Listeners/Invoice/UpdateInvoiceActivity.php index 5e198fe71..9c7a0cb04 100644 --- a/app/Listeners/Invoice/UpdateInvoiceActivity.php +++ b/app/Listeners/Invoice/UpdateInvoiceActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/Invoice/UpdateInvoiceInvitations.php b/app/Listeners/Invoice/UpdateInvoiceInvitations.php index 564098b59..835722990 100644 --- a/app/Listeners/Invoice/UpdateInvoiceInvitations.php +++ b/app/Listeners/Invoice/UpdateInvoiceInvitations.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/SendVerificationNotification.php b/app/Listeners/SendVerificationNotification.php index 454cec57c..65396b465 100644 --- a/app/Listeners/SendVerificationNotification.php +++ b/app/Listeners/SendVerificationNotification.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/User/ArchivedUserActivity.php b/app/Listeners/User/ArchivedUserActivity.php index 72c917047..5ee2f3d70 100644 --- a/app/Listeners/User/ArchivedUserActivity.php +++ b/app/Listeners/User/ArchivedUserActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/User/CreatedUserActivity.php b/app/Listeners/User/CreatedUserActivity.php index ca6f8174d..cb21c23c3 100644 --- a/app/Listeners/User/CreatedUserActivity.php +++ b/app/Listeners/User/CreatedUserActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/User/DeletedUserActivity.php b/app/Listeners/User/DeletedUserActivity.php index 0ea74bc19..974589242 100644 --- a/app/Listeners/User/DeletedUserActivity.php +++ b/app/Listeners/User/DeletedUserActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/User/RestoredUserActivity.php b/app/Listeners/User/RestoredUserActivity.php index 71f41a85c..a147be9c8 100644 --- a/app/Listeners/User/RestoredUserActivity.php +++ b/app/Listeners/User/RestoredUserActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/User/UpdateUserLastLogin.php b/app/Listeners/User/UpdateUserLastLogin.php index 407c48740..f63b567e1 100644 --- a/app/Listeners/User/UpdateUserLastLogin.php +++ b/app/Listeners/User/UpdateUserLastLogin.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Listeners/User/UpdatedUserActivity.php b/app/Listeners/User/UpdatedUserActivity.php index 4aeafd8c7..a126e62e4 100644 --- a/app/Listeners/User/UpdatedUserActivity.php +++ b/app/Listeners/User/UpdatedUserActivity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Mail/BouncedEmail.php b/app/Mail/BouncedEmail.php index 7b1bbcaad..7886967cb 100644 --- a/app/Mail/BouncedEmail.php +++ b/app/Mail/BouncedEmail.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Mail/VerifyUser.php b/app/Mail/VerifyUser.php index 442bbfe2f..13d458773 100644 --- a/app/Mail/VerifyUser.php +++ b/app/Mail/VerifyUser.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Account.php b/app/Models/Account.php index 8ebb60bcc..f79beeb15 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 99e9c49ca..155d6628d 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Backup.php b/app/Models/Backup.php index 1e634d92f..af3a164b0 100644 --- a/app/Models/Backup.php +++ b/app/Models/Backup.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Bank.php b/app/Models/Bank.php index 807263168..368e89ab5 100644 --- a/app/Models/Bank.php +++ b/app/Models/Bank.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/BankAccount.php b/app/Models/BankAccount.php index d4cb034a7..c43482d26 100644 --- a/app/Models/BankAccount.php +++ b/app/Models/BankAccount.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/BankSubaccount.php b/app/Models/BankSubaccount.php index 5b11c0cd5..c2f2f84b6 100644 --- a/app/Models/BankSubaccount.php +++ b/app/Models/BankSubaccount.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php index df5d61d27..8b07caf95 100644 --- a/app/Models/BaseModel.php +++ b/app/Models/BaseModel.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Client.php b/app/Models/Client.php index ec159d5dc..ae3e1c046 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/ClientContact.php b/app/Models/ClientContact.php index 329ee9656..3e629897a 100644 --- a/app/Models/ClientContact.php +++ b/app/Models/ClientContact.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/ClientGatewayToken.php b/app/Models/ClientGatewayToken.php index 4675317b0..ec823beb0 100644 --- a/app/Models/ClientGatewayToken.php +++ b/app/Models/ClientGatewayToken.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Company.php b/app/Models/Company.php index dbaaf5a3a..2175441dc 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -103,7 +103,7 @@ class Company extends BaseModel public function users() { - return $this->hasManyThrough(User::class, CompanyUser::class, 'company_id', 'id', 'id', 'user_id'); + return $this->hasManyThrough(User::class, CompanyUser::class, 'company_id', 'id', 'id', 'user_id')->withTimestamps(); } /** @@ -268,7 +268,7 @@ class Company extends BaseModel public function company_users() { - return $this->hasMany(CompanyUser::class); + return $this->hasMany(CompanyUser::class)->withTimestamps(); } public function owner() diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index e977687ba..26ece6645 100644 --- a/app/Models/CompanyGateway.php +++ b/app/Models/CompanyGateway.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/CompanyLedger.php b/app/Models/CompanyLedger.php index f23a72275..b74da766d 100644 --- a/app/Models/CompanyLedger.php +++ b/app/Models/CompanyLedger.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/CompanyToken.php b/app/Models/CompanyToken.php index 93e373caf..f10c369e7 100644 --- a/app/Models/CompanyToken.php +++ b/app/Models/CompanyToken.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/CompanyUser.php b/app/Models/CompanyUser.php index 1b3528d45..fc01ecfb2 100644 --- a/app/Models/CompanyUser.php +++ b/app/Models/CompanyUser.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Country.php b/app/Models/Country.php index 827a861ca..46d8d751e 100644 --- a/app/Models/Country.php +++ b/app/Models/Country.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Credit.php b/app/Models/Credit.php index 3bf25f801..7a8c3d513 100644 --- a/app/Models/Credit.php +++ b/app/Models/Credit.php @@ -4,13 +4,15 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ namespace App\Models; +use App\Helpers\Invoice\InvoiceSum; +use App\Helpers\Invoice\InvoiceSumInclusive; use App\Models\Filterable; use App\Utils\Traits\MakesDates; use App\Utils\Traits\MakesHash; @@ -24,14 +26,108 @@ class Credit extends BaseModel use MakesDates; use SoftDeletes; - + protected $fillable = [ + 'number', + 'discount', + 'po_number', + 'date', + 'due_date', + 'terms', + 'public_notes', + 'private_notes', + 'invoice_type_id', + 'tax_name1', + 'tax_rate1', + 'tax_name2', + 'tax_rate2', + 'tax_name3', + 'tax_rate3', + 'is_amount_discount', + 'footer', + 'partial', + 'partial_due_date', + 'custom_value1', + 'custom_value2', + 'custom_value3', + 'custom_value4', + 'line_items', + 'client_id', + 'footer', + ]; + + protected $casts = [ + 'line_items' => 'object', + 'updated_at' => 'timestamp', + 'created_at' => 'timestamp', + 'deleted_at' => 'timestamp', + ]; + + const STATUS_DRAFT = 1; + const STAUS_PARTIAL = 2; + const STATUS_APPLIED = 3; + public function assigned_user() { return $this->belongsTo(User::class, 'assigned_user_id', 'id'); } + public function company() + { + return $this->belongsTo(Company::class); + } + + public function user() + { + return $this->belongsTo(User::class)->withTrashed(); + } + + public function client() + { + return $this->belongsTo(Client::class)->withTrashed(); + } + + public function invitations() + { + return $this->hasMany(CreditInvitation::class); + } + + /** + * The invoice which the credit has been created from + */ + public function invoice() + { + return $this->belongsTo(Invoice::class); + } + + /** + * The invoice/s which the credit has + * been applied to. + */ public function invoices() { - return $this->morphToMany(Invoice::class, 'creditable'); + return $this->belongsToMany(Invoice::class)->using(Paymentable::class); + } + + public function payments() + { + return $this->morphToMany(Payment::class, 'paymentable'); + } + + /** + * Access the invoice calculator object + * + * @return object The invoice calculator object getters + */ + public function calc() + { + $credit_calc = null; + + if ($this->uses_inclusive_taxes) { + $credit_calc = new InvoiceSumInclusive($this); + } else { + $credit_calc = new InvoiceSum($this); + } + + return $credit_calc->build(); } } diff --git a/app/Models/CreditInvitation.php b/app/Models/CreditInvitation.php new file mode 100644 index 000000000..e10450743 --- /dev/null +++ b/app/Models/CreditInvitation.php @@ -0,0 +1,83 @@ +belongsTo(Credit::class)->withTrashed(); + } + + /** + * @return mixed + */ + public function contact() + { + return $this->belongsTo(ClientContact::class, 'client_contact_id', 'id')->withTrashed(); + } + + /** + * @return mixed + */ + public function user() + { + return $this->belongsTo(User::class)->withTrashed(); + } + + /** + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo + */ + public function company() + { + return $this->belongsTo(Company::class); + } + + public function getName() + { + return $this->key; + } + + public function markViewed() + { + $this->viewed_date = Carbon::now(); + $this->save(); + } +} diff --git a/app/Models/Creditable.php b/app/Models/Creditable.php deleted file mode 100644 index 565085b01..000000000 --- a/app/Models/Creditable.php +++ /dev/null @@ -1,19 +0,0 @@ -morphedByMany(Credit::class, 'creditable')->withPivot('amount'); + return $this->belongsToMany(Credit::class)->using(Paymentable::class); } diff --git a/app/Models/InvoiceInvitation.php b/app/Models/InvoiceInvitation.php index 669c13892..5bb294aff 100644 --- a/app/Models/InvoiceInvitation.php +++ b/app/Models/InvoiceInvitation.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -81,7 +81,7 @@ class InvoiceInvitation extends BaseModel public function getName() { - return $this->invitation_key; + return $this->key; } public function markViewed() diff --git a/app/Models/Language.php b/app/Models/Language.php index fd6ebe82b..77e411d01 100644 --- a/app/Models/Language.php +++ b/app/Models/Language.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Payment.php b/app/Models/Payment.php index 2356ecaac..a005816ea 100644 --- a/app/Models/Payment.php +++ b/app/Models/Payment.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -94,7 +94,12 @@ class Payment extends BaseModel public function invoices() { - return $this->morphedByMany(Invoice::class, 'paymentable')->withPivot('amount'); + return $this->morphedByMany(Invoice::class, 'paymentable')->withPivot('amount','refunded')->withTimestamps(); + } + + public function credits() + { + return $this->morphedByMany(Credit::class, 'paymentable')->withPivot('amount','refunded')->withTimestamps(); } public function company_ledger() diff --git a/app/Models/PaymentLibrary.php b/app/Models/PaymentLibrary.php index 9c8e11e3e..5175f6e9e 100644 --- a/app/Models/PaymentLibrary.php +++ b/app/Models/PaymentLibrary.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/PaymentTerm.php b/app/Models/PaymentTerm.php index d46a07b3d..e3ff02a80 100644 --- a/app/Models/PaymentTerm.php +++ b/app/Models/PaymentTerm.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php index 7bf5ca81b..6f07d00ee 100644 --- a/app/Models/PaymentType.php +++ b/app/Models/PaymentType.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Paymentable.php b/app/Models/Paymentable.php index e7b5060ca..a6d257631 100644 --- a/app/Models/Paymentable.php +++ b/app/Models/Paymentable.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -16,4 +16,18 @@ use Illuminate\Database\Eloquent\Relations\Pivot; class Paymentable extends Pivot { protected $table = 'paymentables'; + + //protected $dateFormat = 'Y-m-d H:i:s.u'; + + /** + * The attributes that should be cast to native types. + * + * @var array + */ + protected $casts = [ + 'updated_at' => 'timestamp', + 'created_at' => 'timestamp', + 'deleted_at' => 'timestamp', + 'settings' => 'object', + ]; } diff --git a/app/Models/Presenters/AccountPresenter.php b/app/Models/Presenters/AccountPresenter.php index 4caa06dfd..221bfbbaf 100644 --- a/app/Models/Presenters/AccountPresenter.php +++ b/app/Models/Presenters/AccountPresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Presenters/ClientContactPresenter.php b/app/Models/Presenters/ClientContactPresenter.php index 470159049..783980048 100644 --- a/app/Models/Presenters/ClientContactPresenter.php +++ b/app/Models/Presenters/ClientContactPresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Presenters/ClientPresenter.php b/app/Models/Presenters/ClientPresenter.php index 84b66f13f..e36866299 100644 --- a/app/Models/Presenters/ClientPresenter.php +++ b/app/Models/Presenters/ClientPresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index 7898a2d9f..7f309dfee 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Presenters/EntityPresenter.php b/app/Models/Presenters/EntityPresenter.php index f41fa6f77..797392393 100644 --- a/app/Models/Presenters/EntityPresenter.php +++ b/app/Models/Presenters/EntityPresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Presenters/InvoicePresenter.php b/app/Models/Presenters/InvoicePresenter.php index 01c2b7e55..6bcca5103 100644 --- a/app/Models/Presenters/InvoicePresenter.php +++ b/app/Models/Presenters/InvoicePresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Presenters/UserPresenter.php b/app/Models/Presenters/UserPresenter.php index 693d8c169..83a640578 100644 --- a/app/Models/Presenters/UserPresenter.php +++ b/app/Models/Presenters/UserPresenter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Product.php b/app/Models/Product.php index e1c3e3211..192431641 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Proposal.php b/app/Models/Proposal.php index a26d298c7..bfbf29ab3 100644 --- a/app/Models/Proposal.php +++ b/app/Models/Proposal.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Quote.php b/app/Models/Quote.php index b45e64b51..3f188a79c 100644 --- a/app/Models/Quote.php +++ b/app/Models/Quote.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -80,7 +80,6 @@ class Quote extends BaseModel return $this->belongsTo(Client::class)->withTrashed(); } - public function assigned_user() { return $this->belongsTo(User::class, 'assigned_user_id', 'id')->withTrashed(); diff --git a/app/Models/QuoteInvitation.php b/app/Models/QuoteInvitation.php index 165c13aa7..f50826020 100644 --- a/app/Models/QuoteInvitation.php +++ b/app/Models/QuoteInvitation.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -29,7 +29,6 @@ class QuoteInvitation extends BaseModel return Quote::class; } - /** * @return mixed */ diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index b0545e3bc..cad00ba77 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/RecurringInvoiceInvitation.php b/app/Models/RecurringInvoiceInvitation.php index ec75f2581..afed4c617 100644 --- a/app/Models/RecurringInvoiceInvitation.php +++ b/app/Models/RecurringInvoiceInvitation.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/RecurringQuote.php b/app/Models/RecurringQuote.php index 34281b968..0b85f99de 100644 --- a/app/Models/RecurringQuote.php +++ b/app/Models/RecurringQuote.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Size.php b/app/Models/Size.php index 355c89e29..e97d04ccd 100644 --- a/app/Models/Size.php +++ b/app/Models/Size.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/StaticModel.php b/app/Models/StaticModel.php index a544b6419..d09a386da 100644 --- a/app/Models/StaticModel.php +++ b/app/Models/StaticModel.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/SystemLog.php b/app/Models/SystemLog.php index 1b7d6ca0a..faef684a6 100644 --- a/app/Models/SystemLog.php +++ b/app/Models/SystemLog.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Task.php b/app/Models/Task.php index 20d7d6e21..df0fda856 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php index 0831e600d..2b4b021a2 100644 --- a/app/Models/TaxRate.php +++ b/app/Models/TaxRate.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/Timezone.php b/app/Models/Timezone.php index 5c6b772d1..999d62cff 100644 --- a/app/Models/Timezone.php +++ b/app/Models/Timezone.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Models/User.php b/app/Models/User.php index 7dfccd521..08ad2884e 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -132,7 +132,7 @@ class User extends Authenticatable implements MustVerifyEmail */ public function companies() { - return $this->belongsToMany(Company::class)->using(CompanyUser::class)->withPivot('permissions', 'settings', 'is_admin', 'is_owner', 'is_locked'); + return $this->belongsToMany(Company::class)->using(CompanyUser::class)->withPivot('permissions', 'settings', 'is_admin', 'is_owner', 'is_locked')->withTimestamps(); } /** diff --git a/app/Observers/AccountObserver.php b/app/Observers/AccountObserver.php index 236b412c0..7c0215429 100644 --- a/app/Observers/AccountObserver.php +++ b/app/Observers/AccountObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/ClientContactObserver.php b/app/Observers/ClientContactObserver.php index f9c4d2c0e..a5682961e 100644 --- a/app/Observers/ClientContactObserver.php +++ b/app/Observers/ClientContactObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/ClientObserver.php b/app/Observers/ClientObserver.php index a3227e638..15a42b37a 100644 --- a/app/Observers/ClientObserver.php +++ b/app/Observers/ClientObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/CompanyObserver.php b/app/Observers/CompanyObserver.php index ab32c660a..78e3fd056 100644 --- a/app/Observers/CompanyObserver.php +++ b/app/Observers/CompanyObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/CompanyTokenObserver.php b/app/Observers/CompanyTokenObserver.php index aafcab431..ee1dbd535 100644 --- a/app/Observers/CompanyTokenObserver.php +++ b/app/Observers/CompanyTokenObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/ExpenseObserver.php b/app/Observers/ExpenseObserver.php index 0ffb78f2d..c0485ab8e 100644 --- a/app/Observers/ExpenseObserver.php +++ b/app/Observers/ExpenseObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php index fdbbc409f..881b3084a 100644 --- a/app/Observers/InvoiceObserver.php +++ b/app/Observers/InvoiceObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/PaymentObserver.php b/app/Observers/PaymentObserver.php index 16ad071d9..be378907e 100644 --- a/app/Observers/PaymentObserver.php +++ b/app/Observers/PaymentObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/ProductObserver.php b/app/Observers/ProductObserver.php index 5de3667b9..c70cec51c 100644 --- a/app/Observers/ProductObserver.php +++ b/app/Observers/ProductObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/ProposalObserver.php b/app/Observers/ProposalObserver.php index 8b987b38e..ee5f3989d 100644 --- a/app/Observers/ProposalObserver.php +++ b/app/Observers/ProposalObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php index bc8096977..a7cfd0d63 100644 --- a/app/Observers/QuoteObserver.php +++ b/app/Observers/QuoteObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/TaskObserver.php b/app/Observers/TaskObserver.php index e538baeed..f4b3ad60d 100644 --- a/app/Observers/TaskObserver.php +++ b/app/Observers/TaskObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index b0fe2b087..632420f2b 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/PaymentDrivers/BasePaymentDriver.php b/app/PaymentDrivers/BasePaymentDriver.php index c5479fa17..32062249b 100644 --- a/app/PaymentDrivers/BasePaymentDriver.php +++ b/app/PaymentDrivers/BasePaymentDriver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/PaymentDrivers/PayPalExpressPaymentDriver.php b/app/PaymentDrivers/PayPalExpressPaymentDriver.php index f64f877a4..c3986d24c 100644 --- a/app/PaymentDrivers/PayPalExpressPaymentDriver.php +++ b/app/PaymentDrivers/PayPalExpressPaymentDriver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php index b17a55589..d41b960f3 100644 --- a/app/PaymentDrivers/StripePaymentDriver.php +++ b/app/PaymentDrivers/StripePaymentDriver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/ActivityPolicy.php b/app/Policies/ActivityPolicy.php index d449ab9e6..f8e1cc7c7 100644 --- a/app/Policies/ActivityPolicy.php +++ b/app/Policies/ActivityPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/ClientPolicy.php b/app/Policies/ClientPolicy.php index 20f47f8c6..7dd64214b 100644 --- a/app/Policies/ClientPolicy.php +++ b/app/Policies/ClientPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/CompanyGatewayPolicy.php b/app/Policies/CompanyGatewayPolicy.php index 1f4f24b29..526b679f5 100644 --- a/app/Policies/CompanyGatewayPolicy.php +++ b/app/Policies/CompanyGatewayPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php index 27266b1c3..d039ed967 100644 --- a/app/Policies/CompanyPolicy.php +++ b/app/Policies/CompanyPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/EntityPolicy.php b/app/Policies/EntityPolicy.php index 9325a422f..83d40e938 100644 --- a/app/Policies/EntityPolicy.php +++ b/app/Policies/EntityPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/GroupSettingPolicy.php b/app/Policies/GroupSettingPolicy.php index 82f41f1b5..c7a9b45db 100644 --- a/app/Policies/GroupSettingPolicy.php +++ b/app/Policies/GroupSettingPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/InvoicePolicy.php b/app/Policies/InvoicePolicy.php index 92677b932..3757e5242 100644 --- a/app/Policies/InvoicePolicy.php +++ b/app/Policies/InvoicePolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/PaymentPolicy.php b/app/Policies/PaymentPolicy.php index 220170d2d..cac7b519f 100644 --- a/app/Policies/PaymentPolicy.php +++ b/app/Policies/PaymentPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/ProductPolicy.php b/app/Policies/ProductPolicy.php index 9e61130fc..62c7d417a 100644 --- a/app/Policies/ProductPolicy.php +++ b/app/Policies/ProductPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/QuotePolicy.php b/app/Policies/QuotePolicy.php index 5b09bb91e..592962cae 100644 --- a/app/Policies/QuotePolicy.php +++ b/app/Policies/QuotePolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/RecurringInvoicePolicy.php b/app/Policies/RecurringInvoicePolicy.php index 04679e2dc..40fd50859 100644 --- a/app/Policies/RecurringInvoicePolicy.php +++ b/app/Policies/RecurringInvoicePolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/RecurringQuotePolicy.php b/app/Policies/RecurringQuotePolicy.php index a0afdadfb..297f230d6 100644 --- a/app/Policies/RecurringQuotePolicy.php +++ b/app/Policies/RecurringQuotePolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/TaxRatePolicy.php b/app/Policies/TaxRatePolicy.php index 2ad96dc4f..0fc03137c 100644 --- a/app/Policies/TaxRatePolicy.php +++ b/app/Policies/TaxRatePolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php index cac7cd89f..7e20262c2 100644 --- a/app/Policies/UserPolicy.php +++ b/app/Policies/UserPolicy.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index db56172bd..2b07d408b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 4102fe0db..33bd56f68 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 77fbedb4d..ca7c30a04 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/ComposerServiceProvider.php b/app/Providers/ComposerServiceProvider.php index 669d518a4..76bab0bfb 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Providers/ComposerServiceProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 3c066cac7..57d78f3fd 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/MultiDatabaseUserProvider.php b/app/Providers/MultiDatabaseUserProvider.php index ea43ab433..f03a6b9f7 100644 --- a/app/Providers/MultiDatabaseUserProvider.php +++ b/app/Providers/MultiDatabaseUserProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 4285a6056..778e1d5ff 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/SendConfirmationNotification.php b/app/Providers/SendConfirmationNotification.php index 8f89582a4..f6654cf52 100644 --- a/app/Providers/SendConfirmationNotification.php +++ b/app/Providers/SendConfirmationNotification.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Providers/UserSignedUp.php b/app/Providers/UserSignedUp.php index f9c0a1f8e..ebdf0d4a0 100644 --- a/app/Providers/UserSignedUp.php +++ b/app/Providers/UserSignedUp.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/AccountRepository.php b/app/Repositories/AccountRepository.php index e307c3f9c..d317b1c5f 100644 --- a/app/Repositories/AccountRepository.php +++ b/app/Repositories/AccountRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/ActivityRepository.php b/app/Repositories/ActivityRepository.php index 77cf6f6b1..cb6214713 100644 --- a/app/Repositories/ActivityRepository.php +++ b/app/Repositories/ActivityRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index ac0e0b659..f1eaf08cf 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/ClientContactRepository.php b/app/Repositories/ClientContactRepository.php index d859e48a7..6fdfde58b 100644 --- a/app/Repositories/ClientContactRepository.php +++ b/app/Repositories/ClientContactRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/ClientRepository.php b/app/Repositories/ClientRepository.php index fff0f02ad..61d28944a 100644 --- a/app/Repositories/ClientRepository.php +++ b/app/Repositories/ClientRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php index 3302dc6c7..b75ab0fb1 100644 --- a/app/Repositories/CompanyRepository.php +++ b/app/Repositories/CompanyRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/CreditRepository.php b/app/Repositories/CreditRepository.php index e1974936a..6f0119f62 100644 --- a/app/Repositories/CreditRepository.php +++ b/app/Repositories/CreditRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -12,6 +12,8 @@ namespace App\Repositories; use App\Models\Credit; +use App\Models\CreditInvitation; +use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; /** @@ -19,6 +21,8 @@ use Illuminate\Http\Request; */ class CreditRepository extends BaseRepository { + use MakesHash; + public function __construct() { } @@ -41,9 +45,53 @@ class CreditRepository extends BaseRepository * * @return Credit|\App\Models\Credit|null Credit Object */ - public function save(array $data, Credit $credit) : ?Credit + public function save(array $data, Credit $credit, $invoice = null) : ?Credit { + $credit->fill($data); + $credit->save(); + + $credit->number = $credit->client->getNextCreditNumber($credit->client); + + if (isset($data['invitations'])) { + $invitations = collect($data['invitations']); + + /* Get array of Keyss which have been removed from the invitations array and soft delete each invitation */ + collect($credit->invitations->pluck('key'))->diff($invitations->pluck('key'))->each(function ($invitation) { + CreditInvitation::destroy($invitation); + }); + + + foreach ($data['invitations'] as $invitation) { + $cred = false; + + if (array_key_exists('key', $invitation)) { + $cred = CreditInvitation::whereKey($invitation['key'])->first(); + } + + if (!$cred) { + //$invitation['client_contact_id'] = $this->decodePrimaryKey($invitation['client_contact_id']); + + $new_invitation = CreditInvitationFactory::create($invoice->company_id, $invoice->user_id); + $new_invitation->fill($invitation); + $new_invitation->credit_id = $credit->id; + $new_invitation->client_contact_id = $this->decodePrimaryKey($invitation['client_contact_id']); + $new_invitation->save(); + } + } + } + + /** + * Perform calculations on the + * credit note + */ + + $credit = $credit->calc()->getInvoice(); + + $credit->save(); + + return $credit; + } } \ No newline at end of file diff --git a/app/Repositories/GroupSettingRepository.php b/app/Repositories/GroupSettingRepository.php index ce3510c05..db847878a 100644 --- a/app/Repositories/GroupSettingRepository.php +++ b/app/Repositories/GroupSettingRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php index f6adfad22..ded950d80 100644 --- a/app/Repositories/InvoiceRepository.php +++ b/app/Repositories/InvoiceRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -33,6 +33,7 @@ use Illuminate\Support\Carbon; class InvoiceRepository extends BaseRepository { use MakesHash; + /** * Gets the class name. * @@ -89,11 +90,11 @@ class InvoiceRepository extends BaseRepository } if (!$inv) { - $invitation['client_contact_id'] = $this->decodePrimaryKey($invitation['client_contact_id']); $new_invitation = InvoiceInvitationFactory::create($invoice->company_id, $invoice->user_id); $new_invitation->fill($invitation); $new_invitation->invoice_id = $invoice->id; + $new_invitation->client_contact_id = $this->decodePrimaryKey($invitation['client_contact_id']); $new_invitation->save(); } } diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php index ed038e486..f711b3458 100644 --- a/app/Repositories/PaymentRepository.php +++ b/app/Repositories/PaymentRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -12,6 +12,7 @@ namespace App\Repositories; use App\Events\Payment\PaymentWasCreated; +use App\Factory\CreditFactory; use App\Jobs\Company\UpdateCompanyLedgerWithPayment; use App\Jobs\Invoice\ApplyClientPayment; use App\Jobs\Invoice\ApplyInvoicePayment; @@ -55,11 +56,11 @@ class PaymentRepository extends BaseRepository $payment->status_id = Payment::STATUS_COMPLETED; $payment->number = $payment->client->getNextPaymentNumber($payment->client); - + $payment->save(); if ($request->input('invoices')) { - \Log::error('invoices found'); + $invoices = Invoice::whereIn('id', array_column($request->input('invoices'), 'id'))->company()->get(); $payment->invoices()->saveMany($invoices); @@ -114,11 +115,12 @@ class PaymentRepository extends BaseRepository //temp variable to sum the total refund/credit amount $invoice_total_adjustment = 0; - if($request->has('invoices')){ + if($request->has('invoices') && is_array($request->input('invoices'))){ foreach($request->input('invoices') as $adjusted_invoice) { $invoice = Invoice::whereId($adjusted_invoice['id'])->company()->first(); + $invoice_total_adjustment += $adjusted_invoice['amount']; if(array_key_exists('credits', $adjusted_invoice)){ @@ -126,7 +128,7 @@ class PaymentRepository extends BaseRepository //process and insert credit notes foreach($adjusted_invoice['credits'] as $credit){ - $credit = $this->credit_repo->save($credit, ); + $credit = $this->credit_repo->save($credit, CreditFactory::create(auth()->user()->company()->id, auth()->user()->id), $invoice); } diff --git a/app/Repositories/ProductRepository.php b/app/Repositories/ProductRepository.php index babd71be6..733740805 100644 --- a/app/Repositories/ProductRepository.php +++ b/app/Repositories/ProductRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/QuoteRepository.php b/app/Repositories/QuoteRepository.php index 0cfd9d614..2f7791566 100644 --- a/app/Repositories/QuoteRepository.php +++ b/app/Repositories/QuoteRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -19,6 +19,7 @@ use App\Models\Client; use App\Models\ClientContact; use App\Models\Quote; use App\Models\QuoteInvitation; +use App\Utils\Traits\MakesHash; use Illuminate\Http\Request; /** @@ -26,6 +27,9 @@ use Illuminate\Http\Request; */ class QuoteRepository extends BaseRepository { + + use MakesHash; + public function getClassName() { return Quote::class; @@ -69,11 +73,11 @@ class QuoteRepository extends BaseRepository } if (!$inv) { - $invitation['client_contact_id'] = $this->decodePrimaryKey($invitation['client_contact_id']); $new_invitation = QuoteInvitationFactory::create($quote->company_id, $quote->user_id); $new_invitation->fill($invitation); $new_invitation->quote_id = $quote->id; + $new_invitation->client_contact_id = $this->decodePrimaryKey($invitation['client_contact_id']); $new_invitation->save(); } } diff --git a/app/Repositories/RecurringInvoiceRepository.php b/app/Repositories/RecurringInvoiceRepository.php index a10155d0d..adb90cf74 100644 --- a/app/Repositories/RecurringInvoiceRepository.php +++ b/app/Repositories/RecurringInvoiceRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/RecurringQuoteRepository.php b/app/Repositories/RecurringQuoteRepository.php index 74cede0a9..6a21cd032 100644 --- a/app/Repositories/RecurringQuoteRepository.php +++ b/app/Repositories/RecurringQuoteRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index 6e7d7af17..671409f46 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php index 7954c3afc..676f65f0f 100644 --- a/app/Transformers/AccountTransformer.php +++ b/app/Transformers/AccountTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/ArraySerializer.php b/app/Transformers/ArraySerializer.php index 8d17c2ebd..2cff0872c 100644 --- a/app/Transformers/ArraySerializer.php +++ b/app/Transformers/ArraySerializer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/ClientContactLoginTransformer.php b/app/Transformers/ClientContactLoginTransformer.php index b6762968b..b3ed6ffb4 100644 --- a/app/Transformers/ClientContactLoginTransformer.php +++ b/app/Transformers/ClientContactLoginTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/ClientContactTransformer.php b/app/Transformers/ClientContactTransformer.php index a0de6507a..d6a3290c6 100644 --- a/app/Transformers/ClientContactTransformer.php +++ b/app/Transformers/ClientContactTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/ClientGatewayTokenTransformer.php b/app/Transformers/ClientGatewayTokenTransformer.php index faf1e9db9..ac4553912 100644 --- a/app/Transformers/ClientGatewayTokenTransformer.php +++ b/app/Transformers/ClientGatewayTokenTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php index afa874ea9..f8c6c8520 100644 --- a/app/Transformers/ClientTransformer.php +++ b/app/Transformers/ClientTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -112,7 +112,7 @@ class ClientTransformer extends EntityTransformer 'vat_number' => $client->vat_number ?: '', 'id_number' => $client->id_number ?: '', 'updated_at' => $client->updated_at, - 'deleted_at' => $client->deleted_at, + 'archived_at' => $client->deleted_at, 'display_name' => $client->present()->name() ]; } diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php index 423c1c943..67e1a52de 100644 --- a/app/Transformers/CompanyGatewayTransformer.php +++ b/app/Transformers/CompanyGatewayTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -54,7 +54,7 @@ class CompanyGatewayTransformer extends EntityTransformer 'config' => (string) $company_gateway->getConfigTransformed(), 'fees_and_limits' => $company_gateway->fees_and_limits ?: '', 'updated_at' => $company_gateway->updated_at, - 'deleted_at' => $company_gateway->deleted_at, + 'archived_at' => $company_gateway->deleted_at, 'custom_value1' => $company_gateway->custom_value1 ?: '', 'custom_value2' => $company_gateway->custom_value2 ?: '', 'custom_value3' => $company_gateway->custom_value3 ?: '', diff --git a/app/Transformers/CompanyTokenTransformer.php b/app/Transformers/CompanyTokenTransformer.php index 64c82883b..55c9c4503 100644 --- a/app/Transformers/CompanyTokenTransformer.php +++ b/app/Transformers/CompanyTokenTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 0df7d07ab..e264cd1f4 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -98,7 +98,7 @@ class CompanyTransformer extends EntityTransformer 'settings' => $company->settings ?: '', 'enabled_tax_rates' => (int)$company->enabled_tax_rates, 'updated_at' => (int)$company->updated_at, - 'deleted_at' => (int)$company->deleted_at, + 'archived_at' => (int)$company->deleted_at, ]; } diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php index c044bbf73..d08fed2f8 100644 --- a/app/Transformers/CompanyUserTransformer.php +++ b/app/Transformers/CompanyUserTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -58,7 +58,7 @@ class CompanyUserTransformer extends EntityTransformer 'is_admin' => (bool) $company_user->is_admin, 'is_locked' => (bool) $company_user->is_locked, 'updated_at' => (int)$company_user->updated_at, - 'deleted_at' => (int)$company_user->deleted_at, + 'archived_at' => (int)$company_user->deleted_at, ]; } diff --git a/app/Transformers/Contact/InvoiceTransformer.php b/app/Transformers/Contact/InvoiceTransformer.php index 31df09f9f..ac8557723 100644 --- a/app/Transformers/Contact/InvoiceTransformer.php +++ b/app/Transformers/Contact/InvoiceTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/CreditTransformer.php b/app/Transformers/CreditTransformer.php new file mode 100644 index 000000000..58cc9cea7 --- /dev/null +++ b/app/Transformers/CreditTransformer.php @@ -0,0 +1,123 @@ +serializer); + + return $this->includeCollection($credit->invitations, $transformer, CreditInvitation::class); + } + /* + public function includePayments(quote $credit) + { + $transformer = new PaymentTransformer($this->account, $this->serializer, $credit); + + return $this->includeCollection($credit->payments, $transformer, ENTITY_PAYMENT); + } + + public function includeClient(quote $credit) + { + $transformer = new ClientTransformer($this->account, $this->serializer); + + return $this->includeItem($credit->client, $transformer, ENTITY_CLIENT); + } + + public function includeExpenses(quote $credit) + { + $transformer = new ExpenseTransformer($this->account, $this->serializer); + + return $this->includeCollection($credit->expenses, $transformer, ENTITY_EXPENSE); + } + + public function includeDocuments(quote $credit) + { + $transformer = new DocumentTransformer($this->account, $this->serializer); + + $credit->documents->each(function ($document) use ($credit) { + $document->setRelation('quote', $credit); + }); + + return $this->includeCollection($credit->documents, $transformer, ENTITY_DOCUMENT); + } + */ + public function transform(Credit $credit) + { + return [ + 'id' => $this->encodePrimaryKey($credit->id), + 'user_id' => $this->encodePrimaryKey($credit->user_id), + 'assigned_user_id' => $this->encodePrimaryKey($credit->assigned_user_id), + 'amount' => (float) $credit->amount, + 'balance' => (float) $credit->balance, + 'client_id' => (string) $this->encodePrimaryKey($credit->client_id), + 'status_id' => (string) ($credit->status_id ?: 1), + 'design_id' => (string) ($credit->design_id ?: 1), + 'invoice_id' => (string) ($credit->invoice_id ?: 1), + 'updated_at' => $credit->updated_at, + 'archived_at' => $credit->deleted_at, + 'number' => $credit->number ?: '', + 'discount' => (float) $credit->discount, + 'po_number' => $credit->po_number ?: '', + 'date' => $credit->date ?: '', + 'last_sent_date' => $credit->last_sent_date ?: '', + 'next_send_date' => $credit->date ?: '', + 'due_date' => $credit->due_date ?: '', + 'terms' => $credit->terms ?: '', + 'public_notes' => $credit->public_notes ?: '', + 'private_notes' => $credit->private_notes ?: '', + 'is_deleted' => (bool) $credit->is_deleted, + 'uses_inclusive_taxes' => (bool) $credit->uses_inclusive_taxes, + 'tax_name1' => $credit->tax_name1 ? $credit->tax_name1 : '', + 'tax_rate1' => (float) $credit->tax_rate1, + 'tax_name2' => $credit->tax_name2 ? $credit->tax_name2 : '', + 'tax_rate2' => (float) $credit->tax_rate2, + 'tax_name3' => $credit->tax_name3 ? $credit->tax_name3 : '', + 'tax_rate3' => (float) $credit->tax_rate3, + 'total_taxes' => (float) $credit->total_taxes, + 'is_amount_discount' => (bool) ($credit->is_amount_discount ?: false), + 'footer' => $credit->footer ?: '', + 'partial' => (float) ($credit->partial ?: 0.0), + 'partial_due_date' => $credit->partial_due_date ?: '', + 'custom_value1' => (string) $credit->custom_value1 ?: '', + 'custom_value2' => (string) $credit->custom_value2 ?: '', + 'custom_value3' => (string) $credit->custom_value3 ?: '', + 'custom_value4' => (string) $credit->custom_value4 ?: '', + 'has_tasks' => (bool) $credit->has_tasks, + 'has_expenses' => (bool) $credit->has_expenses, + 'custom_surcharge1' => (float)$credit->custom_surcharge1, + 'custom_surcharge2' => (float)$credit->custom_surcharge2, + 'custom_surcharge3' => (float)$credit->custom_surcharge3, + 'custom_surcharge4' => (float)$credit->custom_surcharge4, + 'custom_surcharge_taxes' => (bool) $credit->custom_surcharge_taxes, + 'line_items' => $credit->line_items ?: (array)[], + 'backup' => $credit->backup ?: '', + ]; + } +} diff --git a/app/Transformers/DocumentTransformer.php b/app/Transformers/DocumentTransformer.php index c725f7c55..c66703a9f 100644 --- a/app/Transformers/DocumentTransformer.php +++ b/app/Transformers/DocumentTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/EntityTransformer.php b/app/Transformers/EntityTransformer.php index a28898586..c22557727 100644 --- a/app/Transformers/EntityTransformer.php +++ b/app/Transformers/EntityTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/GatewayTransformer.php b/app/Transformers/GatewayTransformer.php index 32833c76e..ce5e24952 100644 --- a/app/Transformers/GatewayTransformer.php +++ b/app/Transformers/GatewayTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/GroupSettingTransformer.php b/app/Transformers/GroupSettingTransformer.php index 4163fcf8d..7ef22fc4c 100644 --- a/app/Transformers/GroupSettingTransformer.php +++ b/app/Transformers/GroupSettingTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/InvoiceInvitationTransformer.php b/app/Transformers/InvoiceInvitationTransformer.php index 19082cc5a..c1c302838 100644 --- a/app/Transformers/InvoiceInvitationTransformer.php +++ b/app/Transformers/InvoiceInvitationTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/InvoiceItemTransformer.php b/app/Transformers/InvoiceItemTransformer.php index 8e706487f..159489ac2 100644 --- a/app/Transformers/InvoiceItemTransformer.php +++ b/app/Transformers/InvoiceItemTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php index 3eafb20e9..85c43cda4 100644 --- a/app/Transformers/InvoiceTransformer.php +++ b/app/Transformers/InvoiceTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/PaymentTransformer.php b/app/Transformers/PaymentTransformer.php index b2af3afce..0ba88ca0f 100644 --- a/app/Transformers/PaymentTransformer.php +++ b/app/Transformers/PaymentTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/PaymentableTransformer.php b/app/Transformers/PaymentableTransformer.php index 5e2c41357..a6bde007a 100644 --- a/app/Transformers/PaymentableTransformer.php +++ b/app/Transformers/PaymentableTransformer.php @@ -4,13 +4,14 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ namespace App\Transformers; +use App\Models\Credit; use App\Models\Payment; use App\Models\Paymentable; use App\Utils\Traits\MakesHash; @@ -32,10 +33,17 @@ class PaymentableTransformer extends EntityTransformer public function transform(Paymentable $paymentable) { + $entity_key = 'invoice_id'; + + if($paymentable->paymentable_type == Credit::class) + $entity_key = 'credit_id'; + return [ 'id' => $this->encodePrimaryKey($paymentable->id), - 'invoice_id' => $this->encodePrimaryKey($paymentable->paymentable_id), + $entity_key => $this->encodePrimaryKey($paymentable->paymentable_id), 'amount' => (float)$paymentable->amount, + 'created_at' => (int) $paymentable->created_at, + 'updated_at' => (int) $paymentable->updated_at, ]; } } diff --git a/app/Transformers/ProductTransformer.php b/app/Transformers/ProductTransformer.php index 93e9b7853..433778239 100644 --- a/app/Transformers/ProductTransformer.php +++ b/app/Transformers/ProductTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/QuoteInvitationTransformer.php b/app/Transformers/QuoteInvitationTransformer.php index 35a29140e..192a537db 100644 --- a/app/Transformers/QuoteInvitationTransformer.php +++ b/app/Transformers/QuoteInvitationTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/QuoteTransformer.php b/app/Transformers/QuoteTransformer.php index a39350233..f581cfb9d 100644 --- a/app/Transformers/QuoteTransformer.php +++ b/app/Transformers/QuoteTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -79,6 +79,7 @@ class QuoteTransformer extends EntityTransformer 'client_id' => (string) $this->encodePrimaryKey($quote->client_id), 'status_id' => (string) ($quote->status_id ?: 1), 'design_id' => (string) ($quote->design_id ?: 1), + 'invoice_id' => (string) ($quote->invoice_id ?: 1), 'updated_at' => $quote->updated_at, 'archived_at' => $quote->deleted_at, 'number' => $quote->number ?: '', diff --git a/app/Transformers/RecurringInvoiceTransformer.php b/app/Transformers/RecurringInvoiceTransformer.php index b1cf9f7d6..7f8654a00 100644 --- a/app/Transformers/RecurringInvoiceTransformer.php +++ b/app/Transformers/RecurringInvoiceTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/RecurringQuoteTransformer.php b/app/Transformers/RecurringQuoteTransformer.php index 8e0eb8d5e..51faefa67 100644 --- a/app/Transformers/RecurringQuoteTransformer.php +++ b/app/Transformers/RecurringQuoteTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Transformers/TaxRateTransformer.php b/app/Transformers/TaxRateTransformer.php index 330ca685c..3e967689d 100644 --- a/app/Transformers/TaxRateTransformer.php +++ b/app/Transformers/TaxRateTransformer.php @@ -19,7 +19,7 @@ class TaxRateTransformer extends EntityTransformer 'name' => (string) $tax_rate->name, 'rate' => (float) $tax_rate->rate, 'updated_at' => $tax_rate->updated_at, - 'deleted_at' => $tax_rate->deleted_at, + 'archived_at' => $tax_rate->deleted_at, ]; } } diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php index 6c2ee7829..2f5ac99df 100644 --- a/app/Transformers/UserTransformer.php +++ b/app/Transformers/UserTransformer.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ @@ -53,7 +53,7 @@ class UserTransformer extends EntityTransformer 'email' => $user->email ?: '', 'last_login' => Carbon::parse($user->last_login)->timestamp, 'updated_at' => $user->updated_at, - 'deleted_at' => $user->deleted_at, + 'archived_at' => $user->deleted_at, 'phone' => $user->phone ?: '', 'email_verified_at' => $user->getEmailVerifiedAt(), 'signature' => $user->signature ?: '', diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php index 83c2bac79..f70de89c1 100644 --- a/app/Utils/Ninja.php +++ b/app/Utils/Ninja.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Number.php b/app/Utils/Number.php index 192f9829f..008a067eb 100644 --- a/app/Utils/Number.php +++ b/app/Utils/Number.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php index d7a94fcc6..8ee451344 100644 --- a/app/Utils/Statics.php +++ b/app/Utils/Statics.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php index 7776facc8..5d2989be5 100644 --- a/app/Utils/SystemHealth.php +++ b/app/Utils/SystemHealth.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/ChecksEntityStatus.php b/app/Utils/Traits/ChecksEntityStatus.php index 325a4d97d..a13d66f1d 100644 --- a/app/Utils/Traits/ChecksEntityStatus.php +++ b/app/Utils/Traits/ChecksEntityStatus.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php index 7bf859a59..6c7f880ef 100644 --- a/app/Utils/Traits/CleanLineItems.php +++ b/app/Utils/Traits/CleanLineItems.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/ClientGroupSettingsSaver.php b/app/Utils/Traits/ClientGroupSettingsSaver.php index 714d9eb59..3858f5fb5 100644 --- a/app/Utils/Traits/ClientGroupSettingsSaver.php +++ b/app/Utils/Traits/ClientGroupSettingsSaver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php index 85f2b614d..33df771f6 100644 --- a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php +++ b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php index 98e8420d1..95cc74376 100644 --- a/app/Utils/Traits/CompanySettingsSaver.php +++ b/app/Utils/Traits/CompanySettingsSaver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php index 14042e07c..2b15e03a4 100644 --- a/app/Utils/Traits/GeneratesCounter.php +++ b/app/Utils/Traits/GeneratesCounter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php index b4c580a5b..ca3cc1e42 100644 --- a/app/Utils/Traits/Inviteable.php +++ b/app/Utils/Traits/Inviteable.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/InvoiceEmailBuilder.php b/app/Utils/Traits/InvoiceEmailBuilder.php index d93ae022d..0b4576aca 100644 --- a/app/Utils/Traits/InvoiceEmailBuilder.php +++ b/app/Utils/Traits/InvoiceEmailBuilder.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php index 0bf0d554b..788b611a1 100644 --- a/app/Utils/Traits/MakesDates.php +++ b/app/Utils/Traits/MakesDates.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php index a32000ceb..d9f220cb4 100644 --- a/app/Utils/Traits/MakesHash.php +++ b/app/Utils/Traits/MakesHash.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesHeaderData.php b/app/Utils/Traits/MakesHeaderData.php index d94b2515a..667eee3b0 100644 --- a/app/Utils/Traits/MakesHeaderData.php +++ b/app/Utils/Traits/MakesHeaderData.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php index b385dc86b..84965304d 100644 --- a/app/Utils/Traits/MakesInvoiceHtml.php +++ b/app/Utils/Traits/MakesInvoiceHtml.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php index 9039b39c2..91c0c31f1 100644 --- a/app/Utils/Traits/MakesInvoiceValues.php +++ b/app/Utils/Traits/MakesInvoiceValues.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesMenu.php b/app/Utils/Traits/MakesMenu.php index 9a2c52ea4..5a2bb831f 100644 --- a/app/Utils/Traits/MakesMenu.php +++ b/app/Utils/Traits/MakesMenu.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php index 9dce452e0..93379f576 100644 --- a/app/Utils/Traits/MakesReminders.php +++ b/app/Utils/Traits/MakesReminders.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/NumberFormatter.php b/app/Utils/Traits/NumberFormatter.php index 1a34f37e3..b500a28e2 100644 --- a/app/Utils/Traits/NumberFormatter.php +++ b/app/Utils/Traits/NumberFormatter.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/SettingsSaver.php b/app/Utils/Traits/SettingsSaver.php index 603b6b976..48359250b 100644 --- a/app/Utils/Traits/SettingsSaver.php +++ b/app/Utils/Traits/SettingsSaver.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/SystemLogTrait.php b/app/Utils/Traits/SystemLogTrait.php index 4a46e4fda..78a179cac 100644 --- a/app/Utils/Traits/SystemLogTrait.php +++ b/app/Utils/Traits/SystemLogTrait.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/ThrottlesEmail.php b/app/Utils/Traits/ThrottlesEmail.php index 8f495c230..f18daca2b 100644 --- a/app/Utils/Traits/ThrottlesEmail.php +++ b/app/Utils/Traits/ThrottlesEmail.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/Uploadable.php b/app/Utils/Traits/Uploadable.php index dd0531a6d..faf880425 100644 --- a/app/Utils/Traits/Uploadable.php +++ b/app/Utils/Traits/Uploadable.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/UserSessionAttributes.php b/app/Utils/Traits/UserSessionAttributes.php index 4ab15428f..d8432b7fe 100644 --- a/app/Utils/Traits/UserSessionAttributes.php +++ b/app/Utils/Traits/UserSessionAttributes.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/Traits/UserSettings.php b/app/Utils/Traits/UserSettings.php index 115dc6cac..6c433fdc1 100644 --- a/app/Utils/Traits/UserSettings.php +++ b/app/Utils/Traits/UserSettings.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/app/Utils/TranslationHelper.php b/app/Utils/TranslationHelper.php index 1ba1f5545..42ac91ea3 100644 --- a/app/Utils/TranslationHelper.php +++ b/app/Utils/TranslationHelper.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */ diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php index 4a138f622..3579cec58 100644 --- a/database/migrations/2014_10_13_000000_create_users_table.php +++ b/database/migrations/2014_10_13_000000_create_users_table.php @@ -522,6 +522,7 @@ class CreateUsersTable extends Migration $t->unsignedInteger('vendor_id')->nullable(); $t->unsignedInteger('recurring_id')->nullable(); $t->unsignedInteger('design_id')->nullable(); + $t->unsignedInteger('invoice_id')->nullable(); $t->string('number')->nullable(); $t->float('discount')->default(0); @@ -588,6 +589,37 @@ class CreateUsersTable extends Migration $t->unique(['company_id', 'number']); }); + + Schema::create('credit_invitations', function ($t) { + $t->increments('id'); + $t->unsignedInteger('company_id'); + $t->unsignedInteger('user_id'); + $t->unsignedInteger('client_contact_id'); + $t->unsignedInteger('credit_id')->index(); + $t->string('key')->index(); + $t->string('transaction_reference')->nullable(); + $t->string('message_id')->nullable(); + $t->mediumText('email_error')->nullable(); + $t->text('signature_base64')->nullable(); + $t->datetime('signature_date')->nullable(); + + $t->datetime('sent_date')->nullable(); + $t->datetime('viewed_date')->nullable(); + $t->datetime('opened_date')->nullable(); + + $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + $t->foreign('client_contact_id')->references('id')->on('client_contacts')->onDelete('cascade'); + $t->foreign('credit_id')->references('id')->on('credits')->onDelete('cascade'); + $t->foreign('company_id')->references('id')->on('companies')->onDelete('cascade'); + + $t->timestamps(6); + $t->softDeletes('deleted_at', 6); + + $t->index(['deleted_at', 'credit_id']); + $t->unique(['client_contact_id', 'credit_id']); + + }); + Schema::create('recurring_invoices', function ($t) { $t->increments('id'); $t->unsignedInteger('client_id')->index(); @@ -732,6 +764,7 @@ class CreateUsersTable extends Migration $t->unsignedInteger('vendor_id')->nullable(); $t->unsignedInteger('recurring_id')->nullable(); $t->unsignedInteger('design_id')->nullable(); + $t->unsignedInteger('invoice_id')->nullable(); $t->string('number')->nullable(); $t->float('discount')->default(0); @@ -953,24 +986,15 @@ class CreateUsersTable extends Migration $table->unsignedInteger('payment_id'); $table->unsignedInteger('paymentable_id'); $table->decimal('amount', 16, 4)->default(0); + $table->decimal('refunded', 16, 4)->default(0); $table->string('paymentable_type'); + $table->timestamps(); $table->foreign('payment_id')->references('id')->on('payments')->onDelete('cascade'); }); - Schema::create('creditables', function ($table) { //allows multiple credits to one invoice - $table->increments('id'); - $table->unsignedInteger('credit_id'); - $table->unsignedInteger('creditable_id'); - $table->decimal('amount', 16, 4)->default(0); - $table->string('creditable_type'); - - $table->foreign('credit_id')->references('id')->on('credits')->onDelete('cascade'); - - }); - Schema::create('payment_libraries', function ($t) { $t->increments('id'); $t->timestamps(6); diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php index 5e17400cc..a2e4bafcc 100644 --- a/tests/MockAccountData.php +++ b/tests/MockAccountData.php @@ -4,7 +4,7 @@ * * @link https://github.com/invoiceninja/invoiceninja source repository * - * @copyright Copyright (c) 2019. Invoice Ninja LLC (https://invoiceninja.com) + * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com) * * @license https://opensource.org/licenses/AAL */