Projet

Général

Profil

0001-maelis-decompose-datetime-format-constante-48480.patch

Nicolas Roche, 23 décembre 2020 17:35

Télécharger (1,81 ko)

Voir les différences:

Subject: [PATCH 1/4] maelis: decompose datetime format constante (#48480)

 passerelle/apps/maelis/utils.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
passerelle/apps/maelis/utils.py
14 14
#
15 15
# You should have received a copy of the GNU Affero General Public License
16 16
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
17 17

  
18 18
from __future__ import unicode_literals
19 19

  
20 20
from django.utils import timezone
21 21

  
22
datetime_format = '%d/%m/%Y %H:%M:%S'
22
DATE_FORMAT = '%Y-%m-%d'
23
TIME_FORMAT = '%H:%M:%S'
24
DATETIME_FORMAT = DATE_FORMAT + ' ' + TIME_FORMAT
23 25

  
24 26

  
25 27
def normalize_invoice(invoice):
26 28
    data = {
27 29
        'id': '%s-%s' % (invoice.numFamily, invoice.numInvoice),
28 30
        'display_id': str(invoice.numInvoice),
29 31
        'label': invoice.TTFInfo.libelle,
30
        'created': invoice.dateInvoice.strftime(datetime_format),
32
        'created': invoice.dateInvoice.strftime(DATETIME_FORMAT),
31 33
        'amount': invoice.amountInvoice - invoice.amountPaid,
32 34
        'paid': invoice.amountInvoice == invoice.amountPaid,
33 35
        'total_amount': invoice.amountInvoice,
34
        'pay_limit_date': invoice.dateDeadline.strftime(datetime_format),
36
        'pay_limit_date': invoice.dateDeadline.strftime(DATETIME_FORMAT),
35 37
        'has_pdf': bool(invoice.pdfName),
36 38
        'amount_paid': invoice.amountPaid
37 39
    }
38 40
    if invoice.amountInvoice == invoice.amountPaid:
39 41
        data.update({
40 42
            'amount': 0,
41 43
            'pay_limit_date': '',
42 44
            'online_payment': False
43
-