Overview
Comment:Invoice module: JSON schemas moved to specific folder
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | invoice_module
Files: files | file ages | folders
SHA3-256: 66f8a81566934e533184a01eacf4f6474cc54cf813d0529cd74f3649e6a7922e
User & Date: alinaar on 2023-03-03 15:43:00
Other Links: branch diff | manifest | tags
Context
2023-03-03
16:12
Invoice module: Preview's CSS externalized check-in: c6e920014a user: alinaar tags: invoice_module
15:43
Invoice module: JSON schemas moved to specific folder check-in: 66f8a81566 user: alinaar tags: invoice_module
15:33
Invoice module: status change fixed check-in: 16c249bfab user: alinaar tags: invoice_module
Changes

Modified src/skel-dist/modules/invoice/config.html from [0bbfbbcdfd] to [9d8edbc00d].

13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label='Ville de signature des devis trop longue' check_value=$_POST.signing_place check_max=128}}
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label="Texte d'introduction trop long" check_value=$_POST.introduction_text check_max=256}}
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label='Instructions de paiement trop longues' check_value=$_POST.payment_detail check_max=512}}
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label='Informations complémentaires trop longues' check_value=$_POST.quotation_extra_info check_max=512}}

	{{if !$check_errors}}
		{{:save key="config"
			validate_schema="./config.schema.json"
			vat_exemption=$_POST.vat_exemption
			siret=$_POST.siret
			signing_place=$_POST.signing_place
			introduction_text=$_POST.introduction_text
			payment_detail=$_POST.payment_detail
			quotation_extra_info=$_POST.quotation_extra_info
		}}







|







13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label='Ville de signature des devis trop longue' check_value=$_POST.signing_place check_max=128}}
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label="Texte d'introduction trop long" check_value=$_POST.introduction_text check_max=256}}
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label='Instructions de paiement trop longues' check_value=$_POST.payment_detail check_max=512}}
	{{:include file='./include/check_max_length.tpl' keep='check_errors' check_label='Informations complémentaires trop longues' check_value=$_POST.quotation_extra_info check_max=512}}

	{{if !$check_errors}}
		{{:save key="config"
			validate_schema="./schema/config.json"
			vat_exemption=$_POST.vat_exemption
			siret=$_POST.siret
			signing_place=$_POST.signing_place
			introduction_text=$_POST.introduction_text
			payment_detail=$_POST.payment_detail
			quotation_extra_info=$_POST.quotation_extra_info
		}}

Modified src/skel-dist/modules/invoice/details.html from [cab9cf5162] to [3a1925034d].

14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
		{{else}}
			{{:assign var='new_status_label' from='STATUS_LABELS.%s'|args:$_POST.status}}
			{{if $new_status_label === null}}
				{{:assign var='errors[]' value='Nouveau statut invalide : %s.'|args:$_POST.status}}
			{{else}}
				{{#load id=$_POST.id|intval}}
					{{:save id=$id
						validate_schema="./quotation.schema.json"
						key=$key
						type=$type
						recipient_business_name=$recipient_business_name
						recipient_address=$recipient_address
						recipient_member_id=$recipient_member_id
						recipient_member_numero=$recipient_member_numero
						introduction_text=$introduction_text







|







14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
		{{else}}
			{{:assign var='new_status_label' from='STATUS_LABELS.%s'|args:$_POST.status}}
			{{if $new_status_label === null}}
				{{:assign var='errors[]' value='Nouveau statut invalide : %s.'|args:$_POST.status}}
			{{else}}
				{{#load id=$_POST.id|intval}}
					{{:save id=$id
						validate_schema="./schema/quotation.json"
						key=$key
						type=$type
						recipient_business_name=$recipient_business_name
						recipient_address=$recipient_address
						recipient_member_id=$recipient_member_id
						recipient_member_numero=$recipient_member_numero
						introduction_text=$introduction_text

Modified src/skel-dist/modules/invoice/edit.html from [9d3f1aa6e7] to [2edd9894ee].

22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
{{/if}}

{{if $_POST.quotation_submit}}
	{{:assign computed_total=0}}
	{{:assign check_errors=null}}
	{{:assign items=null}}

	{{* Hack to get the unique element sine "$my_array|keys" and "$my_array|first" do not exist *}}
	{{#foreach from=$_POST.customer key='id' item='name'}}
		{{if $id != $id|intval|strval}} {{* Hack to check the data is a number *}}
			{{:assign var='check_errors.' value='Membre séléctionné invalide.'}}
		{{/if}}
		{{:assign customer_id=$id|intval}}
	{{/foreach}}
	{{if $customer_id !== null}}







|







22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
{{/if}}

{{if $_POST.quotation_submit}}
	{{:assign computed_total=0}}
	{{:assign check_errors=null}}
	{{:assign items=null}}

	{{* Hack to get the unique element since "$my_array|keys" and "$my_array|first" do not exist *}}
	{{#foreach from=$_POST.customer key='id' item='name'}}
		{{if $id != $id|intval|strval}} {{* Hack to check the data is a number *}}
			{{:assign var='check_errors.' value='Membre séléctionné invalide.'}}
		{{/if}}
		{{:assign customer_id=$id|intval}}
	{{/foreach}}
	{{if $customer_id !== null}}
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
		{{if $document}}
			{{:assign id=$document.id|intval}}
		{{else}}
			{{:assign id=null}}
		{{/if}}

		{{:save 
			validate_schema="./quotation.schema.json"
			id=$id
			key=$key
			type='quotation'
			recipient_business_name=$recipient_business_name
			recipient_address=$recipient_address
			recipient_member_id=$recipient_member_id
			recipient_member_numero=$recipient_member_numero







|







157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
		{{if $document}}
			{{:assign id=$document.id|intval}}
		{{else}}
			{{:assign id=null}}
		{{/if}}

		{{:save 
			validate_schema="./schema/quotation.json"
			id=$id
			key=$key
			type='quotation'
			recipient_business_name=$recipient_business_name
			recipient_address=$recipient_address
			recipient_member_id=$recipient_member_id
			recipient_member_numero=$recipient_member_numero

Name change from src/skel-dist/modules/invoice/config.schema.json to src/skel-dist/modules/invoice/schema/config.json.

Name change from src/skel-dist/modules/invoice/document.schema.json to src/skel-dist/modules/invoice/schema/document.json.

Name change from src/skel-dist/modules/invoice/quotation.schema.json to src/skel-dist/modules/invoice/schema/quotation.json.