Commit Graph

154 Commits

Author SHA1 Message Date
Peter Papp 3af8bff13b - removed invoicing from oasis 2021-05-13 09:31:16 +02:00
Peter Papp 5ea898d716 share invoice on email backend 2021-05-11 07:45:38 +02:00
Peter Papp 599b238ab4 Edit invoice 2021-05-05 17:07:36 +02:00
Peter Papp 3c3e82758d Create invoice form part 1. 2021-04-30 17:53:19 +02:00
Peter Papp 31dd782bae Resource refactoring 2021-04-29 12:53:17 +02:00
Peter Papp 1486ce63fa Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	app/Console/Commands/SetupDevEnvironment.php
#	app/Console/Kernel.php
#	app/Http/Resources/InvoiceResource.php
#	app/Http/Resources/UserResource.php
#	app/Models/User.php
#	composer.lock
#	config/app.php
#	config/custom-language-translations.php
#	config/language-translations.php
#	public/chunks/admin.js
#	public/chunks/app-language.js
#	public/chunks/dashboard.js
#	public/chunks/files.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser.js
#	public/chunks/files~chunks/shared-files~chunks/shared/file-browser~chunks/shared/single-file.js
#	public/chunks/invoices.js
#	public/chunks/pages.js
#	public/chunks/plan-subscribers.js
#	public/chunks/plans.js
#	public/chunks/platform.js
#	public/chunks/settings-invoices.js
#	public/chunks/settings-payment-methods.js
#	public/chunks/settings-subscription.js
#	public/chunks/shared-files.js
#	public/chunks/shared.js
#	public/chunks/shared/file-browser.js
#	public/chunks/user-invoices.js
#	public/chunks/user-subscription.js
#	public/chunks/users.js
#	public/js/main.js
#	public/mix-manifest.json
#	resources/js/components/FilesView/FileItemGrid.vue
#	resources/js/components/FilesView/FileItemList.vue
2021-04-29 11:06:14 +02:00
Peter Papp 834b0ba5e0 Edit client detail 2021-04-29 10:54:10 +02:00
Peter Papp 13ec1257e1 Delete invoice 2021-04-28 18:44:42 +02:00
Peter Papp 248825f2d1 Delete client 2021-04-28 18:15:33 +02:00
Peter Papp b37edd298a Billing profile implementation 2021-04-28 15:55:01 +02:00
Peter Papp 1e4bbd10f3 update invoice profile 2021-04-28 08:34:37 +02:00
Peter Papp bcf14595bf store invoice profile 2021-04-28 07:32:40 +02:00
Peter Papp f7135c9b27 get invoice from url 2021-04-27 08:57:00 +02:00
Peter Papp 7cf193abb7 pdf invoice generation scaffolding 2021-04-26 17:03:17 +02:00
Peter Papp c47886fb8b code style fix 2021-04-25 09:02:00 +02:00
Peter Papp e65e3e88d7 PDF Invoice 2021-04-24 07:40:20 +02:00
Peter Papp 9a5f9fe49d Create client 2021-04-23 08:37:54 +02:00
Peter Papp 894cef5d66 Searching mobile frontend 2021-04-22 16:40:45 +02:00
Peter Papp 73861f814c Searching backend 2021-04-22 09:33:52 +02:00
Peter Papp eae212ac5d - Invoice listing in frontend 2021-04-21 16:53:39 +02:00
Peter Papp 737adfa91a Merge remote-tracking branch 'origin/master' into oasis
# Conflicts:
#	public/js/main.js
#	public/mix-manifest.json
2021-04-06 10:02:20 +02:00
Peter Papp 13992deb41 - added function to upgrade language translations
- maintenance gate
2021-04-06 09:56:11 +02:00
Peter Papp 5d0348e2d0 Merge remote-tracking branch 'origin/v2' into oasis
# Conflicts:
#	app/Http/Controllers/User/AccountController.php
#	app/Http/helpers.php
#	public/mix-manifest.json
#	resources/js/components/FilesView/Icons/AlphabetIcon.vue
#	resources/js/components/FilesView/MobileActionButton.vue
#	resources/js/views/Admin/AppSettings/AppSettingsTabs/Appearance.vue
#	resources/js/views/Admin/Users/UserTabs/UserDetail.vue
#	resources/js/views/Upgrade/UpgradeBilling.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	resources/views/vuefilemanager/others/color-template.blade.php
2021-04-01 10:45:10 +02:00
Peter Papp 5130082111 Language editor refactoring part 3 (backend + frontend) 2021-04-01 07:50:01 +02:00
Peter Papp 6ac6528243 Language editor refactoring part 2 (backend + frontend) 2021-03-28 14:06:16 +02:00
Peter Papp ec51440c3a Language editor refactoring part 1 (nackend) 2021-03-27 18:53:41 +01:00
Peter Papp cdb395c77f cleaning 2021-03-27 12:21:35 +01:00
Peter Papp ee4a2205f6 Merge remote-tracking branch 'origin/version-1.8.3' into v2
# Conflicts:
#	app/FileManagerFolder.php
#	app/Http/Controllers/AppFunctionsController.php
#	app/Http/Controllers/Auth/AuthController.php
#	app/Http/Controllers/FileManager/BrowseController.php
#	app/Http/Controllers/General/SetupWizardController.php
#	app/Http/Controllers/General/UpgradeAppController.php
#	app/Http/Controllers/Sharing/FileSharingController.php
#	app/Http/helpers.php
#	app/Setting.php
#	composer.lock
#	public/mix-manifest.json
#	resources/js/App.vue
#	resources/js/components/Others/Forms/FormLabel.vue
#	resources/js/store/modules/app.js
#	resources/js/views/Admin.vue
#	resources/js/views/Mobile/AdminMobileMenu.vue
#	resources/js/views/Shared/SharedPage.vue
#	resources/views/index.blade.php
#	resources/views/vuefilemanager/crawler/og-view.blade.php
#	resources/views/vuefilemanager/invoice.blade.php
#	routes/api.php
#	routes/web.php
2021-03-27 12:12:42 +01:00
Peter Papp af79a28361 - redirect after sign in/up to payment page
- extended /api/oasis/subscribe function
- setup:dev extended data
2021-03-24 11:38:15 +01:00
Peter Papp 0e3c6e286e - extend setup:dev script
- Stripe taxes refactoring
- billing subscription fixes
2021-03-24 08:42:10 +01:00
Peter Papp 480f518ebc - Fixed UpgradeBilling.vue
- Fixed CreatePaymentMethod.vue
2021-03-24 08:19:52 +01:00
Milos Holba 4142f829be cahng laravel translation, move route for languages from api to web, fix contact formular 2021-03-23 21:00:25 +01:00
Peter Papp 75042e0c42 - set password backend 2021-03-23 15:32:28 +01:00
Peter Papp 9566a4a830 - set password and login frontend 2021-03-23 12:03:23 +01:00
Peter Papp 7521c588fc - payment for subscription frontend 2021-03-23 11:12:41 +01:00
Peter Papp 778a94e5ba - Pay and subscribe from generated Subscription Request 2021-03-22 15:41:47 +01:00
Peter Papp 0db55b51d2 - get subscription request api 2021-03-22 12:05:45 +01:00
Peter Papp 3c01ce5ad3 - admin client order 2021-03-22 10:43:37 +01:00
Peter Papp 80b24cd753 - added CzechRegisterSearchService
- oasis RouteServiceProvider.php
- oasis admincontroller
2021-03-22 08:19:50 +01:00
Milos Holba c8dedd44c4 add cache for languages, make function to laravel translate 2021-03-19 20:17:12 +01:00
Peter Papp f4b3f1f163 - public sharing refactored part 3 2021-03-19 10:13:48 +01:00
Peter Papp ed8ab2978f - public sharing refactored part 2 2021-03-19 09:04:18 +01:00
Peter Papp db9900fcfb - public sharing refactored part 1 2021-03-19 07:27:15 +01:00
Milos Holba ba7d6be249 make string in language_strings for the regular license 2021-03-18 16:41:43 +01:00
Peter Papp 816c8c3e07 - protected share authentification backend 2021-03-18 10:06:27 +01:00
Milos Holba 617f715774 add load strings for i18n from database 2021-03-16 19:26:42 +01:00
Peter Papp f0e9c80572 frontend function consolidation part 2 2021-03-16 11:53:19 +01:00
Peter Papp 803cc089bd Admin & User account frontend consolidation 2021-03-15 16:56:26 +01:00
Peter Papp 749bc4ae83 private share routes moved to share.php 2021-03-15 07:04:42 +01:00
Peter Papp 7e3bbe4008 get shared via route model binding refactoring 2021-03-15 06:59:39 +01:00