合作合同
-供应商合作合同模板待提供。
-提供正式合同模板后，可在这里查看合同预览。
+first) hidden @endif>
+ @include('business.partials.supplier-cooperation-contract', ['templateKey' => $key, 'mode' => 'preview', 'payload' => []])
+
+ @endforeach
{!! $supplierTemplates->text($block['text'], $supplierValues, $supplierPreview) !!}
+ @else +{!! $supplierTemplates->text($block['text'], $supplierValues, $supplierPreview) !!}
+ @endif +@endif +@foreach ($block['images'] ?? [] as $image) + : 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('img/supplier-contract-templates/' . $image))) }})
+@foreach ($supplierTemplates->blocks($templateKey) as $block)
+ @if ($block['type'] === 'signatures')
+
+
+ @elseif ($block['type'] === 'table')
+
+
+ @foreach ($block['rows'] as $row)
+
+ @else
+ @include('business.partials.supplier-contract-paragraph')
+ @endif
+@endforeach
+
diff --git a/resources/views/business/pdf/supplier-cooperation-contract.blade.php b/resources/views/business/pdf/supplier-cooperation-contract.blade.php
new file mode 100644
index 00000000..371a8ebc
--- /dev/null
+++ b/resources/views/business/pdf/supplier-cooperation-contract.blade.php
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+@include('business.partials.supplier-cooperation-contract', ['templateKey' => $payload['supplier_contract_template'], 'mode' => 'pdf'])
+
+
diff --git a/tests/Feature/Business/AgreementSigningPageTest.php b/tests/Feature/Business/AgreementSigningPageTest.php
index 2c33f2a1..b09f8ef4 100644
--- a/tests/Feature/Business/AgreementSigningPageTest.php
+++ b/tests/Feature/Business/AgreementSigningPageTest.php
@@ -98,7 +98,7 @@ class AgreementSigningPageTest extends FeatureTestCase
->assertSeeText('仅用于 E 签宝身份核验，不是收款人姓名')
->assertSee("setPreviewValue('proofSigner', '公司盖章')", false)
->assertSee("setPreviewValue('changeSigner', '公司盖章')", false)
- ->assertSeeText('合作合同统一使用我方账号 18052733960')
+ ->assertSeeText('快递合作合同使用我方账号 18052733960')
->assertSeeText('我方 E 签宝实名认证姓名')
->assertSee('name="secondary_operator_name"', false)
->assertSeeText('填写变量')
@@ -124,6 +124,24 @@ class AgreementSigningPageTest extends FeatureTestCase
$this->assertSame('张经理', $response->viewData('agreementSupplierOptions')[0]['operator']);
}
+ public function test_supplier_contract_templates_include_full_preview_and_editable_variables(): void
+ {
+ $this->grantWorkspaceAccess();
+ $response = $this->loginAs()->get(route('business.pages.show', [
+ 'section' => 'courier-payables', 'page' => 'agreement-signing', 'agreement_view' => 'create',
+ ]))->assertOk();
+ foreach (['dropshipping', 'consignment', 'production'] as $template) {
+ $response->assertSee('data-supplier-contract-preview="' . $template . '"', false);
+ $response->assertSeeText(\App\Support\SupplierCooperationTemplates::TEMPLATES[$template]['name']);
+ $response->assertSee(\App\Support\SupplierCooperationTemplates::TEMPLATES[$template]['code'], false);
+ }
+ $response->assertSee('name="supplier_contract_template"', false)
+ ->assertSee('name="supplier_contract_fields[number]"', false)
+ ->assertSee('data-supplier-bind="party_a"', false)
+ ->assertSee('production-3.png', false)
+ ->assertDontSeeText('供应商合作合同模板尚未提供');
+ }
+
public function testAgreementSigningPageUsesCourierNamesFromCourierInformation(): void
{
$this->grantWorkspaceAccess();
diff --git a/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php b/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php
index e7feb103..f2fd9aee 100644
--- a/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php
+++ b/tests/Feature/Business/CourierAgreementSignatureWorkflowTest.php
@@ -9,6 +9,7 @@ use App\Models\Business\CourierQuoteChange;
use App\Models\Business\CourierQuoteSignature;
use App\Models\Business\CourierQuoteVersion;
use App\Support\CourierAgreementPdf;
+use App\Support\SupplierCooperationTemplates;
use DOMDocument;
use DOMXPath;
use Illuminate\Http\Client\Request as ClientRequest;
@@ -136,11 +137,97 @@ class CourierAgreementSignatureWorkflowTest extends FeatureTestCase
$payload['partner_type'] = 'supplier';
$payload['supplier_id'] = 7;
$this->loginAs()->post(route('business.courier-agreement-signatures.store'), $payload)
- ->assertSessionHasErrors(['document_type' => '供应商合作合同模板尚未提供，暂不能发起签署。']);
+ ->assertSessionHasErrors('supplier_contract_template');
$this->assertSame(0, CourierAgreementSignature::query()->count());
Http::assertNothingSent();
}
+ /** @dataProvider supplierTemplateProvider */
+ public function test_supplier_contract_keeps_the_selected_template_and_archives_the_signed_file(string $template): void
+ {
+ $this->fakeEsign();
+ $payload = $this->supplierContractPayload($template);
+ $this->loginAs()->post(route('business.courier-agreement-signatures.store'), $payload)->assertRedirect();
+ $signature = CourierAgreementSignature::query()->firstOrFail();
+ $metadata = SupplierCooperationTemplates::TEMPLATES[$template];
+ $this->assertSame($metadata['code'], $signature->template_code);
+ $this->assertSame('1', $signature->template_version);
+ $this->assertSame($metadata['file'], $signature->source_file_name);
+ $this->assertSame($metadata['name'], $signature->documentLabel());
+ $this->assertSame($template, $signature->payload['supplier_contract_template']);
+ $this->assertSame('SUP-TEST-001', $signature->payload['supplier_contract_fields']['number']);
+ $this->assertSame('张经理', $signature->payload['supplier_contract_signer_name']);
+ $source = Storage::disk('uploads')->get($signature->source_pdf_path);
+ $this->assertStringStartsWith('%PDF-', $source);
+ $this->assertSame(hash('sha256', $source), $signature->source_pdf_sha256);
+ Http::assertSent(function (ClientRequest $request): bool {
+ if ($request->url() !== 'https://smlopenapi.esign.test/v3/sign-flow/create-by-file') return false;
+ $signers = $request->data()['signers'] ?? [];
+ return count($signers) === 2
+ && data_get($signers, '0.orgSignerInfo.orgName') === $this->company->name
+ && data_get($signers, '0.orgSignerInfo.transactorInfo.psnAccount') === '13900139000'
+ && data_get($signers, '0.orgSignerInfo.transactorInfo.psnInfo.psnName') === '李经理'
+ && data_get($signers, '1.orgSignerInfo.orgName') === '测试供应商有限公司'
+ && data_get($signers, '1.orgSignerInfo.transactorInfo.psnAccount') === '13800138000'
+ && data_get($signers, '1.orgSignerInfo.transactorInfo.psnInfo.psnName') === '张经理';
+ });
+ Http::swap(new \Illuminate\Http\Client\Factory());
+ Http::fake([
+ 'https://smlopenapi.esign.test/v3/sign-flow/flow-agreement-001/detail' => Http::response(['code' => 0, 'data' => ['signFlowStatus' => 2]]),
+ 'https://smlopenapi.esign.test/v3/sign-flow/flow-agreement-001/file-download-url' => Http::response(['code' => 0, 'data' => ['files' => [['downloadUrl' => 'https://download.esign.test/supplier-signed']]]]),
+ 'https://download.esign.test/supplier-signed' => Http::response('%PDF-supplier-signed'),
+ ]);
+ $archived = app(\App\Support\CourierAgreementSignatureService::class)->synchronize($signature, $this->user->id);
+ $this->assertSame(CourierAgreementSignature::STATUS_ARCHIVED, $archived->status);
+ $this->assertSame('%PDF-supplier-signed', Storage::disk('uploads')->get($archived->signed_pdf_path));
+ $this->assertSame($metadata['code'], $archived->template_code);
+ $this->assertSame($source, Storage::disk('uploads')->get($archived->source_pdf_path));
+ }
+
+ public static function supplierTemplateProvider(): array
+ {
+ return [['dropshipping'], ['consignment'], ['production']];
+ }
+
+ public function test_supplier_contract_rejects_invalid_template_and_missing_contract_identity(): void
+ {
+ Http::preventStrayRequests();
+ $this->withExceptionHandling();
+ $payload = $this->cooperationContractPayload('invalid-supplier-contract');
+ $payload += ['partner_type' => 'supplier', 'supplier_id' => 7, 'supplier_contract_template' => '../other'];
+ $this->loginAs()->post(route('business.courier-agreement-signatures.store'), $payload)->assertSessionHasErrors('supplier_contract_template');
+ $payload = $this->supplierContractPayload('dropshipping');
+ $payload['supplier_contract_fields']['number'] = '';
+ $payload['supplier_contract_fields']['location'] = '';
+ $this->post(route('business.courier-agreement-signatures.store'), $payload)->assertSessionHasErrors(['supplier_contract_fields.number', 'supplier_contract_fields.location']);
+ $this->assertSame(0, CourierAgreementSignature::query()->count());
+ Http::assertNothingSent();
+ }
+
+ public function test_supplier_contract_variables_are_escaped_and_cover_the_body_and_appendices(): void
+ {
+ $templates = app(SupplierCooperationTemplates::class);
+ foreach (array_keys(SupplierCooperationTemplates::TEMPLATES) as $template) {
+ $html = view('business.partials.supplier-cooperation-contract', [
+ 'templateKey' => $template, 'mode' => 'preview',
+ 'payload' => ['cooperation_party_a_name' => '', 'cooperation_party_b_name' => '新供应商', 'supplier_contract_fields' => ['number' => 'SUP-NEW-001']],
+ ])->render();
+ $this->assertStringContainsString('<script>', $html);
+ $this->assertStringNotContainsString('|
+ {{ $label }}：{!! $supplierTemplates->text('[[party_' . $party . ']]', $supplierValues, $supplierPreview) !!} +授权代表：{!! $supplierTemplates->text('[[party_' . $party . '_signer]]', $supplierValues, $supplierPreview) !!} +签字／盖章： + +合同签订日期：{!! $supplierTemplates->text('[[signature_date]]', $supplierValues, $supplierPreview) !!} + |
+ @endforeach
+
| 1) colspan="{{ $cell['colspan'] }}" @endif @if(($cell['rowspan'] ?? 1) > 1) rowspan="{{ $cell['rowspan'] }}" @endif> + @foreach ($cell['paragraphs'] as $paragraph) + @include('business.partials.supplier-contract-paragraph', ['block' => $paragraph]) + @endforeach + | + @endforeach +