tambah field, format halaman public, dan perbaikan

esipkd/models/isipkd.py

@@ -391,6 +391,10 @@ class ARInvoice(CommonModel, Base):
     denda_rekening_id = Column(Integer, nullable=True,  default=0)
     ## 17 Sep 2020
     no_skrd         = Column(String(128))
+    ## 07 Okt 2020
+    pejabat_nama    = Column(String(64))
+    pejabat_pangkat = Column(String(64))
+    pejabat_nip     = Column(String(64))
 
     subjekpajaks    = relationship("SubjekPajak", backref=backref('arinvoices'))
     objekpajaks     = relationship("ObjekPajak",  backref=backref('arinvoices'))

esipkd/views/arinvoice_b.py

@@ -217,6 +217,21 @@ class AddSchema(colander.Schema):
                     colander.String(),
                     oid = "no_skrd"
                     )
+    pejabat_nama = colander.SchemaNode(
+                    colander.String(),
+                    title="Nama Pejabat",
+                    oid = "pejabat_nama"
+                    )
+    pejabat_pangkat = colander.SchemaNode(
+                    colander.String(),
+                    title="Pangkat Pejabat",
+                    oid = "pejabat_pangkat"
+                    )
+    pejabat_nip = colander.SchemaNode(
+                    colander.String(),
+                    title="NIP",
+                    oid = "pejabat_nip"
+                    )
                     
 class EditSchema(AddSchema):
     id = colander.SchemaNode(colander.Integer(),
@@ -828,6 +843,9 @@ def view_pdf(request):
                               ARInvoice.jatuh_tempo.label('jatuh_tempo'),
                               ARInvoice.pokok.label('pokok'),
                               ARInvoice.denda.label('denda'),
+                              ARInvoice.pejabat_nama.label('pejabat_nama'),
+                              ARInvoice.pejabat_pangkat.label('pejabat_pangkat'),
+                              ARInvoice.pejabat_nip.label('pejabat_nip'),
                               ARSspd.ntp.label('ntp'),
                               ARSspd.ntb.label('ntb'),
                               ARSspd.tgl_bayar.label('tgl_bayar'),
@@ -836,6 +854,9 @@ def view_pdf(request):
                        .outerjoin(ARSspd, ARSspd.arinvoice_id==ARInvoice.id)\
                        .filter(ARInvoice.id==params['id']).first()
         item = Item()
+        item.pejabat_nama       = row.pejabat_nama
+        item.pejabat_pangkat    = row.pejabat_pangkat
+        item.pejabat_nip        = row.pejabat_nip
         item.opd        = row.unit_nama
         item.wp_nama    = row.wp_nama
         item.wp_alamat  = (row.wp_alamat_2 and row.wp_alamat_2 != '-') and ('{} {}'.format(row.wp_alamat_1, row.wp_alamat_2)) or row.wp_alamat_1

esipkd/views/public.py

@@ -350,6 +350,10 @@ def view_public(request):
                         ARInvoice.jatuh_tempo.label('jatuh_tempo'),
                         ARInvoice.pokok.label('pokok'),
                         ARInvoice.denda.label('denda'),
+                        ARInvoice.pejabat_nama.label('pejabat_nama'),
+                        ARInvoice.pejabat_pangkat.label('pejabat_pangkat'),
+                        ARInvoice.pejabat_nip.label('pejabat_nip'),
+                        ARInvoice.id.label('invoice_id'),
                         ARSspd.ntp.label('ntp'),
                         ARSspd.ntb.label('ntb'),
                         ARSspd.tgl_bayar.label('tgl_bayar'),
@@ -360,4 +364,8 @@ def view_public(request):
             if row:
                 found = True
 
-    return dict(data=row, found=found)
+            jml         = terbilang(row.jumlah) + ' Rupiah'
+            tahun       = datetime.now().year
+            qrcodename  = 'skrd_{}{}'.format(row.invoice_id,'.png')
+        
+    return dict(data=row, jml_terbilang=jml, tahun=tahun, qrcodename=qrcodename, found=found)

esipkd/views/templates/arinvoice/add_b.pt

@@ -245,8 +245,44 @@
               <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
                            tal:repeat="error field.error.messages()">
                            ${error}</p>          </div>
+        </div>
+        <!-- Nama Pejabat -->
+        <div class="form-group" tal:define="field form['pejabat_nama']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}<span id="error-${field.oid}" class="text text-danger"
+                                  tal:condition="field.required">&nbsp*</span></label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
 
         </div>
+        <!-- Pangkat Pejabat -->
+        <div class="form-group" tal:define="field form['pejabat_pangkat']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}<span id="error-${field.oid}" class="text text-danger"
+                                  tal:condition="field.required">&nbsp*</span></label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+        </div>
+        <!-- NIP Pejabat -->
+        <div class="form-group" tal:define="field form['pejabat_nip']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}<span id="error-${field.oid}" class="text text-danger"
+                                  tal:condition="field.required">&nbsp*</span></label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+        </div>
       </div> 
     </div>
     

esipkd/views/templates/arinvoice/edit_b.pt

@@ -198,6 +198,43 @@
                            tal:repeat="error field.error.messages()">
                            ${error}</p>          </div>
         </div>
+        <!-- Nama Pejabat -->
+        <div class="form-group" tal:define="field form['pejabat_nama']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}<span id="error-${field.oid}" class="text text-danger"
+                                  tal:condition="field.required">&nbsp*</span></label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+
+        </div>
+        <!-- Pangkat Pejabat -->
+        <div class="form-group" tal:define="field form['pejabat_pangkat']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}<span id="error-${field.oid}" class="text text-danger"
+                                  tal:condition="field.required">&nbsp*</span></label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+        </div>
+        <!-- NIP Pejabat -->
+        <div class="form-group" tal:define="field form['pejabat_nip']" id="item-${field.oid}">
+          <label for="${field.oid}" class="control-label col-md-3" id="req-${field.oid}">
+              ${field.title}<span id="error-${field.oid}" class="text text-danger"
+                                  tal:condition="field.required">&nbsp*</span></label>
+          <div class="col-md-9">
+              ${structure:field.serialize()}
+              <p id="error-${field.oid}" class="help-block" tal:condition="field.error"
+                           tal:repeat="error field.error.messages()">
+                           ${error}</p>          
+          </div>
+        </div> 
       </div> 
     </div>