Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/agratek/api/merchant/views/api_merchant.py

src/agratek/api/merchant/views/api_payment.py

@@ -101,6 +101,7 @@ def set_register_values(dat, customer):
         delivery_phone=deliver_to['phone'],
         delivery_pos=deliver_to['post_code'],
         delivery_state=deliver_to['state'],
+        # delivery_email=deliver_to['email'],
 
         fee=dat['fee'],
         vat=dat['vat'],

src/agratek/api/merchant/views/merchant_payment.py

@@ -307,6 +307,11 @@ class RegisterSchema(colander.Schema):
         missing=colander.drop,
         widget=widget.TextInputWidget(attributes={'maxlength': 50})
     )
+    delivery_email = colander.SchemaNode(
+        colander.String(),
+        missing=colander.drop,
+        widget=widget.TextInputWidget(attributes={'maxlength': 128})
+    )
     vat = colander.SchemaNode(
         colander.Integer(),
         default=0,

src/agratek/api/merchant/views/np/__init__.py

@@ -111,6 +111,7 @@ class Vendor(VendorClass):  # VendorClass
         Nicepay.set('deliveryState', self.invoice_det.delivery_state)
         Nicepay.set('deliveryPostCd', self.invoice_det.delivery_pos)
         Nicepay.set('deliveryCountry', self.invoice_det.delivery_country)
+        # Nicepay.set('deliveryEmail', self.invoice_det.delivery_email)
 
         # print('>>> INVOICE DET:', self.invoice_det.vat, type(self.invoice_det.vat),
         #       self.invoice_det.fee, type(self.invoice_det.fee),