mirror of
				https://github.com/crater-invoice/crater.git
				synced 2025-10-31 05:31:10 -04:00 
			
		
		
		
	Compare commits
	
		
			13 Commits
		
	
	
		
			dependabot
			...
			upgrade-vi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e1baac7e3f | |||
| 05d5ce26fd | |||
| 393fe20010 | |||
| 57bdbd2897 | |||
| 7447cc24f9 | |||
| 889d22d92c | |||
| bc8f2cd484 | |||
| 4e47f58bad | |||
| d8c429912e | |||
| 0aaf0e7e75 | |||
| 3d0b89bb4d | |||
| 38c4b9ebce | |||
| 7be59e78e0 | 
							
								
								
									
										161
									
								
								.github/workflows/uffizzi-build.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										161
									
								
								.github/workflows/uffizzi-build.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,161 @@ | |||||||
|  | name: Build PR Image | ||||||
|  | on: | ||||||
|  |   pull_request: | ||||||
|  |     types: [opened,synchronize,reopened,closed] | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |  | ||||||
|  |   build-application: | ||||||
|  |     name: Build and Push `application` | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }} | ||||||
|  |     outputs: | ||||||
|  |       tags: ${{ steps.meta.outputs.tags }} | ||||||
|  |     steps: | ||||||
|  |       - name: Checkout git repo | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |       - name: Generate UUID image name | ||||||
|  |         id: uuid | ||||||
|  |         run: echo "UUID_TAG_APP=$(uuidgen)" >> $GITHUB_ENV | ||||||
|  |       - name: Docker metadata | ||||||
|  |         id: meta | ||||||
|  |         uses: docker/metadata-action@v3 | ||||||
|  |         with: | ||||||
|  |           images: registry.uffizzi.com/${{ env.UUID_TAG_APP }} | ||||||
|  |           tags: type=raw,value=60d | ||||||
|  |       - name: Build and Push Image to registry.uffizzi.com ephemeral registry | ||||||
|  |         uses: docker/build-push-action@v2 | ||||||
|  |         with: | ||||||
|  |           push: true | ||||||
|  |           context: ./ | ||||||
|  |           tags: ${{ steps.meta.outputs.tags }} | ||||||
|  |           labels: ${{ steps.meta.outputs.labels }} | ||||||
|  |           file: ./uffizzi/Dockerfile | ||||||
|  |  | ||||||
|  |   build-nginx: | ||||||
|  |     needs:  | ||||||
|  |       - build-application | ||||||
|  |     name: Build and Push `nginx` | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }} | ||||||
|  |     outputs: | ||||||
|  |       tags: ${{ steps.meta.outputs.tags }} | ||||||
|  |     steps: | ||||||
|  |       - name: Checkout git repo | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |       - name: Set up Docker Buildx | ||||||
|  |         uses: docker/setup-buildx-action@v2         | ||||||
|  |       - name: Generate UUID image name | ||||||
|  |         id: uuid | ||||||
|  |         run: echo "UUID_TAG_NGINX=$(uuidgen)" >> $GITHUB_ENV | ||||||
|  |       - name: Docker metadata | ||||||
|  |         id: meta | ||||||
|  |         uses: docker/metadata-action@v3 | ||||||
|  |         with: | ||||||
|  |           images: registry.uffizzi.com/${{ env.UUID_TAG_NGINX }} | ||||||
|  |           tags: type=raw,value=60d | ||||||
|  |       - name: Build and Push Image to Uffizzi ephemeral registry | ||||||
|  |         uses: docker/build-push-action@v2 | ||||||
|  |         with: | ||||||
|  |           push: true | ||||||
|  |           context: ./ | ||||||
|  |           tags: ${{ steps.meta.outputs.tags }} | ||||||
|  |           labels: ${{ steps.meta.outputs.labels }} | ||||||
|  |           file: ./uffizzi/nginx/Dockerfile | ||||||
|  |           build-args: | | ||||||
|  |             BASE_IMAGE=${{ needs.build-application.outputs.tags }} | ||||||
|  |           cache-from: type=gha | ||||||
|  |           cache-to: type=gha,mode=max | ||||||
|  |  | ||||||
|  |  | ||||||
|  |   build-crond: | ||||||
|  |     name: Build and Push `crond` | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }} | ||||||
|  |     outputs: | ||||||
|  |       tags: ${{ steps.meta.outputs.tags }} | ||||||
|  |     steps: | ||||||
|  |       - name: Checkout git repo | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |       - name: Set up Docker Buildx | ||||||
|  |         uses: docker/setup-buildx-action@v2         | ||||||
|  |       - name: Generate UUID image name | ||||||
|  |         id: uuid | ||||||
|  |         run: echo "UUID_TAG_CROND=$(uuidgen)" >> $GITHUB_ENV | ||||||
|  |       - name: Docker metadata | ||||||
|  |         id: meta | ||||||
|  |         uses: docker/metadata-action@v3 | ||||||
|  |         with: | ||||||
|  |           images: registry.uffizzi.com/${{ env.UUID_TAG_CROND }} | ||||||
|  |           tags: type=raw,value=60d | ||||||
|  |       - name: Build and Push Image to registry.uffizzi.com ephemeral registry | ||||||
|  |         uses: docker/build-push-action@v2 | ||||||
|  |         with: | ||||||
|  |           push: true | ||||||
|  |           context: ./ | ||||||
|  |           tags: ${{ steps.meta.outputs.tags }} | ||||||
|  |           labels: ${{ steps.meta.outputs.labels }} | ||||||
|  |           file: ./uffizzi/crond/Dockerfile       | ||||||
|  |           cache-from: type=gha | ||||||
|  |           cache-to: type=gha,mode=max | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |   render-compose-file: | ||||||
|  |     name: Render Docker Compose File | ||||||
|  |     # Pass output of this workflow to another triggered by `workflow_run` event. | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     outputs: | ||||||
|  |       compose-file-cache-key: ${{ steps.hash.outputs.hash }} | ||||||
|  |     needs:  | ||||||
|  |       - build-application | ||||||
|  |       - build-nginx | ||||||
|  |       - build-crond | ||||||
|  |     steps: | ||||||
|  |       - name: Checkout git repo | ||||||
|  |         uses: actions/checkout@v3 | ||||||
|  |       - name: Render Compose File | ||||||
|  |         run: | | ||||||
|  |           APP_IMAGE=$(echo ${{ needs.build-application.outputs.tags }}) | ||||||
|  |           export APP_IMAGE | ||||||
|  |           NGINX_IMAGE=$(echo ${{ needs.build-nginx.outputs.tags }}) | ||||||
|  |           export NGINX_IMAGE | ||||||
|  |           CROND_IMAGE=$(echo ${{ needs.build-crond.outputs.tags }}) | ||||||
|  |           export CROND_IMAGE | ||||||
|  |           # Render simple template from environment variables. | ||||||
|  |           envsubst < ./uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml | ||||||
|  |           cat docker-compose.rendered.yml | ||||||
|  |       - name: Upload Rendered Compose File as Artifact | ||||||
|  |         uses: actions/upload-artifact@v3 | ||||||
|  |         with: | ||||||
|  |           name: preview-spec | ||||||
|  |           path: docker-compose.rendered.yml | ||||||
|  |           retention-days: 2 | ||||||
|  |       - name: Serialize PR Event to File | ||||||
|  |         run:  | | ||||||
|  |           cat << EOF > event.json | ||||||
|  |           ${{ toJSON(github.event) }}  | ||||||
|  |            | ||||||
|  |           EOF | ||||||
|  |       - name: Upload PR Event as Artifact | ||||||
|  |         uses: actions/upload-artifact@v3 | ||||||
|  |         with: | ||||||
|  |           name: preview-spec | ||||||
|  |           path: event.json | ||||||
|  |           retention-days: 2 | ||||||
|  |  | ||||||
|  |   delete-preview: | ||||||
|  |     name: Call for Preview Deletion | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     if: ${{ github.event.action == 'closed' }} | ||||||
|  |     steps: | ||||||
|  |       # If this PR is closing, we will not render a compose file nor pass it to the next workflow. | ||||||
|  |       - name: Serialize PR Event to File | ||||||
|  |         run: echo '${{ toJSON(github.event) }}' > event.json | ||||||
|  |       - name: Upload PR Event as Artifact | ||||||
|  |         uses: actions/upload-artifact@v3 | ||||||
|  |         with: | ||||||
|  |           name: preview-spec | ||||||
|  |           path: event.json | ||||||
|  |           retention-days: 2 | ||||||
|  |  | ||||||
							
								
								
									
										84
									
								
								.github/workflows/uffizzi-preview.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										84
									
								
								.github/workflows/uffizzi-preview.yml
									
									
									
									
										vendored
									
									
										Normal file
									
								
							| @ -0,0 +1,84 @@ | |||||||
