Overview
Comment:Invoice module: cancelled status display fixed
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | invoice_module
Files: files | file ages | folders
SHA3-256: e24d80809adf1c6f6a07a1bf6e11039c4833f499ffe44645a71f7e8601f2bb2c
User & Date: alinaar on 2023-04-04 13:04:07
Other Links: branch diff | manifest | tags
Context
2023-04-04
13:35
Invoice module: invoice implementation on customer filter check-in: d334a0ae9f user: alinaar tags: invoice_module
13:04
Invoice module: cancelled status display fixed check-in: e24d80809a user: alinaar tags: invoice_module
13:00
Invoice module: developer tools available only if DEV_MODE is set to true check-in: eaeb68ee8c user: alinaar tags: invoice_module
Changes

Modified src/modules/invoice/index.html from [9744348df2] to [ce8f5a7c10].

32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

{{* ==================== Listing ==================== *}}

{{if $_GET.q}}
	<h2 class="ruler">Résultat(s) de recherche pour "{{$_GET.q}}"</h2>
{{/if}}

{{:include file='./include/constants.tpl' keep='DRAFT_STATUS, AWAITING_STATUS, VALIDATED_STATUS, PAID_STATUS, TYPE_LABELS, STATUS_LABELS, CANCELLED_LABEL, QUOTATION_TYPE, INVOICE_TYPE, INVOICE_STATUS_LABELS'}}

{{if $_GET.show === $QUOTATION_TYPE}}
	{{:assign filter="$$.type = :type AND $$.archived = false" type_filter=$QUOTATION_TYPE}}
{{elseif $_GET.show === 'paid'}}
	{{:assign filter="$$.type = :type AND $$.status = :status AND $$.archived = false" type_filter=$INVOICE_TYPE status_filter=$PAID_STATUS}}
{{elseif $_GET.show === 'unpaid'}}
	{{:assign filter="$$.type = :type AND $$.status = :status AND $$.cancelled = false AND $$.archived = false" type_filter=$INVOICE_TYPE status_filter=$AWAITING_STATUS}}







|







32
33
34
35
36
37
38
39
40
41
42
43
44
45
46

{{* ==================== Listing ==================== *}}

{{if $_GET.q}}
	<h2 class="ruler">Résultat(s) de recherche pour "{{$_GET.q}}"</h2>
{{/if}}

{{:include file='./include/constants.tpl' keep='DRAFT_STATUS, AWAITING_STATUS, VALIDATED_STATUS, PAID_STATUS, TYPE_LABELS, STATUS_LABELS, QUOTATION_CANCELLED_LABEL, INVOICE_CANCELLED_LABEL, QUOTATION_TYPE, INVOICE_TYPE, INVOICE_STATUS_LABELS'}}

{{if $_GET.show === $QUOTATION_TYPE}}
	{{:assign filter="$$.type = :type AND $$.archived = false" type_filter=$QUOTATION_TYPE}}
{{elseif $_GET.show === 'paid'}}
	{{:assign filter="$$.type = :type AND $$.status = :status AND $$.archived = false" type_filter=$INVOICE_TYPE status_filter=$PAID_STATUS}}
{{elseif $_GET.show === 'unpaid'}}
	{{:assign filter="$$.type = :type AND $$.status = :status AND $$.cancelled = false AND $$.archived = false" type_filter=$INVOICE_TYPE status_filter=$AWAITING_STATUS}}
102
103
104
105
106
107
108

109
110

111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
		<td>{{$deadline|date_short}}</td>
		<td>{{$recipient_business_name}}</td>
		<td>{{:link href="details.html?id=%d&show=%s"|args:$id:$type label=$subject}}</td>
		<td class="money">{{$total|money_currency}}</td>
		<td>
			{{if $type === $INVOICE_TYPE}}
				{{:assign var="label" from="INVOICE_STATUS_LABELS.%s"|args:$status}}

			{{else}}
				{{:assign var="label" from="STATUS_LABELS.%s"|args:$status}}

			{{/if}}

			{{if !$cancelled}}
				{{$label}}
				{{if $status === $VALIDATED_STATUS}}- {{$validation_date|date_short}}
				{{elseif $type === $INVOICE_TYPE && $status === $PAID_STATUS}}- {{$payment_date|date_short}}{{/if}}
			{{else}}
				{{$CANCELLED_LABEL}}
			{{/if}}
		</td>
		<td class="actions">
			{{:include file='./include/document_list_buttons.html'}}
		</td>
	</tr>
{{else}}







>


>







|







102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
		<td>{{$deadline|date_short}}</td>
		<td>{{$recipient_business_name}}</td>
		<td>{{:link href="details.html?id=%d&show=%s"|args:$id:$type label=$subject}}</td>
		<td class="money">{{$total|money_currency}}</td>
		<td>
			{{if $type === $INVOICE_TYPE}}
				{{:assign var="label" from="INVOICE_STATUS_LABELS.%s"|args:$status}}
				{{:assign cancelled_label=$INVOICE_CANCELLED_LABEL}}
			{{else}}
				{{:assign var="label" from="STATUS_LABELS.%s"|args:$status}}
				{{:assign cancelled_label=$QUOTATION_CANCELLED_LABEL}}
			{{/if}}

			{{if !$cancelled}}
				{{$label}}
				{{if $status === $VALIDATED_STATUS}}- {{$validation_date|date_short}}
				{{elseif $type === $INVOICE_TYPE && $status === $PAID_STATUS}}- {{$payment_date|date_short}}{{/if}}
			{{else}}
				{{$cancelled_label}}
			{{/if}}
		</td>
		<td class="actions">
			{{:include file='./include/document_list_buttons.html'}}
		</td>
	</tr>
{{else}}