|  | name: Deploy Uffizzi Preview | ||||||
|  |  | ||||||
|  | on: | ||||||
|  |   workflow_run: | ||||||
|  |     workflows: | ||||||
|  |       - "Build PR Image" | ||||||
|  |     types: | ||||||
|  |       - completed | ||||||
|  |  | ||||||
|  |  | ||||||
|  | jobs: | ||||||
|  |   cache-compose-file: | ||||||
|  |     name: Cache Compose File | ||||||
|  |     runs-on: ubuntu-latest | ||||||
|  |     outputs: | ||||||
|  |       compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }} | ||||||
|  |       pr-number: ${{ env.PR_NUMBER }} | ||||||
|  |     steps: | ||||||
|  |       - name: 'Download artifacts' | ||||||
|  |         # Fetch output (zip archive) from the workflow run that triggered this workflow. | ||||||
|  |         uses: actions/github-script@v6 | ||||||
|  |         with: | ||||||
|  |           script: | | ||||||
|  |             let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({ | ||||||
|  |                owner: context.repo.owner, | ||||||
|  |                repo: context.repo.repo, | ||||||
|  |                run_id: context.payload.workflow_run.id, | ||||||
|  |             }); | ||||||
|  |             let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => { | ||||||
|  |               return artifact.name == "preview-spec" | ||||||
|  |             })[0]; | ||||||
|  |             let download = await github.rest.actions.downloadArtifact({ | ||||||
|  |                owner: context.repo.owner, | ||||||
|  |                repo: context.repo.repo, | ||||||
|  |                artifact_id: matchArtifact.id, | ||||||
|  |                archive_format: 'zip', | ||||||
|  |             }); | ||||||
|  |             let fs = require('fs'); | ||||||
|  |             fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data)); | ||||||
|  |       - name: 'Unzip artifact' | ||||||
|  |         run: unzip preview-spec.zip | ||||||
|  |       - name: Read Event into ENV | ||||||
|  |         run: | | ||||||
|  |           echo 'EVENT_JSON<<EOF' >> $GITHUB_ENV | ||||||
|  |           cat event.json >> $GITHUB_ENV | ||||||
|  |           echo 'EOF' >> $GITHUB_ENV | ||||||
|  |       - name: Hash Rendered Compose File | ||||||
|  |         id: hash | ||||||
|  |         # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact. | ||||||
|  |         if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }} | ||||||
|  |         run: echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV | ||||||
|  |       - name: Cache Rendered Compose File | ||||||
|  |         if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }} | ||||||
|  |         uses: actions/cache@v3 | ||||||
|  |         with: | ||||||
|  |           path: docker-compose.rendered.yml | ||||||
|  |           key: ${{ env.COMPOSE_FILE_HASH }} | ||||||
|  |  | ||||||
|  |       - name: Read PR Number From Event Object | ||||||
|  |         id: pr | ||||||
|  |         run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV | ||||||
|  |  | ||||||
|  |       - name: DEBUG - Print Job Outputs | ||||||
|  |         if: ${{ runner.debug }} | ||||||
|  |         run: | | ||||||
|  |           echo "PR number: ${{ env.PR_NUMBER }}" | ||||||
|  |           echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}" | ||||||
|  |           cat event.json | ||||||
|  |   deploy-uffizzi-preview: | ||||||
|  |     name: Use Remote Workflow to Preview on Uffizzi | ||||||
|  |     needs: | ||||||
|  |       - cache-compose-file | ||||||
|  |     uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2.6.1 | ||||||
|  |     with: | ||||||
|  |       # If this workflow was triggered by a PR close event, cache-key will be an empty string | ||||||
|  |       # and this reusable workflow will delete the preview deployment. | ||||||
|  |       compose-file-cache-key: ${{ needs.cache-compose-file.outputs.compose-file-cache-key }} | ||||||
|  |       compose-file-cache-path: docker-compose.rendered.yml | ||||||
|  |       server: https://app.uffizzi.com/ | ||||||
|  |       pr-number: ${{ needs.cache-compose-file.outputs.pr-number }} | ||||||
|  |     permissions: | ||||||
|  |       contents: read | ||||||
|  |       pull-requests: write | ||||||
|  |       id-token: write | ||||||
							
								
								
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @ -17,3 +17,4 @@ Homestead.yaml | |||||||
| /public/docs | /public/docs | ||||||
| /.scribe | /.scribe | ||||||
| !storage/fonts/.gitkeep | !storage/fonts/.gitkeep | ||||||
|  | .DS_Store | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| FROM php:7.4-fpm | FROM php:8.1-fpm | ||||||
|  |  | ||||||
| # Arguments defined in docker-compose.yml | # Arguments defined in docker-compose.yml | ||||||
| ARG user | ARG user | ||||||
|  | |||||||
| @ -55,7 +55,7 @@ class CreateTemplateCommand extends Command | |||||||
|         copy(public_path("/build/img/PDF/{$type}1.png"), public_path("/build/img/PDF/{$templateName}.png")); |         copy(public_path("/build/img/PDF/{$type}1.png"), public_path("/build/img/PDF/{$templateName}.png")); | ||||||
|         copy(resource_path("/static/img/PDF/{$type}1.png"), resource_path("/static/img/PDF/{$templateName}.png")); |         copy(resource_path("/static/img/PDF/{$type}1.png"), resource_path("/static/img/PDF/{$templateName}.png")); | ||||||
|  |  | ||||||
|         $path = resource_path("app/pdf/{$type}/{$templateName}.blade.php"); |         $path = resource_path("views/app/pdf/{$type}/{$templateName}.blade.php"); | ||||||
|         $type = ucfirst($type); |         $type = ucfirst($type); | ||||||
|         $this->info("{$type} Template created successfully at ".$path); |         $this->info("{$type} Template created successfully at ".$path); | ||||||
|  |  | ||||||
|  | |||||||
| @ -2,14 +2,15 @@ | |||||||
|  |  | ||||||
| namespace Crater\Http\Controllers\V1\Admin\Report; | namespace Crater\Http\Controllers\V1\Admin\Report; | ||||||
|  |  | ||||||
|  | use PDF; | ||||||
| use Carbon\Carbon; | use Carbon\Carbon; | ||||||
| use Crater\Http\Controllers\Controller; |  | ||||||
| use Crater\Models\Company; | use Crater\Models\Company; | ||||||
| use Crater\Models\CompanySetting; | use Crater\Models\Currency; | ||||||
| use Crater\Models\Customer; | use Crater\Models\Customer; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
|  | use Crater\Models\CompanySetting; | ||||||
| use Illuminate\Support\Facades\App; | use Illuminate\Support\Facades\App; | ||||||
| use PDF; | use Crater\Http\Controllers\Controller; | ||||||
|  |  | ||||||
| class CustomerSalesReportController extends Controller | class CustomerSalesReportController extends Controller | ||||||
| { | { | ||||||
| @ -56,6 +57,7 @@ class CustomerSalesReportController extends Controller | |||||||
|         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); |         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); | ||||||
|         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); |         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); | ||||||
|         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); |         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); | ||||||
|  |         $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); | ||||||
|  |  | ||||||
|         $colors = [ |         $colors = [ | ||||||
|             'primary_text_color', |             'primary_text_color', | ||||||
| @ -80,6 +82,7 @@ class CustomerSalesReportController extends Controller | |||||||
|             'company' => $company, |             'company' => $company, | ||||||
|             'from_date' => $from_date, |             'from_date' => $from_date, | ||||||
|             'to_date' => $to_date, |             'to_date' => $to_date, | ||||||
|  |             'currency' => $currency, | ||||||
|         ]); |         ]); | ||||||
|  |  | ||||||
|         $pdf = PDF::loadView('app.pdf.reports.sales-customers'); |         $pdf = PDF::loadView('app.pdf.reports.sales-customers'); | ||||||
|  | |||||||
| @ -2,14 +2,15 @@ | |||||||
|  |  | ||||||
| namespace Crater\Http\Controllers\V1\Admin\Report; | namespace Crater\Http\Controllers\V1\Admin\Report; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use Crater\Http\Controllers\Controller; |  | ||||||
| use Crater\Models\Company; |  | ||||||
| use Crater\Models\CompanySetting; |  | ||||||
| use Crater\Models\Expense; |  | ||||||
| use Illuminate\Http\Request; |  | ||||||
| use Illuminate\Support\Facades\App; |  | ||||||
| use PDF; | use PDF; | ||||||
|  | use Carbon\Carbon; | ||||||
|  | use Crater\Models\Company; | ||||||
|  | use Crater\Models\Expense; | ||||||
|  | use Crater\Models\Currency; | ||||||
|  | use Illuminate\Http\Request; | ||||||
|  | use Crater\Models\CompanySetting; | ||||||
|  | use Illuminate\Support\Facades\App; | ||||||
|  | use Crater\Http\Controllers\Controller; | ||||||
|  |  | ||||||
| class ExpensesReportController extends Controller | class ExpensesReportController extends Controller | ||||||
| { | { | ||||||
| @ -43,6 +44,7 @@ class ExpensesReportController extends Controller | |||||||
|         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); |         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); | ||||||
|         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); |         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); | ||||||
|         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); |         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); | ||||||
|  |         $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); | ||||||
|  |  | ||||||
|         $colors = [ |         $colors = [ | ||||||
|             'primary_text_color', |             'primary_text_color', | ||||||
| @ -66,6 +68,7 @@ class ExpensesReportController extends Controller | |||||||
|             'company' => $company, |             'company' => $company, | ||||||
|             'from_date' => $from_date, |             'from_date' => $from_date, | ||||||
|             'to_date' => $to_date, |             'to_date' => $to_date, | ||||||
|  |             'currency' => $currency, | ||||||
|         ]); |         ]); | ||||||
|         $pdf = PDF::loadView('app.pdf.reports.expenses'); |         $pdf = PDF::loadView('app.pdf.reports.expenses'); | ||||||
|  |  | ||||||
|  | |||||||
| @ -2,14 +2,15 @@ | |||||||
|  |  | ||||||
| namespace Crater\Http\Controllers\V1\Admin\Report; | namespace Crater\Http\Controllers\V1\Admin\Report; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use Crater\Http\Controllers\Controller; |  | ||||||
| use Crater\Models\Company; |  | ||||||
| use Crater\Models\CompanySetting; |  | ||||||
| use Crater\Models\InvoiceItem; |  | ||||||
| use Illuminate\Http\Request; |  | ||||||
| use Illuminate\Support\Facades\App; |  | ||||||
| use PDF; | use PDF; | ||||||
|  | use Carbon\Carbon; | ||||||
|  | use Crater\Models\Company; | ||||||
|  | use Crater\Models\Currency; | ||||||
|  | use Illuminate\Http\Request; | ||||||
|  | use Crater\Models\InvoiceItem; | ||||||
|  | use Crater\Models\CompanySetting; | ||||||
|  | use Illuminate\Support\Facades\App; | ||||||
|  | use Crater\Http\Controllers\Controller; | ||||||
|  |  | ||||||
| class ItemSalesReportController extends Controller | class ItemSalesReportController extends Controller | ||||||
| { | { | ||||||
| @ -43,6 +44,7 @@ class ItemSalesReportController extends Controller | |||||||
|         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); |         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); | ||||||
|         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); |         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); | ||||||
|         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); |         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); | ||||||
|  |         $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); | ||||||
|  |  | ||||||
|         $colors = [ |         $colors = [ | ||||||
|             'primary_text_color', |             'primary_text_color', | ||||||
| @ -66,6 +68,7 @@ class ItemSalesReportController extends Controller | |||||||
|             'company' => $company, |             'company' => $company, | ||||||
|             'from_date' => $from_date, |             'from_date' => $from_date, | ||||||
|             'to_date' => $to_date, |             'to_date' => $to_date, | ||||||
|  |             'currency' => $currency, | ||||||
|         ]); |         ]); | ||||||
|         $pdf = PDF::loadView('app.pdf.reports.sales-items'); |         $pdf = PDF::loadView('app.pdf.reports.sales-items'); | ||||||
|  |  | ||||||
|  | |||||||
| @ -2,15 +2,16 @@ | |||||||
|  |  | ||||||
| namespace Crater\Http\Controllers\V1\Admin\Report; | namespace Crater\Http\Controllers\V1\Admin\Report; | ||||||
|  |  | ||||||
|  | use PDF; | ||||||
| use Carbon\Carbon; | use Carbon\Carbon; | ||||||
| use Crater\Http\Controllers\Controller; |  | ||||||
| use Crater\Models\Company; | use Crater\Models\Company; | ||||||
| use Crater\Models\CompanySetting; |  | ||||||
| use Crater\Models\Expense; | use Crater\Models\Expense; | ||||||
| use Crater\Models\Payment; | use Crater\Models\Payment; | ||||||
|  | use Crater\Models\Currency; | ||||||
| use Illuminate\Http\Request; | use Illuminate\Http\Request; | ||||||
|  | use Crater\Models\CompanySetting; | ||||||
| use Illuminate\Support\Facades\App; | use Illuminate\Support\Facades\App; | ||||||
| use PDF; | use Crater\Http\Controllers\Controller; | ||||||
|  |  | ||||||
| class ProfitLossReportController extends Controller | class ProfitLossReportController extends Controller | ||||||
| { | { | ||||||
| @ -49,6 +50,8 @@ class ProfitLossReportController extends Controller | |||||||
|         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); |         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); | ||||||
|         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); |         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); | ||||||
|         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); |         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); | ||||||
|  |         $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); | ||||||
|  |  | ||||||
|  |  | ||||||
|         $colors = [ |         $colors = [ | ||||||
|             'primary_text_color', |             'primary_text_color', | ||||||
| @ -74,6 +77,7 @@ class ProfitLossReportController extends Controller | |||||||
|             'company' => $company, |             'company' => $company, | ||||||
|             'from_date' => $from_date, |             'from_date' => $from_date, | ||||||
|             'to_date' => $to_date, |             'to_date' => $to_date, | ||||||
|  |             'currency' => $currency, | ||||||
|         ]); |         ]); | ||||||
|         $pdf = PDF::loadView('app.pdf.reports.profit-loss'); |         $pdf = PDF::loadView('app.pdf.reports.profit-loss'); | ||||||
|  |  | ||||||
|  | |||||||
| @ -2,14 +2,15 @@ | |||||||
|  |  | ||||||
| namespace Crater\Http\Controllers\V1\Admin\Report; | namespace Crater\Http\Controllers\V1\Admin\Report; | ||||||
|  |  | ||||||
| use Carbon\Carbon; |  | ||||||
| use Crater\Http\Controllers\Controller; |  | ||||||
| use Crater\Models\Company; |  | ||||||
| use Crater\Models\CompanySetting; |  | ||||||
| use Crater\Models\Tax; |  | ||||||
| use Illuminate\Http\Request; |  | ||||||
| use Illuminate\Support\Facades\App; |  | ||||||
| use PDF; | use PDF; | ||||||
|  | use Carbon\Carbon; | ||||||
|  | use Crater\Models\Tax; | ||||||
|  | use Crater\Models\Company; | ||||||
|  | use Crater\Models\Currency; | ||||||
|  | use Illuminate\Http\Request; | ||||||
|  | use Crater\Models\CompanySetting; | ||||||
|  | use Illuminate\Support\Facades\App; | ||||||
|  | use Crater\Http\Controllers\Controller; | ||||||
|  |  | ||||||
| class TaxSummaryReportController extends Controller | class TaxSummaryReportController extends Controller | ||||||
| { | { | ||||||
| @ -44,6 +45,8 @@ class TaxSummaryReportController extends Controller | |||||||
|         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); |         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id); | ||||||
|         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); |         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat); | ||||||
|         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); |         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat); | ||||||
|  |         $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id)); | ||||||
|  |  | ||||||
|  |  | ||||||
|         $colors = [ |         $colors = [ | ||||||
|             'primary_text_color', |             'primary_text_color', | ||||||
| @ -68,6 +71,7 @@ class TaxSummaryReportController extends Controller | |||||||
|             'company' => $company, |             'company' => $company, | ||||||
|             'from_date' => $from_date, |             'from_date' => $from_date, | ||||||
|             'to_date' => $to_date, |             'to_date' => $to_date, | ||||||
|  |             'currency' => $currency, | ||||||
|         ]); |         ]); | ||||||
|  |  | ||||||
|         $pdf = PDF::loadView('app.pdf.reports.tax-summary'); |         $pdf = PDF::loadView('app.pdf.reports.tax-summary'); | ||||||
|  | |||||||
| @ -17,7 +17,6 @@ | |||||||
|     "fideloper/proxy": "^4.0", |     "fideloper/proxy": "^4.0", | ||||||
|     "fruitcake/laravel-cors": "^1.0", |     "fruitcake/laravel-cors": "^1.0", | ||||||
|     "guzzlehttp/guzzle": "^7.0.1", |     "guzzlehttp/guzzle": "^7.0.1", | ||||||
|     "innocenzi/laravel-vite": "^0.1.1", |  | ||||||
|     "intervention/image": "^2.3", |     "intervention/image": "^2.3", | ||||||
|     "jasonmccreary/laravel-test-assertions": "^2.0", |     "jasonmccreary/laravel-test-assertions": "^2.0", | ||||||
|     "laravel/framework": "^8.0", |     "laravel/framework": "^8.0", | ||||||
| @ -38,7 +37,7 @@ | |||||||
|     "barryvdh/laravel-ide-helper": "^2.6", |     "barryvdh/laravel-ide-helper": "^2.6", | ||||||
|     "beyondcode/laravel-dump-server": "^1.0", |     "beyondcode/laravel-dump-server": "^1.0", | ||||||
|     "facade/ignition": "^2.3.6", |     "facade/ignition": "^2.3.6", | ||||||
|     "friendsofphp/php-cs-fixer": "^3.0", |     "friendsofphp/php-cs-fixer": "^3.8", | ||||||
|     "fakerphp/faker": "^1.9.1", |     "fakerphp/faker": "^1.9.1", | ||||||
|     "mockery/mockery": "^1.3.1", |     "mockery/mockery": "^1.3.1", | ||||||
|     "nunomaduro/collision": "^5.0", |     "nunomaduro/collision": "^5.0", | ||||||
| @ -81,7 +80,10 @@ | |||||||
|   "config": { |   "config": { | ||||||
|     "optimize-autoloader": true, |     "optimize-autoloader": true, | ||||||
|     "preferred-install": "dist", |     "preferred-install": "dist", | ||||||
|     "sort-packages": true |     "sort-packages": true, | ||||||
|  |     "allow-plugins": { | ||||||
|  |       "pestphp/pest-plugin": true | ||||||
|  |     } | ||||||
|   }, |   }, | ||||||
|   "extra": { |   "extra": { | ||||||
|     "laravel": { |     "laravel": { | ||||||
|  | |||||||
							
								
								
									
										3870
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										3870
									
								
								composer.lock
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -27,6 +27,7 @@ return [ | |||||||
|             'tokenizer', |             'tokenizer', | ||||||
|             'JSON', |             'JSON', | ||||||
|             'cURL', |             'cURL', | ||||||
|  |             'zip', | ||||||
|         ], |         ], | ||||||
|         'apache' => [ |         'apache' => [ | ||||||
|             'mod_rewrite', |             'mod_rewrite', | ||||||
|  | |||||||
| @ -1,67 +0,0 @@ | |||||||
| <?php |  | ||||||
|  |  | ||||||
| return [ |  | ||||||
|     /* |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | Entrypoints |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | The files in the configured directories will be considered |  | ||||||
|     | entry points and will not be required in the configuration file. |  | ||||||
|     | To disable the feature, set to false. |  | ||||||
|     */ |  | ||||||
|     'entrypoints' => [ |  | ||||||
|         'resources/scripts/main.js', |  | ||||||
|     ], |  | ||||||
|     'ignore_patterns' => ["/\.d\.ts$/"], |  | ||||||
|  |  | ||||||
|     /* |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | Aliases |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | These aliases will be added to the Vite configuration and used |  | ||||||
|     | to generate a proper tsconfig.json file. |  | ||||||
|     */ |  | ||||||
|     'aliases' => [ |  | ||||||
|         '@' => 'resources', |  | ||||||
|     ], |  | ||||||
|  |  | ||||||
|     /* |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | Static assets path |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | This option defines the directory that Vite considers as the |  | ||||||
|     | public directory. Its content will be copied to the build directory |  | ||||||
|     | at build-time. |  | ||||||
|     | https://vitejs.dev/config/#publicdir |  | ||||||
|     */ |  | ||||||
|     'public_directory' => resource_path('static'), |  | ||||||
|  |  | ||||||
|     /* |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | Ping timeout |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | The maximum duration, in seconds, that the ping to the development |  | ||||||
|     | server should take while trying to determine whether to use the |  | ||||||
|     | manifest or the server in a local environment. |  | ||||||
|     */ |  | ||||||
|     'ping_timeout' => .1, |  | ||||||
|  |  | ||||||
|     /* |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | Build path |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | The directory, relative to /public, in which Vite will build |  | ||||||
|     | the production files. This should match "build.outDir" in the Vite |  | ||||||
|     | configuration file. |  | ||||||
|     */ |  | ||||||
|     'build_path' => 'build', |  | ||||||
|  |  | ||||||
|     /* |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | Development URL |  | ||||||
|     |-------------------------------------------------------------------------- |  | ||||||
|     | The URL at which the Vite development server runs. |  | ||||||
|     | This is used to generate the script tags when developing. |  | ||||||
|     */ |  | ||||||
|     'dev_url' => 'http://localhost:3000', |  | ||||||
| ]; |  | ||||||
| @ -170,7 +170,7 @@ class CountriesTableSeeder extends Seeder | |||||||
|         ['id' => 152,'code' => 'NR','name' => "Nauru",'phonecode' => 674], |         ['id' => 152,'code' => 'NR','name' => "Nauru",'phonecode' => 674], | ||||||
|         ['id' => 153,'code' => 'NP','name' => "Nepal",'phonecode' => 977], |         ['id' => 153,'code' => 'NP','name' => "Nepal",'phonecode' => 977], | ||||||
|         ['id' => 154,'code' => 'AN','name' => "Netherlands Antilles",'phonecode' => 599], |         ['id' => 154,'code' => 'AN','name' => "Netherlands Antilles",'phonecode' => 599], | ||||||
|         ['id' => 155,'code' => 'NL','name' => "Netherlands The",'phonecode' => 31], |         ['id' => 155,'code' => 'NL','name' => "Netherlands",'phonecode' => 31], | ||||||
|         ['id' => 156,'code' => 'NC','name' => "New Caledonia",'phonecode' => 687], |         ['id' => 156,'code' => 'NC','name' => "New Caledonia",'phonecode' => 687], | ||||||
|         ['id' => 157,'code' => 'NZ','name' => "New Zealand",'phonecode' => 64], |         ['id' => 157,'code' => 'NZ','name' => "New Zealand",'phonecode' => 64], | ||||||
|         ['id' => 158,'code' => 'NI','name' => "Nicaragua",'phonecode' => 505], |         ['id' => 158,'code' => 'NI','name' => "Nicaragua",'phonecode' => 505], | ||||||
|  | |||||||
							
								
								
									
										481
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										481
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -214,23 +214,6 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", |       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.3.tgz", | ||||||
|       "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==" |       "integrity": "sha512-xDu17cEfh7Kid/d95kB6tZsLOmSWKCZKtprnhVepjsSaCij+lM3mItSJDuuHDMbCWTh8Ejmebwb+KONcCJ0eXQ==" | ||||||
|     }, |     }, | ||||||
|     "@rvxlab/tailwind-plugin-ios-full-height": { |  | ||||||
|       "version": "1.1.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@rvxlab/tailwind-plugin-ios-full-height/-/tailwind-plugin-ios-full-height-1.1.0.tgz", |  | ||||||
|       "integrity": "sha512-jPIxXn0raN/YTk8nXesqM+JbS2WWd5XaUk/MbaAgVDDPyYtsPfeN3B26xIhSa2oE2+JB66tegPUMSOmixzroXg==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "@stripe/stripe-js": { |  | ||||||
|       "version": "1.32.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@stripe/stripe-js/-/stripe-js-1.32.0.tgz", |  | ||||||
|       "integrity": "sha512-7EvBnbBfS1aynfLRmBFcuumHNGjKxnNkO47rorFBktqDYHwo7Yw6pfDW2iqq0R8r7i7XiJEdWPvvEgQAiDrx3A==" |  | ||||||
|     }, |  | ||||||
|     "@tailwindcss/aspect-ratio": { |  | ||||||
|       "version": "0.4.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@tailwindcss/aspect-ratio/-/aspect-ratio-0.4.0.tgz", |  | ||||||
|       "integrity": "sha512-WJu0I4PpqNPuutpaA9zDUq2JXR+lorZ7PbLcKNLmb6GL9/HLfC7w3CRsMhJF4BbYd/lkY6CfXOvkYpuGnZfkpQ==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "@tailwindcss/forms": { |     "@tailwindcss/forms": { | ||||||
|       "version": "0.4.0", |       "version": "0.4.0", | ||||||
|       "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz", |       "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.4.0.tgz", | ||||||
| @ -240,22 +223,6 @@ | |||||||
|         "mini-svg-data-uri": "^1.2.3" |         "mini-svg-data-uri": "^1.2.3" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@tailwindcss/line-clamp": { |  | ||||||
|       "version": "0.3.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@tailwindcss/line-clamp/-/line-clamp-0.3.1.tgz", |  | ||||||
|       "integrity": "sha512-pNr0T8LAc3TUx/gxCfQZRe9NB2dPEo/cedPHzUGIPxqDMhgjwNm6jYxww4W5l0zAsAddxr+XfZcqttGiFDgrGg==" |  | ||||||
|     }, |  | ||||||
|     "@tailwindcss/typography": { |  | ||||||
|       "version": "0.5.3", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.3.tgz", |  | ||||||
|       "integrity": "sha512-Cn4MufL/xiTh2Npw26xiL7gP3GFkJH+zWM8DAm/NNEr4gF5N9D6gY9zMNNQUu27m8g0IIk665BUuoU92wVUBkA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "requires": { |  | ||||||
|         "lodash.castarray": "^4.4.0", |  | ||||||
|         "lodash.isplainobject": "^4.0.6", |  | ||||||
|         "lodash.merge": "^4.6.2" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "@tiptap/core": { |     "@tiptap/core": { | ||||||
|       "version": "2.0.0-beta.99", |       "version": "2.0.0-beta.99", | ||||||
|       "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.0.0-beta.99.tgz", |       "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-2.0.0-beta.99.tgz", | ||||||
| @ -419,11 +386,6 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-2.0.0-beta.13.tgz", |       "resolved": "https://registry.npmjs.org/@tiptap/extension-text/-/extension-text-2.0.0-beta.13.tgz", | ||||||
|       "integrity": "sha512-0EtAwuRldCAoFaL/iXgkRepEeOd55rPg5N4FQUN1xTwZT7PDofukP0DG/2jff/Uj17x4uTaJAa9qlFWuNnDvjw==" |       "integrity": "sha512-0EtAwuRldCAoFaL/iXgkRepEeOd55rPg5N4FQUN1xTwZT7PDofukP0DG/2jff/Uj17x4uTaJAa9qlFWuNnDvjw==" | ||||||
|     }, |     }, | ||||||
|     "@tiptap/extension-text-align": { |  | ||||||
|       "version": "2.0.0-beta.31", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@tiptap/extension-text-align/-/extension-text-align-2.0.0-beta.31.tgz", |  | ||||||
|       "integrity": "sha512-gSJqi57piiMPc2r6WEkXv7ZgQIogigsRUhmlnZC/7s3zzOvjXrexWnV0Ctt/9A7BKcM7OHMykpZyoewvk6QRTw==" |  | ||||||
|     }, |  | ||||||
|     "@tiptap/starter-kit": { |     "@tiptap/starter-kit": { | ||||||
|       "version": "2.0.0-beta.97", |       "version": "2.0.0-beta.97", | ||||||
|       "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.97.tgz", |       "resolved": "https://registry.npmjs.org/@tiptap/starter-kit/-/starter-kit-2.0.0-beta.97.tgz", | ||||||
| @ -575,12 +537,6 @@ | |||||||
|         "@types/prosemirror-transform": "*" |         "@types/prosemirror-transform": "*" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vitejs/plugin-vue": { |  | ||||||
|       "version": "1.10.2", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-1.10.2.tgz", |  | ||||||
|       "integrity": "sha512-/QJ0Z9qfhAFtKRY+r57ziY4BSbGUTGsPRMpB/Ron3QPwBZM4OZAZHdTa4a8PafCwU5DTatXG8TMDoP8z+oDqJw==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "@vue/compiler-core": { |     "@vue/compiler-core": { | ||||||
|       "version": "3.2.4", |       "version": "3.2.4", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz", |       "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.4.tgz", | ||||||
| @ -602,70 +558,6 @@ | |||||||
|         "@vue/shared": "3.2.4" |         "@vue/shared": "3.2.4" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/compiler-sfc": { |  | ||||||
|       "version": "3.2.37", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz", |  | ||||||
|       "integrity": "sha512-+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "requires": { |  | ||||||
|         "@babel/parser": "^7.16.4", |  | ||||||
|         "@vue/compiler-core": "3.2.37", |  | ||||||
|         "@vue/compiler-dom": "3.2.37", |  | ||||||
|         "@vue/compiler-ssr": "3.2.37", |  | ||||||
|         "@vue/reactivity-transform": "3.2.37", |  | ||||||
|         "@vue/shared": "3.2.37", |  | ||||||
|         "estree-walker": "^2.0.2", |  | ||||||
|         "magic-string": "^0.25.7", |  | ||||||
|         "postcss": "^8.1.10", |  | ||||||
|         "source-map": "^0.6.1" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@babel/parser": { |  | ||||||
|           "version": "7.18.6", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz", |  | ||||||
|           "integrity": "sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==", |  | ||||||
|           "dev": true |  | ||||||
|         }, |  | ||||||
|         "@vue/compiler-core": { |  | ||||||
|           "version": "3.2.37", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz", |  | ||||||
|           "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "@babel/parser": "^7.16.4", |  | ||||||
|             "@vue/shared": "3.2.37", |  | ||||||
|             "estree-walker": "^2.0.2", |  | ||||||
|             "source-map": "^0.6.1" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "@vue/compiler-dom": { |  | ||||||
|           "version": "3.2.37", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.37.tgz", |  | ||||||
|           "integrity": "sha512-yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "@vue/compiler-core": "3.2.37", |  | ||||||
|             "@vue/shared": "3.2.37" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "@vue/compiler-ssr": { |  | ||||||
|           "version": "3.2.37", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz", |  | ||||||
|           "integrity": "sha512-7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "@vue/compiler-dom": "3.2.37", |  | ||||||
|             "@vue/shared": "3.2.37" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "@vue/shared": { |  | ||||||
|           "version": "3.2.37", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz", |  | ||||||
|           "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==", |  | ||||||
|           "dev": true |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "@vue/compiler-ssr": { |     "@vue/compiler-ssr": { | ||||||
|       "version": "3.2.19", |       "version": "3.2.19", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz", |       "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz", | ||||||
| @ -715,45 +607,6 @@ | |||||||
|         "@vue/shared": "3.2.4" |         "@vue/shared": "3.2.4" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "@vue/reactivity-transform": { |  | ||||||
|       "version": "3.2.37", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz", |  | ||||||
|       "integrity": "sha512-IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "requires": { |  | ||||||
|         "@babel/parser": "^7.16.4", |  | ||||||
|         "@vue/compiler-core": "3.2.37", |  | ||||||
|         "@vue/shared": "3.2.37", |  | ||||||
|         "estree-walker": "^2.0.2", |  | ||||||
|         "magic-string": "^0.25.7" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@babel/parser": { |  | ||||||
|           "version": "7.18.6", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.18.6.tgz", |  | ||||||
|           "integrity": "sha512-uQVSa9jJUe/G/304lXspfWVpKpK4euFLgGiMQFOCpM/bgcAdeoHwi/OQz23O9GK2osz26ZiXRRV9aV+Yl1O8tw==", |  | ||||||
|           "dev": true |  | ||||||
|         }, |  | ||||||
|         "@vue/compiler-core": { |  | ||||||
|           "version": "3.2.37", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.37.tgz", |  | ||||||
|           "integrity": "sha512-81KhEjo7YAOh0vQJoSmAD68wLfYqJvoiD4ulyedzF+OEk/bk6/hx3fTNVfuzugIIaTrOx4PGx6pAiBRe5e9Zmg==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "@babel/parser": "^7.16.4", |  | ||||||
|             "@vue/shared": "3.2.37", |  | ||||||
|             "estree-walker": "^2.0.2", |  | ||||||
|             "source-map": "^0.6.1" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "@vue/shared": { |  | ||||||
|           "version": "3.2.37", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.37.tgz", |  | ||||||
|           "integrity": "sha512-4rSJemR2NQIo9Klm1vabqWjD8rs/ZaJSzMxkMNeJS6lHiUjjUeYFbooN19NgFjztubEKh3WlZUeOLVdbbUWHsw==", |  | ||||||
|           "dev": true |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "@vue/ref-transform": { |     "@vue/ref-transform": { | ||||||
|       "version": "3.2.19", |       "version": "3.2.19", | ||||||
|       "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz", |       "resolved": "https://registry.npmjs.org/@vue/ref-transform/-/ref-transform-3.2.19.tgz", | ||||||
| @ -824,44 +677,6 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz", |       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.4.tgz", | ||||||
|       "integrity": "sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg==" |       "integrity": "sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg==" | ||||||
|     }, |     }, | ||||||
|     "@vuelidate/components": { |  | ||||||
|       "version": "1.1.22", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vuelidate/components/-/components-1.1.22.tgz", |  | ||||||
|       "integrity": "sha512-Iqr1Teylh0/cIXfn0XzVMrvrJhFfpmjdhRfCvUfyEWIN0E47WBR8uy/qUjwnfJM8FbdCgcZF2LLwEF7sA5rj4A==", |  | ||||||
|       "requires": { |  | ||||||
|         "@vuelidate/core": "^2.0.0-alpha.42" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "@vuelidate/core": { |  | ||||||
|       "version": "2.0.0-alpha.42", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vuelidate/core/-/core-2.0.0-alpha.42.tgz", |  | ||||||
|       "integrity": "sha512-yLp5/5IkwNZP8214TqEuexlFLGoEZybEad2OZu/heOYPnERm6tgiWHZltc0USCuQ1JVZ2EJuPRHmqMl/G/N7tw==", |  | ||||||
|       "requires": { |  | ||||||
|         "vue-demi": "^0.12.0" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "vue-demi": { |  | ||||||
|           "version": "0.12.5", |  | ||||||
|           "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz", |  | ||||||
|           "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==" |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "@vuelidate/validators": { |  | ||||||
|       "version": "2.0.0-alpha.30", |  | ||||||
|       "resolved": "https://registry.npmjs.org/@vuelidate/validators/-/validators-2.0.0-alpha.30.tgz", |  | ||||||
|       "integrity": "sha512-XH0oIU1+6bTZ1Kd1RNf7AMDsAahj1hUjLhbFUIrDhKIUKMFvG4658pqYATePNqhAegENFA+RDAPhsDXV/MB2wQ==", |  | ||||||
|       "requires": { |  | ||||||
|         "vue-demi": "^0.12.0" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "vue-demi": { |  | ||||||
|           "version": "0.12.5", |  | ||||||
|           "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.12.5.tgz", |  | ||||||
|           "integrity": "sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==" |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "@vueuse/core": { |     "@vueuse/core": { | ||||||
|       "version": "6.0.0", |       "version": "6.0.0", | ||||||
|       "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-6.0.0.tgz", |       "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-6.0.0.tgz", | ||||||
| @ -1425,174 +1240,6 @@ | |||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "esbuild": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-w6N1Yn5MtqK2U1/WZTX9ZqUVb8IOLZkZ5AdHkT6x3cHDMVsYWC7WPdiLmx19w3i4Rwzy5LqsEMtVihG3e4rFzA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "requires": { |  | ||||||
|         "esbuild-android-64": "0.14.48", |  | ||||||
|         "esbuild-android-arm64": "0.14.48", |  | ||||||
|         "esbuild-darwin-64": "0.14.48", |  | ||||||
|         "esbuild-darwin-arm64": "0.14.48", |  | ||||||
|         "esbuild-freebsd-64": "0.14.48", |  | ||||||
|         "esbuild-freebsd-arm64": "0.14.48", |  | ||||||
|         "esbuild-linux-32": "0.14.48", |  | ||||||
|         "esbuild-linux-64": "0.14.48", |  | ||||||
|         "esbuild-linux-arm": "0.14.48", |  | ||||||
|         "esbuild-linux-arm64": "0.14.48", |  | ||||||
|         "esbuild-linux-mips64le": "0.14.48", |  | ||||||
|         "esbuild-linux-ppc64le": "0.14.48", |  | ||||||
|         "esbuild-linux-riscv64": "0.14.48", |  | ||||||
|         "esbuild-linux-s390x": "0.14.48", |  | ||||||
|         "esbuild-netbsd-64": "0.14.48", |  | ||||||
|         "esbuild-openbsd-64": "0.14.48", |  | ||||||
|         "esbuild-sunos-64": "0.14.48", |  | ||||||
|         "esbuild-windows-32": "0.14.48", |  | ||||||
|         "esbuild-windows-64": "0.14.48", |  | ||||||
|         "esbuild-windows-arm64": "0.14.48" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "esbuild-android-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-3aMjboap/kqwCUpGWIjsk20TtxVoKck8/4Tu19rubh7t5Ra0Yrpg30Mt1QXXlipOazrEceGeWurXKeFJgkPOUg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-android-arm64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-vptI3K0wGALiDq+EvRuZotZrJqkYkN5282iAfcffjI5lmGG9G1ta/CIVauhY42MBXwEgDJkweiDcDMRLzBZC4g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-darwin-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-gGQZa4+hab2Va/Zww94YbshLuWteyKGD3+EsVon8EWTWhnHFRm5N9NbALNbwi/7hQ/hM1Zm4FuHg+k6BLsl5UA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-darwin-arm64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-bFjnNEXjhZT+IZ8RvRGNJthLWNHV5JkCtuOFOnjvo5pC0sk2/QVk0Qc06g2PV3J0TcU6kaPC3RN9yy9w2PSLEA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-freebsd-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-1NOlwRxmOsnPcWOGTB10JKAkYSb2nue0oM1AfHWunW/mv3wERfJmnYlGzL3UAOIUXZqW8GeA2mv+QGwq7DToqA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-freebsd-arm64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-gXqKdO8wabVcYtluAbikDH2jhXp+Klq5oCD5qbVyUG6tFiGhrC9oczKq3vIrrtwcxDQqK6+HDYK8Zrd4bCA9Gw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-32": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-ghGyDfS289z/LReZQUuuKq9KlTiTspxL8SITBFQFAFRA/IkIvDpnZnCAKTCjGXAmUqroMQfKJXMxyjJA69c/nQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-vni3p/gppLMVZLghI7oMqbOZdGmLbbKR23XFARKnszCIBpEMEDxOMNIKPmMItQrmH/iJrL1z8Jt2nynY0bE1ug==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-arm": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-+VfSV7Akh1XUiDNXgqgY1cUP1i2vjI+BmlyXRfVz5AfV3jbpde8JTs5Q9sYgaoq5cWfuKfoZB/QkGOI+QcL1Tw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-arm64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-3CFsOlpoxlKPRevEHq8aAntgYGYkE1N9yRYAcPyng/p4Wyx0tPR5SBYsxLKcgPB9mR8chHEhtWYz6EZ+H199Zw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-mips64le": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-cs0uOiRlPp6ymknDnjajCgvDMSsLw5mST2UXh+ZIrXTj2Ifyf2aAP3Iw4DiqgnyYLV2O/v/yWBJx+WfmKEpNLA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-ppc64le": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-+2F0vJMkuI0Wie/wcSPDCqXvSFEELH7Jubxb7mpWrA/4NpT+/byjxDz0gG6R1WJoeDefcrMfpBx4GFNN1JQorQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-riscv64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-BmaK/GfEE+5F2/QDrIXteFGKnVHGxlnK9MjdVKMTfvtmudjY3k2t8NtlY4qemKSizc+QwyombGWTBDc76rxePA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-linux-s390x": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-tndw/0B9jiCL+KWKo0TSMaUm5UWBLsfCKVdbfMlb3d5LeV9WbijZ8Ordia8SAYv38VSJWOEt6eDCdOx8LqkC4g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-netbsd-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-V9hgXfwf/T901Lr1wkOfoevtyNkrxmMcRHyticybBUHookznipMOHoF41Al68QBsqBxnITCEpjjd4yAos7z9Tw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-openbsd-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-+IHf4JcbnnBl4T52egorXMatil/za0awqzg2Vy6FBgPcBpisDWT2sVz/tNdrK9kAqj+GZG/jZdrOkj7wsrNTKA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-sunos-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-77m8bsr5wOpOWbGi9KSqDphcq6dFeJyun8TA+12JW/GAjyfTwVtOnN8DOt6DSPUfEV+ltVMNqtXUeTeMAxl5KA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-windows-32": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-EPgRuTPP8vK9maxpTGDe5lSoIBHGKO/AuxDncg5O3NkrPeLNdvvK8oywB0zGaAZXxYWfNNSHskvvDgmfVTguhg==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-windows-64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-YmpXjdT1q0b8ictSdGwH3M8VCoqPpK1/UArze3X199w6u8hUx3V8BhAi1WjbsfDYRBanVVtduAhh2sirImtAvA==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "esbuild-windows-arm64": { |  | ||||||
|       "version": "0.14.48", |  | ||||||
|       "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.48.tgz", |  | ||||||
|       "integrity": "sha512-HHaOMCsCXp0rz5BT2crTka6MPWVno121NKApsGs/OIW5QC0ggC69YMGs1aJct9/9FSUF4A1xNE/cLvgB5svR4g==", |  | ||||||
|       "dev": true, |  | ||||||
|       "optional": true |  | ||||||
|     }, |  | ||||||
|     "escalade": { |     "escalade": { | ||||||
|       "version": "3.1.1", |       "version": "3.1.1", | ||||||
|       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", |       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", | ||||||
| @ -2300,24 +1947,12 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", |       "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz", | ||||||
|       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" |       "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==" | ||||||
|     }, |     }, | ||||||
|     "lodash.castarray": { |  | ||||||
|       "version": "4.4.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/lodash.castarray/-/lodash.castarray-4.4.0.tgz", |  | ||||||
|       "integrity": "sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "lodash.clonedeep": { |     "lodash.clonedeep": { | ||||||
|       "version": "4.5.0", |       "version": "4.5.0", | ||||||
|       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", |       "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", | ||||||
|       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", |       "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "lodash.isplainobject": { |  | ||||||
|       "version": "4.0.6", |  | ||||||
|       "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", |  | ||||||
|       "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "lodash.merge": { |     "lodash.merge": { | ||||||
|       "version": "4.6.2", |       "version": "4.6.2", | ||||||
|       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", |       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", | ||||||
| @ -2404,9 +2039,9 @@ | |||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "moment": { |     "moment": { | ||||||
|       "version": "2.29.4", |       "version": "2.29.1", | ||||||
|       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz", |       "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz", | ||||||
|       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==" |       "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" | ||||||
|     }, |     }, | ||||||
|     "ms": { |     "ms": { | ||||||
|       "version": "2.1.2", |       "version": "2.1.2", | ||||||
| @ -2570,22 +2205,6 @@ | |||||||
|       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", |       "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "pinia": { |  | ||||||
|       "version": "2.0.14", |  | ||||||
|       "resolved": "https://registry.npmjs.org/pinia/-/pinia-2.0.14.tgz", |  | ||||||
|       "integrity": "sha512-0nPuZR4TetT/WcLN+feMSjWJku3SQU7dBbXC6uw+R6FLQJCsg+/0pzXyD82T1FmAYe0lsx+jnEDQ1BLgkRKlxA==", |  | ||||||
|       "requires": { |  | ||||||
|         "@vue/devtools-api": "^6.1.4", |  | ||||||
|         "vue-demi": "*" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@vue/devtools-api": { |  | ||||||
|           "version": "6.2.0", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.2.0.tgz", |  | ||||||
|           "integrity": "sha512-pF1G4wky+hkifDiZSWn8xfuLOJI1ZXtuambpBEYaf7Xaf6zC/pM29rvAGpd3qaGXnr4BAXU1Pxz/VfvBGwexGA==" |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "postcss": { |     "postcss": { | ||||||
|       "version": "8.4.5", |       "version": "8.4.5", | ||||||
|       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", |       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", | ||||||
| @ -2889,15 +2508,6 @@ | |||||||
|         "glob": "^7.1.3" |         "glob": "^7.1.3" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "rollup": { |  | ||||||
|       "version": "2.75.7", |  | ||||||
|       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz", |  | ||||||
|       "integrity": "sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==", |  | ||||||
|       "dev": true, |  | ||||||
|       "requires": { |  | ||||||
|         "fsevents": "~2.3.2" |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "rope-sequence": { |     "rope-sequence": { | ||||||
|       "version": "1.3.2", |       "version": "1.3.2", | ||||||
|       "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.2.tgz", |       "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.2.tgz", | ||||||
| @ -3058,12 +2668,6 @@ | |||||||
|         "has-flag": "^3.0.0" |         "has-flag": "^3.0.0" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "supports-preserve-symlinks-flag": { |  | ||||||
|       "version": "1.0.0", |  | ||||||
|       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", |  | ||||||
|       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", |  | ||||||
|       "dev": true |  | ||||||
|     }, |  | ||||||
|     "table": { |     "table": { | ||||||
|       "version": "6.7.2", |       "version": "6.7.2", | ||||||
|       "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", |       "resolved": "https://registry.npmjs.org/table/-/table-6.7.2.tgz", | ||||||
| @ -3330,86 +2934,12 @@ | |||||||
|       "resolved": "https://registry.npmjs.org/v-money3/-/v-money3-3.16.1.tgz", |       "resolved": "https://registry.npmjs.org/v-money3/-/v-money3-3.16.1.tgz", | ||||||
|       "integrity": "sha512-U0GjmdybvEwfxCpZiTUbKugSglJbX6wxlyMeg0YJdLTAKlnjMRDph3hpNJlTlg5Gs8MQRpDVdaLysBjV749HLg==" |       "integrity": "sha512-U0GjmdybvEwfxCpZiTUbKugSglJbX6wxlyMeg0YJdLTAKlnjMRDph3hpNJlTlg5Gs8MQRpDVdaLysBjV749HLg==" | ||||||
|     }, |     }, | ||||||
|     "v-tooltip": { |  | ||||||
|       "version": "4.0.0-beta.17", |  | ||||||
|       "resolved": "https://registry.npmjs.org/v-tooltip/-/v-tooltip-4.0.0-beta.17.tgz", |  | ||||||
|       "integrity": "sha512-d7v/6KEXQOtcj3NT3Z1LpbDv8SBh8JgbsD+3s/zGIGCxiXC2SoVW6wGV4X0MlCo97PiosibcSe+VKbFiy4AKnQ==", |  | ||||||
|       "requires": { |  | ||||||
|         "@popperjs/core": "^2.11.0", |  | ||||||
|         "vue-resize": "^2.0.0-alpha.1" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "@popperjs/core": { |  | ||||||
|           "version": "2.11.5", |  | ||||||
|           "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz", |  | ||||||
|           "integrity": "sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==" |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "v8-compile-cache": { |     "v8-compile-cache": { | ||||||
|       "version": "2.3.0", |       "version": "2.3.0", | ||||||
|       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", |       "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", | ||||||
|       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", |       "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", | ||||||
|       "dev": true |       "dev": true | ||||||
|     }, |     }, | ||||||
|     "vite": { |  | ||||||
|       "version": "2.9.13", |  | ||||||
|       "resolved": "https://registry.npmjs.org/vite/-/vite-2.9.13.tgz", |  | ||||||
|       "integrity": "sha512-AsOBAaT0AD7Mhe8DuK+/kE4aWYFMx/i0ZNi98hJclxb4e0OhQcZYUrvLjIaQ8e59Ui7txcvKMiJC1yftqpQoDw==", |  | ||||||
|       "dev": true, |  | ||||||
|       "requires": { |  | ||||||
|         "esbuild": "^0.14.27", |  | ||||||
|         "fsevents": "~2.3.2", |  | ||||||
|         "postcss": "^8.4.13", |  | ||||||
|         "resolve": "^1.22.0", |  | ||||||
|         "rollup": "^2.59.0" |  | ||||||
|       }, |  | ||||||
|       "dependencies": { |  | ||||||
|         "is-core-module": { |  | ||||||
|           "version": "2.9.0", |  | ||||||
|           "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz", |  | ||||||
|           "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "has": "^1.0.3" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "nanoid": { |  | ||||||
|           "version": "3.3.4", |  | ||||||
|           "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", |  | ||||||
|           "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", |  | ||||||
|           "dev": true |  | ||||||
|         }, |  | ||||||
|         "postcss": { |  | ||||||
|           "version": "8.4.14", |  | ||||||
|           "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz", |  | ||||||
|           "integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "nanoid": "^3.3.4", |  | ||||||
|             "picocolors": "^1.0.0", |  | ||||||
|             "source-map-js": "^1.0.2" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "resolve": { |  | ||||||
|           "version": "1.22.1", |  | ||||||
|           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz", |  | ||||||
|           "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==", |  | ||||||
|           "dev": true, |  | ||||||
|           "requires": { |  | ||||||
|             "is-core-module": "^2.9.0", |  | ||||||
|             "path-parse": "^1.0.7", |  | ||||||
|             "supports-preserve-symlinks-flag": "^1.0.0" |  | ||||||
|           } |  | ||||||
|         }, |  | ||||||
|         "source-map-js": { |  | ||||||
|           "version": "1.0.2", |  | ||||||
|           "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", |  | ||||||
|           "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", |  | ||||||
|           "dev": true |  | ||||||
|         } |  | ||||||
|       } |  | ||||||
|     }, |  | ||||||
|     "vue": { |     "vue": { | ||||||
|       "version": "3.2.4", |       "version": "3.2.4", | ||||||
|       "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.4.tgz", |       "resolved": "https://registry.npmjs.org/vue/-/vue-3.2.4.tgz", | ||||||
| @ -3472,11 +3002,6 @@ | |||||||
|         "@vue/devtools-api": "^6.0.0-beta.7" |         "@vue/devtools-api": "^6.0.0-beta.7" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "vue-resize": { |  | ||||||
|       "version": "2.0.0-alpha.1", |  | ||||||
|       "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz", |  | ||||||
|       "integrity": "sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==" |  | ||||||
|     }, |  | ||||||
|     "vue-router": { |     "vue-router": { | ||||||
|       "version": "4.0.11", |       "version": "4.0.11", | ||||||
|       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.11.tgz", |       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.0.11.tgz", | ||||||
|  | |||||||
							
								
								
									
										17
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								package.json
									
									
									
									
									
								
							| @ -1,7 +1,7 @@ | |||||||
| { | { | ||||||
|   "private": true, |   "private": true, | ||||||
|   "scripts": { |   "scripts": { | ||||||
|     "dev": "vite", |     "dev": "vite --port=3000", | ||||||
|     "build": "vite build", |     "build": "vite build", | ||||||
|     "serve": "vite preview", |     "serve": "vite preview", | ||||||
|     "test": "eslint ./resources/scripts --ext .js,.vue" |     "test": "eslint ./resources/scripts --ext .js,.vue" | ||||||
| @ -18,13 +18,12 @@ | |||||||
|     "eslint": "^7.27.0", |     "eslint": "^7.27.0", | ||||||
|     "eslint-config-prettier": "^8.3.0", |     "eslint-config-prettier": "^8.3.0", | ||||||
|     "eslint-plugin-vue": "^7.0.0-beta.4", |     "eslint-plugin-vue": "^7.0.0-beta.4", | ||||||
|     "laravel-vite": "^0.0.7", |  | ||||||
|     "postcss": "^8.4.5", |     "postcss": "^8.4.5", | ||||||
|     "prettier": "^2.3.0", |     "prettier": "^2.3.0", | ||||||
|     "sass": "^1.32.12", |     "sass": "^1.32.12", | ||||||
|     "tailwind-scrollbar": "^1.3.1", |     "tailwind-scrollbar": "^1.3.1", | ||||||
|     "tailwindcss": "^3.0.6", |     "tailwindcss": "^3.0.6", | ||||||
|     "vite": "^2.6.1" |     "vite": "^4.0.0" | ||||||
|   }, |   }, | ||||||
|   "dependencies": { |   "dependencies": { | ||||||
|     "@headlessui/vue": "^1.4.0", |     "@headlessui/vue": "^1.4.0", | ||||||
| @ -32,10 +31,11 @@ | |||||||
|     "@popperjs/core": "^2.9.2", |     "@popperjs/core": "^2.9.2", | ||||||
|     "@stripe/stripe-js": "^1.21.2", |     "@stripe/stripe-js": "^1.21.2", | ||||||
|     "@tailwindcss/line-clamp": "^0.3.0", |     "@tailwindcss/line-clamp": "^0.3.0", | ||||||
|     "@tiptap/core": "^2.0.0-beta.85", |     "@tiptap/core": "^2.0.3", | ||||||
|     "@tiptap/extension-text-align": "^2.0.0-beta.29", |     "@tiptap/extension-text-align": "^2.0.3", | ||||||
|     "@tiptap/starter-kit": "^2.0.0-beta.81", |     "@tiptap/pm": "^2.0.3", | ||||||
|     "@tiptap/vue-3": "^2.0.0-beta.38", |     "@tiptap/starter-kit": "^2.0.3", | ||||||
|  |     "@tiptap/vue-3": "^2.0.3", | ||||||
|     "@vuelidate/components": "^1.1.12", |     "@vuelidate/components": "^1.1.12", | ||||||
|     "@vuelidate/core": "^2.0.0-alpha.32", |     "@vuelidate/core": "^2.0.0-alpha.32", | ||||||
|     "@vuelidate/validators": "^2.0.0-alpha.25", |     "@vuelidate/validators": "^2.0.0-alpha.25", | ||||||
| @ -43,10 +43,11 @@ | |||||||
|     "axios": "^0.19", |     "axios": "^0.19", | ||||||
|     "chart.js": "^2.7.3", |     "chart.js": "^2.7.3", | ||||||
|     "guid": "0.0.12", |     "guid": "0.0.12", | ||||||
|  |     "laravel-vite-plugin": "^0.7.4", | ||||||
|     "lodash": "^4.17.13", |     "lodash": "^4.17.13", | ||||||
|     "maska": "^1.4.6", |     "maska": "^1.4.6", | ||||||
|     "mini-svg-data-uri": "^1.3.3", |     "mini-svg-data-uri": "^1.3.3", | ||||||
|     "moment": "^2.29.4", |     "moment": "^2.29.1", | ||||||
|     "pinia": "^2.0.4", |     "pinia": "^2.0.4", | ||||||
|     "v-money3": "^3.13.5", |     "v-money3": "^3.13.5", | ||||||
|     "v-tooltip": "^4.0.0-alpha.1", |     "v-tooltip": "^4.0.0-alpha.1", | ||||||
|  | |||||||
| @ -17,18 +17,7 @@ | |||||||
|             <td class="px-5 py-4 text-left align-top"> |             <td class="px-5 py-4 text-left align-top"> | ||||||
|               <div class="flex justify-start"> |               <div class="flex justify-start"> | ||||||
|                 <div |                 <div | ||||||
|                   class=" |                   class="flex items-center justify-center w-5 h-5 mt-2 mr-2 text-gray-300 cursor-move  handle" | ||||||
|                     flex |  | ||||||
|                     items-center |  | ||||||
|                     justify-center |  | ||||||
|                     w-5 |  | ||||||
|                     h-5 |  | ||||||
|                     mt-2 |  | ||||||
|                     text-gray-300 |  | ||||||
|                     cursor-move |  | ||||||
|                     handle |  | ||||||
|                     mr-2 |  | ||||||
|                   " |  | ||||||
|                 > |                 > | ||||||
|                   <DragIcon /> |                   <DragIcon /> | ||||||
|                 </div> |                 </div> | ||||||
| @ -108,7 +97,7 @@ | |||||||
|  |  | ||||||
|                           <BaseIcon |                           <BaseIcon | ||||||
|                             name="ChevronDownIcon" |                             name="ChevronDownIcon" | ||||||
|                             class="w-4 h-4 text-gray-500 ml-1" |                             class="w-4 h-4 ml-1 text-gray-500" | ||||||
|                           /> |                           /> | ||||||
|                         </span> |                         </span> | ||||||
|                       </BaseButton> |                       </BaseButton> | ||||||
| @ -155,7 +144,7 @@ | |||||||
|               <BaseContentPlaceholders v-if="loading"> |               <BaseContentPlaceholders v-if="loading"> | ||||||
|                 <BaseContentPlaceholdersText |                 <BaseContentPlaceholdersText | ||||||
|                   :lines="1" |                   :lines="1" | ||||||
|                   class="w-24 h-8 rounded-md border" |                   class="w-24 h-8 border rounded-md" | ||||||
|                 /> |                 /> | ||||||
|               </BaseContentPlaceholders> |               </BaseContentPlaceholders> | ||||||
|  |  | ||||||
| @ -175,6 +164,7 @@ | |||||||
|                 :ability="abilities.CREATE_INVOICE" |                 :ability="abilities.CREATE_INVOICE" | ||||||
|                 :store="store" |                 :store="store" | ||||||
|                 :store-prop="storeProp" |                 :store-prop="storeProp" | ||||||
|  |                 :discount="discount" | ||||||
|                 @update="updateTax" |                 @update="updateTax" | ||||||
|               /> |               /> | ||||||
|             </td> |             </td> | ||||||
|  | |||||||
| @ -30,24 +30,13 @@ | |||||||
|         <template v-if="userStore.hasAbilities(ability)" #action> |         <template v-if="userStore.hasAbilities(ability)" #action> | ||||||
|           <button |           <button | ||||||
|             type="button" |             type="button" | ||||||
|             class=" |             class="flex items-center justify-center w-full px-2 py-2 bg-gray-200 border-none outline-none cursor-pointer " | ||||||
|               flex |  | ||||||
|               items-center |  | ||||||
|               justify-center |  | ||||||
|               w-full |  | ||||||
|               px-2 |  | ||||||
|               cursor-pointer |  | ||||||
|               py-2 |  | ||||||
|               bg-gray-200 |  | ||||||
|               border-none |  | ||||||
|               outline-none |  | ||||||
|             " |  | ||||||
|             @click="openTaxModal" |             @click="openTaxModal" | ||||||
|           > |           > | ||||||
|             <BaseIcon name="CheckCircleIcon" class="h-5 text-primary-400" /> |             <BaseIcon name="CheckCircleIcon" class="h-5 text-primary-400" /> | ||||||
|  |  | ||||||
|             <label |             <label | ||||||
|               class="ml-2 text-sm leading-none text-primary-400 cursor-pointer" |               class="ml-2 text-sm leading-none cursor-pointer text-primary-400" | ||||||
|               >{{ $t('invoices.add_new_tax') }}</label |               >{{ $t('invoices.add_new_tax') }}</label | ||||||
|             > |             > | ||||||
|           </button> |           </button> | ||||||
| @ -115,6 +104,10 @@ const props = defineProps({ | |||||||
|     type: Number, |     type: Number, | ||||||
|     default: 0, |     default: 0, | ||||||
|   }, |   }, | ||||||
|  |   discountedTotal: { | ||||||
|  |     type: Number, | ||||||
|  |     default: 0, | ||||||
|  |   }, | ||||||
|   currency: { |   currency: { | ||||||
|     type: [Object, String], |     type: [Object, String], | ||||||
|     required: true, |     required: true, | ||||||
| @ -153,19 +146,19 @@ const filteredTypes = computed(() => { | |||||||
| }) | }) | ||||||
|  |  | ||||||
| const taxAmount = computed(() => { | const taxAmount = computed(() => { | ||||||
|   if (localTax.compound_tax && props.total) { |   if (localTax.compound_tax && props.discountedTotal) { | ||||||
|     return ((props.total + props.totalTax) * localTax.percent) / 100 |     return ((props.discountedTotal + props.totalTax) * localTax.percent) / 100 | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   if (props.total && localTax.percent) { |   if (props.discountedTotal && localTax.percent) { | ||||||
|     return (props.total * localTax.percent) / 100 |     return (props.discountedTotal * localTax.percent) / 100 | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   return 0 |   return 0 | ||||||
| }) | }) | ||||||
|  |  | ||||||
| watch( | watch( | ||||||
|   () => props.total, |   () => props.discountedTotal, | ||||||
|   () => { |   () => { | ||||||
|     updateRowTax() |     updateRowTax() | ||||||
|   } |   } | ||||||
|  | |||||||
| @ -29,14 +29,7 @@ | |||||||
|  |  | ||||||
|       <label |       <label | ||||||
|         v-else |         v-else | ||||||
|         class=" |         class="flex items-center justify-center m-0 text-lg text-black uppercase " | ||||||
|           flex |  | ||||||
|           items-center |  | ||||||
|           justify-center |  | ||||||
|           m-0 |  | ||||||
|           text-lg text-black |  | ||||||
|           uppercase |  | ||||||
|         " |  | ||||||
|       > |       > | ||||||
|         <BaseFormatMoney |         <BaseFormatMoney | ||||||
|           :amount="store.getSubTotal" |           :amount="store.getSubTotal" | ||||||
| @ -66,14 +59,7 @@ | |||||||
|  |  | ||||||
|       <label |       <label | ||||||
|         v-else-if="store[storeProp].tax_per_item === 'YES'" |         v-else-if="store[storeProp].tax_per_item === 'YES'" | ||||||
|         class=" |         class="flex items-center justify-center m-0 text-lg text-black uppercase " | ||||||
|           flex |  | ||||||
|           items-center |  | ||||||
|           justify-center |  | ||||||
|           m-0 |  | ||||||
|           text-lg text-black |  | ||||||
|           uppercase |  | ||||||
|         " |  | ||||||
|       > |       > | ||||||
|         <BaseFormatMoney :amount="tax.amount" :currency="defaultCurrency" /> |         <BaseFormatMoney :amount="tax.amount" :currency="defaultCurrency" /> | ||||||
|       </label> |       </label> | ||||||
| @ -98,7 +84,7 @@ | |||||||
|       <BaseContentPlaceholders v-if="isLoading"> |       <BaseContentPlaceholders v-if="isLoading"> | ||||||
|         <BaseContentPlaceholdersText |         <BaseContentPlaceholdersText | ||||||
|           :lines="1" |           :lines="1" | ||||||
|           class="w-24 h-8 rounded-md border" |           class="w-24 h-8 border rounded-md" | ||||||
|         /> |         /> | ||||||
|       </BaseContentPlaceholders> |       </BaseContentPlaceholders> | ||||||
|       <div v-else class="flex" style="width: 140px" role="group"> |       <div v-else class="flex" style="width: 140px" role="group"> | ||||||
| @ -114,7 +100,7 @@ | |||||||
|         <BaseDropdown position="bottom-end"> |         <BaseDropdown position="bottom-end"> | ||||||
|           <template #activator> |           <template #activator> | ||||||
|             <BaseButton |             <BaseButton | ||||||
|               class="rounded-tr-md rounded-br-md p-2 rounded-none" |               class="p-2 rounded-none rounded-tr-md rounded-br-md" | ||||||
|               type="button" |               type="button" | ||||||
|               variant="white" |               variant="white" | ||||||
|             > |             > | ||||||
| @ -127,7 +113,7 @@ | |||||||
|  |  | ||||||
|                 <BaseIcon |                 <BaseIcon | ||||||
|                   name="ChevronDownIcon" |                   name="ChevronDownIcon" | ||||||
|                   class="w-4 h-4 text-gray-500 ml-1" |                   class="w-4 h-4 ml-1 text-gray-500" | ||||||
|                 /> |                 /> | ||||||
|               </span> |               </span> | ||||||
|             </BaseButton> |             </BaseButton> | ||||||
| @ -180,15 +166,7 @@ | |||||||
|     </div> |     </div> | ||||||
|  |  | ||||||
|     <div |     <div | ||||||
|       class=" |       class="flex items-center justify-between w-full pt-2 mt-5 border-t border-gray-200 border-solid " | ||||||
|         flex |  | ||||||
|         items-center |  | ||||||
|         justify-between |  | ||||||
|         w-full |  | ||||||
|         pt-2 |  | ||||||
|         mt-5 |  | ||||||
|         border-t border-gray-200 border-solid |  | ||||||
|       " |  | ||||||
|     > |     > | ||||||
|       <BaseContentPlaceholders v-if="isLoading"> |       <BaseContentPlaceholders v-if="isLoading"> | ||||||
|         <BaseContentPlaceholdersText :lines="1" class="w-16 h-5" /> |         <BaseContentPlaceholdersText :lines="1" class="w-16 h-5" /> | ||||||
| @ -204,14 +182,7 @@ | |||||||
|       </BaseContentPlaceholders> |       </BaseContentPlaceholders> | ||||||
|       <label |       <label | ||||||
|         v-else |         v-else | ||||||
|         class=" |         class="flex items-center justify-center text-lg uppercase  text-primary-400" | ||||||
|           flex |  | ||||||
|           items-center |  | ||||||
|           justify-center |  | ||||||
|           text-lg |  | ||||||
|           uppercase |  | ||||||
|           text-primary-400 |  | ||||||
|         " |  | ||||||
|       > |       > | ||||||
|         <BaseFormatMoney :amount="store.getTotal" :currency="defaultCurrency" /> |         <BaseFormatMoney :amount="store.getTotal" :currency="defaultCurrency" /> | ||||||
|       </label> |       </label> | ||||||
| @ -334,6 +305,7 @@ function selectPercentage() { | |||||||
|  |  | ||||||
| function onSelectTax(selectedTax) { | function onSelectTax(selectedTax) { | ||||||
|   let amount = 0 |   let amount = 0 | ||||||
|  |  | ||||||
|   if (selectedTax.compound_tax && props.store.getSubtotalWithDiscount) { |   if (selectedTax.compound_tax && props.store.getSubtotalWithDiscount) { | ||||||
|     amount = Math.round( |     amount = Math.round( | ||||||
|       ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) * |       ((props.store.getSubtotalWithDiscount + props.store.getTotalSimpleTax) * | ||||||
|  | |||||||
| @ -143,7 +143,7 @@ | |||||||
|           <template #activator> |           <template #activator> | ||||||
|             <img |             <img | ||||||
|               :src="previewAvatar" |               :src="previewAvatar" | ||||||
|               class="block w-8 h-8 rounded md:h-9 md:w-9" |               class="block w-8 h-8 rounded md:h-9 md:w-9 object-cover" | ||||||
|             /> |             /> | ||||||
|           </template> |           </template> | ||||||
|  |  | ||||||
|  | |||||||
| @ -21,7 +21,7 @@ | |||||||
|         <link rel="stylesheet" href="/modules/styles/{{ $name }}"> |         <link rel="stylesheet" href="/modules/styles/{{ $name }}"> | ||||||
|     @endforeach |     @endforeach | ||||||
|  |  | ||||||
|     @vite |     @vite('resources/scripts/main.js') | ||||||
| </head> | </head> | ||||||
|  |  | ||||||
| <body | <body | ||||||
| @ -64,7 +64,7 @@ | |||||||
|  |  | ||||||
|         @endif |         @endif | ||||||
|  |  | ||||||
|         window.Crater.start() |         // window.Crater.start() | ||||||
|     </script> |     </script> | ||||||
| </body> | </body> | ||||||
|  |  | ||||||
|  | |||||||
| @ -133,7 +133,6 @@ | |||||||
|             line-height: 21px; |             line-height: 21px; | ||||||
|             color: #5851D8; |             color: #5851D8; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     </style> |     </style> | ||||||
|  |  | ||||||
|     @if (App::isLocale('th')) |     @if (App::isLocale('th')) | ||||||
| @ -170,7 +169,7 @@ | |||||||
|                     </td> |                     </td> | ||||||
|                     <td> |                     <td> | ||||||
|                         <p class="expense-amount"> |                         <p class="expense-amount"> | ||||||
|                                 {!! format_money_pdf($expenseCategory->total_amount) !!} |                             {!! format_money_pdf($expenseCategory->total_amount, $currency) !!} | ||||||
|                         </p> |                         </p> | ||||||
|                     </td> |                     </td> | ||||||
|                 </tr> |                 </tr> | ||||||
| @ -182,7 +181,7 @@ | |||||||
|     <table class="expense-total-table"> |     <table class="expense-total-table"> | ||||||
|         <tr> |         <tr> | ||||||
|             <td class="expense-total-cell"> |             <td class="expense-total-cell"> | ||||||
|                 <p class="expense-total">{!! format_money_pdf($totalExpense) !!}</p> |                 <p class="expense-total">{!! format_money_pdf($totalExpense, $currency) !!}</p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|     </table> |     </table> | ||||||
| @ -192,7 +191,7 @@ | |||||||
|                 <p class="report-footer-label">@lang('pdf_total_expenses_label')</p> |                 <p class="report-footer-label">@lang('pdf_total_expenses_label')</p> | ||||||
|             </td> |             </td> | ||||||
|             <td> |             <td> | ||||||
|                 <p class="report-footer-value">{!! format_money_pdf($totalExpense) !!}</p> |                 <p class="report-footer-value">{!! format_money_pdf($totalExpense, $currency) !!}</p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|     </table> |     </table> | ||||||
|  | |||||||
| @ -158,7 +158,6 @@ | |||||||
|             line-height: 21px; |             line-height: 21px; | ||||||
|             color: #5851D8; |             color: #5851D8; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     </style> |     </style> | ||||||
|  |  | ||||||
|     @if (App::isLocale('th')) |     @if (App::isLocale('th')) | ||||||
| @ -190,7 +189,7 @@ | |||||||
|                     <p class="income-title">@lang("pdf_income_label")</p> |                     <p class="income-title">@lang("pdf_income_label")</p> | ||||||
|                 </td> |                 </td> | ||||||
|                 <td> |                 <td> | ||||||
|                     <p class="income-amount">{!! format_money_pdf($income) !!}</p> |                     <p class="income-amount">{!! format_money_pdf($income, $currency) !!}</p> | ||||||
|                 </td> |                 </td> | ||||||
|             </tr> |             </tr> | ||||||
|         </table> |         </table> | ||||||
| @ -206,7 +205,7 @@ | |||||||
|                     </td> |                     </td> | ||||||
|                     <td> |                     <td> | ||||||
|                         <p class="expense-amount"> |                         <p class="expense-amount"> | ||||||
|                                 {!! format_money_pdf($expenseCategory->total_amount) !!} |                             {!! format_money_pdf($expenseCategory->total_amount, $currency) !!} | ||||||
|                         </p> |                         </p> | ||||||
|                     </td> |                     </td> | ||||||
|                 </tr> |                 </tr> | ||||||
| @ -219,7 +218,7 @@ | |||||||
|     <table class="expense-total-indicator-table"> |     <table class="expense-total-indicator-table"> | ||||||
|         <tr> |         <tr> | ||||||
|             <td class="expense-total-cell"> |             <td class="expense-total-cell"> | ||||||
|                 <p class="expense-total">{!! format_money_pdf($totalExpense) !!}</p> |                 <p class="expense-total">{!! format_money_pdf($totalExpense, $currency) !!}</p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|     </table> |     </table> | ||||||
| @ -229,7 +228,7 @@ | |||||||
|                 <p class="report-footer-label">@lang("pdf_net_profit_label")</p> |                 <p class="report-footer-label">@lang("pdf_net_profit_label")</p> | ||||||
|             </td> |             </td> | ||||||
|             <td> |             <td> | ||||||
|                 <p class="report-footer-value">{!! format_money_pdf($income - $totalExpense) !!}</p> |                 <p class="report-footer-value">{!! format_money_pdf($income - $totalExpense, $currency) !!}</p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|     </table> |     </table> | ||||||
|  | |||||||
| @ -137,7 +137,6 @@ | |||||||
|         .text-center { |         .text-center { | ||||||
|             text-align: center; |             text-align: center; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     </style> |     </style> | ||||||
|  |  | ||||||
|     @if (App::isLocale('th')) |     @if (App::isLocale('th')) | ||||||
| @ -176,7 +175,7 @@ | |||||||
|                     </td> |                     </td> | ||||||
|                     <td> |                     <td> | ||||||
|                         <p class="sales-amount"> |                         <p class="sales-amount"> | ||||||
|                                     {!! format_money_pdf($invoice->base_total) !!} |                             {!! format_money_pdf($invoice->base_total, $currency) !!} | ||||||
|                         </p> |                         </p> | ||||||
|                     </td> |                     </td> | ||||||
|                 </tr> |                 </tr> | ||||||
| @ -187,7 +186,7 @@ | |||||||
|             <tr> |             <tr> | ||||||
|                 <td class="sales-total-cell"> |                 <td class="sales-total-cell"> | ||||||
|                     <p class="sales-total-amount"> |                     <p class="sales-total-amount"> | ||||||
|                             {!! format_money_pdf($customer->totalAmount) !!} |                         {!! format_money_pdf($customer->totalAmount, $currency) !!} | ||||||
|                     </p> |                     </p> | ||||||
|                 </td> |                 </td> | ||||||
|             </tr> |             </tr> | ||||||
| @ -203,7 +202,7 @@ | |||||||
|             </td> |             </td> | ||||||
|             <td> |             <td> | ||||||
|                 <p class="report-footer-value"> |                 <p class="report-footer-value"> | ||||||
|                     {!! format_money_pdf($totalAmount) !!} |                     {!! format_money_pdf($totalAmount, $currency) !!} | ||||||
|                 </p> |                 </p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|  | |||||||
| @ -137,7 +137,6 @@ | |||||||
|         .text-center { |         .text-center { | ||||||
|             text-align: center; |             text-align: center; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     </style> |     </style> | ||||||
|  |  | ||||||
|     @if (App::isLocale('th')) |     @if (App::isLocale('th')) | ||||||
| @ -175,7 +174,7 @@ | |||||||
|                     </td> |                     </td> | ||||||
|                     <td> |                     <td> | ||||||
|                         <p class="item-sales-amount"> |                         <p class="item-sales-amount"> | ||||||
|                                 {!! format_money_pdf($item->total_amount) !!} |                             {!! format_money_pdf($item->total_amount, $currency) !!} | ||||||
|                         </p> |                         </p> | ||||||
|                     </td> |                     </td> | ||||||
|                 </tr> |                 </tr> | ||||||
| @ -187,7 +186,7 @@ | |||||||
|             <tr> |             <tr> | ||||||
|                 <td class="sales-total-cell"> |                 <td class="sales-total-cell"> | ||||||
|                     <p class="sales-total-amount"> |                     <p class="sales-total-amount"> | ||||||
|                         {!! format_money_pdf($totalAmount) !!} |                         {!! format_money_pdf($totalAmount, $currency) !!} | ||||||
|                     </p> |                     </p> | ||||||
|                 </td> |                 </td> | ||||||
|             </tr> |             </tr> | ||||||
| @ -202,7 +201,7 @@ | |||||||
|             </td> |             </td> | ||||||
|             <td> |             <td> | ||||||
|                 <p class="report-footer-value"> |                 <p class="report-footer-value"> | ||||||
|                     {!! format_money_pdf($totalAmount) !!} |                     {!! format_money_pdf($totalAmount, $currency) !!} | ||||||
|                 </p> |                 </p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|  | |||||||
| @ -134,7 +134,6 @@ | |||||||
|             line-height: 21px; |             line-height: 21px; | ||||||
|             color: #5851D8; |             color: #5851D8; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|     </style> |     </style> | ||||||
|  |  | ||||||
|     @if (App::isLocale('th')) |     @if (App::isLocale('th')) | ||||||
| @ -175,7 +174,7 @@ | |||||||
|                     </td> |                     </td> | ||||||
|                     <td> |                     <td> | ||||||
|                         <p class="tax-amount"> |                         <p class="tax-amount"> | ||||||
|                                 {!! format_money_pdf($tax->total_tax_amount) !!} |                             {!! format_money_pdf($tax->total_tax_amount, $currency) !!} | ||||||
|                         </p> |                         </p> | ||||||
|                     </td> |                     </td> | ||||||
|                 </tr> |                 </tr> | ||||||
| @ -189,7 +188,7 @@ | |||||||
|         <tr> |         <tr> | ||||||
|             <td class="tax-total-cell"> |             <td class="tax-total-cell"> | ||||||
|                 <p class="tax-total"> |                 <p class="tax-total"> | ||||||
|                     {!! format_money_pdf($totalTaxAmount) !!} |                     {!! format_money_pdf($totalTaxAmount, $currency) !!} | ||||||
|                 </p> |                 </p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
| @ -201,7 +200,7 @@ | |||||||
|             </td> |             </td> | ||||||
|             <td> |             <td> | ||||||
|                 <p class="report-footer-value"> |                 <p class="report-footer-value"> | ||||||
|                     {!! format_money_pdf($totalTaxAmount) !!} |                     {!! format_money_pdf($totalTaxAmount, $currency) !!} | ||||||
|                 </p> |                 </p> | ||||||
|             </td> |             </td> | ||||||
|         </tr> |         </tr> | ||||||
|  | |||||||
							
								
								
									
										40
									
								
								uffizzi/.env.example
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								uffizzi/.env.example
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,40 @@ | |||||||
|  | APP_ENV=production | ||||||
|  | APP_KEY=base64:kgk/4DW1vEVy7aEvet5FPp5un6PIGe/so8H0mvoUtW0= | ||||||
|  | APP_DEBUG=true | ||||||
|  | APP_LOG_LEVEL=debug | ||||||
|  | APP_URL=http://crater.test | ||||||
|  |  | ||||||
|  | DB_CONNECTION=mysql | ||||||
|  | DB_HOST=127.0.0.1 | ||||||
|  | DB_PORT=3306 | ||||||
|  | DB_DATABASE=crater | ||||||
|  | DB_USERNAME=crater | ||||||
|  | DB_PASSWORD=crater | ||||||
|  |  | ||||||
|  | BROADCAST_DRIVER=log | ||||||
|  | CACHE_DRIVER=file | ||||||
|  | QUEUE_DRIVER=sync | ||||||
|  | SESSION_DRIVER=cookie | ||||||
|  | SESSION_LIFETIME=1440 | ||||||
|  |  | ||||||
|  | REDIS_HOST=127.0.0.1 | ||||||
|  | REDIS_PASSWORD=null | ||||||
|  | REDIS_PORT=6379 | ||||||
|  |  | ||||||
|  | MAIL_DRIVER=smtp | ||||||
|  | MAIL_HOST= | ||||||
|  | MAIL_PORT= | ||||||
|  | MAIL_USERNAME= | ||||||
|  | MAIL_PASSWORD= | ||||||
|  | MAIL_ENCRYPTION= | ||||||
|  |  | ||||||
|  | PUSHER_APP_ID= | ||||||
|  | PUSHER_KEY= | ||||||
|  | PUSHER_SECRET= | ||||||
|  |  | ||||||
|  | SANCTUM_STATEFUL_DOMAINS=crater.test | ||||||
|  | SESSION_DOMAIN=crater.test | ||||||
|  |  | ||||||
|  | TRUSTED_PROXIES="*" | ||||||
|  |  | ||||||
|  | CRON_JOB_AUTH_TOKEN="" | ||||||
							
								
								
									
										64
									
								
								uffizzi/Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								uffizzi/Dockerfile
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,64 @@ | |||||||
|  | FROM php:8.1-fpm | ||||||
|  |  | ||||||
|  | # Install system dependencies | ||||||
|  | RUN apt-get update && apt-get install -y \ | ||||||
|  |     git \ | ||||||
|  |     curl \ | ||||||
|  |     libpng-dev \ | ||||||
|  |     libonig-dev \ | ||||||
|  |     libxml2-dev \ | ||||||
|  |     zip \ | ||||||
|  |     unzip \ | ||||||
|  |     libzip-dev \ | ||||||
|  |     libmagickwand-dev \ | ||||||
|  |     mariadb-client \ | ||||||
|  |     npm | ||||||
|  |  | ||||||
|  | # Clear cache | ||||||
|  | RUN apt-get clean && rm -rf /var/lib/apt/lists/* | ||||||
|  |  | ||||||
|  | RUN pecl install imagick \ | ||||||
|  |     && docker-php-ext-enable imagick | ||||||
|  |  | ||||||
|  | # Install PHP extensions | ||||||
|  | RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd | ||||||
|  |  | ||||||
|  | # Get latest Composer | ||||||
|  | COPY --from=composer:latest /usr/bin/composer /usr/bin/composer | ||||||
|  |  | ||||||
|  | # Create system user to run Composer and Artisan Commands | ||||||
|  | RUN useradd -G www-data,root -u 1000 -d /home/crater-user crater-user | ||||||
|  | RUN mkdir -p /home/crater-user/.composer && \ | ||||||
|  |     chown -R crater-user:crater-user /home/crater-user | ||||||
|  |  | ||||||
|  | # Mounted volumes | ||||||
|  | COPY ./ /var/www | ||||||
|  | COPY ./docker-compose/php/uploads.ini /usr/local/etc/php/conf.d/uploads.ini | ||||||
|  | COPY ./uffizzi/.env.example /var/www/.env | ||||||
|  |  | ||||||
|  | # Set working directory | ||||||
|  | WORKDIR /var/www | ||||||
|  |  | ||||||
|  | RUN chown -R crater-user:crater-user ./ | ||||||
|  | RUN chmod -R 775 composer.json composer.lock \  | ||||||
|  |         composer.lock storage/framework/ \ | ||||||
|  |         storage/logs/ bootstrap/cache/ /home/crater-user/.composer | ||||||
|  | RUN chown -R $(whoami):$(whoami) /var/log/ | ||||||
|  | RUN chmod -R 775 /var/log | ||||||
|  |  | ||||||
|  | # Cleanup manually generated build files | ||||||
|  | RUN rm -rf /var/www/public/build | ||||||
|  | RUN npm config set user 0 | ||||||
|  | RUN npm config set unsafe-perm true | ||||||
|  | # Frontend bulding | ||||||
|  | RUN sed -i 's/DB_CONNECTION=mysql/DB_CONNECTION=sqlite/g' /var/www/.env | ||||||
|  | RUN sed -i 's/DB_DATABASE=crater/DB_DATABASE=\/tmp\/crater.sqlite/g' /var/www/.env | ||||||
|  | RUN touch /tmp/crater.sqlite | ||||||
|  | RUN composer install --no-interaction --prefer-dist | ||||||
|  | RUN npm i -f | ||||||
|  | RUN npm install --save-dev sass | ||||||
|  | RUN export NODE_OPTIONS="--max-old-space-size=4096" && /usr/bin/npx vite build --target=es2020 | ||||||
|  | RUN sed -i 's/DB_CONNECTION=sqlite/DB_CONNECTION=mysql/g' /var/www/.env | ||||||
|  | RUN sed -i 's/DB_DATABASE=\/tmp\/crater.sqlite/DB_DATABASE=crater/g' /var/www/.env | ||||||
|  |  | ||||||
|  | USER crater-user | ||||||
							
								
								
									
										68
									
								
								uffizzi/crond/Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								uffizzi/crond/Dockerfile
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,68 @@ | |||||||
|  | FROM php:8.1-fpm as build | ||||||
|  |  | ||||||
|  | # Install system dependencies | ||||||
|  | RUN apt-get update && apt-get install -y \ | ||||||
|  |     git \ | ||||||
|  |     curl \ | ||||||
|  |     libpng-dev \ | ||||||
|  |     libonig-dev \ | ||||||
|  |     libxml2-dev \ | ||||||
|  |     zip \ | ||||||
|  |     unzip \ | ||||||
|  |     libzip-dev \ | ||||||
|  |     libmagickwand-dev \ | ||||||
|  |     mariadb-client | ||||||
|  |  | ||||||
|  | # Clear cache | ||||||
|  | RUN apt-get clean && rm -rf /var/lib/apt/lists/* | ||||||
|  |  | ||||||
|  | RUN pecl install imagick \ | ||||||
|  |     && docker-php-ext-enable imagick | ||||||
|  |  | ||||||
|  | # Install PHP extensions | ||||||
|  | RUN docker-php-ext-install pdo_mysql mbstring zip exif pcntl bcmath gd | ||||||
|  |  | ||||||
|  | # Get latest Composer | ||||||
|  | COPY --from=composer:latest /usr/bin/composer /usr/bin/composer | ||||||
|  |  | ||||||
|  | # Create system user to run Composer and Artisan Commands | ||||||
|  | RUN useradd -G www-data,root -u 1000 -d /home/crater-user crater-user | ||||||
|  | RUN mkdir -p /home/crater-user/.composer && \ | ||||||
|  |     chown -R crater-user:crater-user /home/crater-user | ||||||
|  |  | ||||||
|  | # Mounted volumes | ||||||
|  | COPY ./ /var/www | ||||||
|  | COPY ./docker-compose/php/uploads.ini /usr/local/etc/php/conf.d/uploads.ini | ||||||
|  | COPY ./uffizzi/.env.example /var/www/.env | ||||||
|  |  | ||||||
|  | # Set working directory | ||||||
|  | WORKDIR /var/www | ||||||
|  |  | ||||||
|  | RUN chown -R crater-user:crater-user ./ | ||||||
|  | RUN chmod -R 775 composer.json composer.lock \  | ||||||
|  |         composer.lock storage/framework/ \ | ||||||
|  |         storage/logs/ bootstrap/cache/ /home/crater-user/.composer | ||||||
|  |  | ||||||
|  | RUN composer config --no-plugins allow-plugins.pestphp/pest-plugin true && \ | ||||||
|  |     composer install --no-interaction --prefer-dist --optimize-autoloader && \ | ||||||
|  |     php artisan storage:link || true && \ | ||||||
|  |     php artisan key:generate | ||||||
|  |  | ||||||
|  | FROM php:8.0-fpm-alpine | ||||||
|  |  | ||||||
|  | RUN apk add --no-cache \ | ||||||
|  |     php8-bcmath | ||||||
|  |  | ||||||
|  | RUN docker-php-ext-install pdo pdo_mysql bcmath | ||||||
|  |  | ||||||
|  | COPY docker-compose/crontab /etc/crontabs/root | ||||||
|  |  | ||||||
|  | # Mounted volumes | ||||||
|  | COPY --from=build /var/www /var/www | ||||||
|  |  | ||||||
|  | RUN chown -R $(whoami):$(whoami) /var/www/ | ||||||
|  | RUN chmod -R 775 /var/www/ | ||||||
|  | RUN chown -R $(whoami):$(whoami) /var/log/ | ||||||
|  | RUN chmod -R 775 /var/log/ | ||||||
|  |  | ||||||
|  | CMD ["crond", "-f"] | ||||||
							
								
								
									
										58
									
								
								uffizzi/docker-compose.uffizzi.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										58
									
								
								uffizzi/docker-compose.uffizzi.yml
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,58 @@ | |||||||
|  | version: '3' | ||||||
|  |  | ||||||
|  | x-uffizzi: | ||||||
|  |   ingress: | ||||||
|  |     service: nginx | ||||||
|  |     port: 80 | ||||||
|  |  | ||||||
|  | services: | ||||||
|  |   app: | ||||||
|  |     image: "${APP_IMAGE}" | ||||||
|  |     restart: unless-stopped | ||||||
|  |     working_dir: /var/www/ | ||||||
|  |     command: ["-c"," | ||||||
|  |             composer config --no-plugins allow-plugins.pestphp/pest-plugin true &&  | ||||||
|  |             composer install --no-interaction --prefer-dist --optimize-autoloader &&  | ||||||
|  |             php artisan storage:link || true &&  | ||||||
|  |             php artisan key:generate --force &&  | ||||||
|  |             php-fpm", | ||||||
|  |             ] | ||||||
|  |     entrypoint: /bin/sh | ||||||
|  |     depends_on: | ||||||
|  |       - db | ||||||
|  |     deploy: | ||||||
|  |       resources: | ||||||
|  |         limits: | ||||||
|  |           memory: 1000m | ||||||
|  |  | ||||||
|  |   db: | ||||||
|  |     image: mariadb | ||||||
|  |     restart: always | ||||||
|  |     environment: | ||||||
|  |       MYSQL_USER: crater | ||||||
|  |       MYSQL_PASSWORD: crater | ||||||
|  |       MYSQL_DATABASE: crater | ||||||
|  |       MYSQL_ROOT_PASSWORD: crater | ||||||
|  |     ports: | ||||||
|  |       - '33006:3306' | ||||||
|  |     deploy: | ||||||
|  |       resources: | ||||||
|  |         limits: | ||||||
|  |           memory: 500m | ||||||
|  |  | ||||||
|  |   nginx: | ||||||
|  |     image: "${NGINX_IMAGE}" | ||||||
|  |     restart: unless-stopped | ||||||
|  |     ports: | ||||||
|  |       - 80:80 | ||||||
|  |     depends_on: | ||||||
|  |       - app | ||||||
|  |     resources: | ||||||
|  |       limits: | ||||||
|  |         memory: 500m | ||||||
|  |  | ||||||
|  |   cron: | ||||||
|  |     image: "${CROND_IMAGE}" | ||||||
|  |     restart: always | ||||||
|  |      | ||||||
|  |  | ||||||
							
								
								
									
										9
									
								
								uffizzi/nginx/Dockerfile
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								uffizzi/nginx/Dockerfile
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,9 @@ | |||||||
|  | ARG BASE_IMAGE | ||||||
|  |  | ||||||
|  | FROM $BASE_IMAGE as build | ||||||
|  | FROM nginx:1.17-alpine | ||||||
|  |  | ||||||
|  | RUN rm /etc/nginx/conf.d/default.conf | ||||||
|  |  | ||||||
|  | COPY --from=build /var/www /var/www | ||||||
|  | COPY ./uffizzi/nginx/nginx /etc/nginx/conf.d/ | ||||||
							
								
								
									
										22
									
								
								uffizzi/nginx/nginx/nginx.conf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								uffizzi/nginx/nginx/nginx.conf
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,22 @@ | |||||||
|  | server { | ||||||
|  |     client_max_body_size 64M; | ||||||
|  |     listen 80; | ||||||
|  |     index index.php index.html; | ||||||
|  |     error_log  /var/log/nginx/error.log; | ||||||
|  |     access_log /var/log/nginx/access.log; | ||||||
|  |     root /var/www/public; | ||||||
|  |     location ~ \.php$ { | ||||||
|  |         try_files $uri =404; | ||||||
|  |         fastcgi_split_path_info ^(.+\.php)(/.+)$; | ||||||
|  |         fastcgi_pass localhost:9000; | ||||||
|  |         fastcgi_index index.php; | ||||||
|  |         include fastcgi_params; | ||||||
|  |         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; | ||||||
|  |         fastcgi_param PATH_INFO $fastcgi_path_info; | ||||||
|  |         fastcgi_read_timeout 300; | ||||||
|  |     } | ||||||
|  |     location / { | ||||||
|  |         try_files $uri $uri/ /index.php?$query_string; | ||||||
|  |         gzip_static on; | ||||||
|  |     } | ||||||
|  | } | ||||||
| @ -1,4 +1,5 @@ | |||||||
| import { defineConfig } from 'laravel-vite' | import { defineConfig } from 'vite' | ||||||
|  | import laravel from 'laravel-vite-plugin' | ||||||
| import vue from '@vitejs/plugin-vue' | import vue from '@vitejs/plugin-vue' | ||||||
|  |  | ||||||
| export default defineConfig({ | export default defineConfig({ | ||||||
| @ -7,11 +8,17 @@ export default defineConfig({ | |||||||
|         ignored: ['**/.env/**'], |         ignored: ['**/.env/**'], | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|  |     plugins: [ | ||||||
|  |       vue(), | ||||||
|  |       laravel({ | ||||||
|  |         input: ['resources/scripts/main.js'], | ||||||
|  |         valetTls: false, | ||||||
|  |       }), | ||||||
|  |     ], | ||||||
|     resolve: { |     resolve: { | ||||||
|       alias: { |       alias: { | ||||||
|             "vue-i18n": "vue-i18n/dist/vue-i18n.cjs.js" |         '@': '/resources', | ||||||
|         } |         'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js' | ||||||
|     } |       }, | ||||||
| }).withPlugins( |     }, | ||||||
|     vue |   }) | ||||||
| ) |  | ||||||
		Reference in New Issue
	
	Block a user
	