Delivery method field
parent
ec7705761c
commit
bf9fecfb03
|
@ -1,4 +1,6 @@
|
||||||
import flask
|
import flask
|
||||||
|
import logging
|
||||||
|
logging.basicConfig(level=logging.DEBUG)
|
||||||
from formity.admin import IndexView
|
from formity.admin import IndexView
|
||||||
from formity.external_auth import ExternalSpaceAuth
|
from formity.external_auth import ExternalSpaceAuth
|
||||||
from formity.extensions import db, migrate, admin, babel, metrics, cache
|
from formity.extensions import db, migrate, admin, babel, metrics, cache
|
||||||
|
|
|
@ -5,6 +5,7 @@ import csv
|
||||||
from flask import redirect, flash, request, url_for, make_response, current_app, session
|
from flask import redirect, flash, request, url_for, make_response, current_app, session
|
||||||
import flask_admin
|
import flask_admin
|
||||||
import pdfplumber
|
import pdfplumber
|
||||||
|
from flask_admin.form import rules
|
||||||
from formity.extensions import admin, db, ModelView, ModelViewHighSecurity, AdminSecurityMixin
|
from formity.extensions import admin, db, ModelView, ModelViewHighSecurity, AdminSecurityMixin
|
||||||
from wtforms import TextAreaField, validators
|
from wtforms import TextAreaField, validators
|
||||||
from formity.models import FaceshieldRequest, RequestChange, Status, PostalCode, ExternalUser
|
from formity.models import FaceshieldRequest, RequestChange, Status, PostalCode, ExternalUser
|
||||||
|
@ -94,6 +95,18 @@ class FaceshieldRequestAdmin(ModelView):
|
||||||
'postalcode_info',
|
'postalcode_info',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
form_create_rules = (
|
||||||
|
'entity_info', 'full_name', 'phone_number',
|
||||||
|
rules.FieldSet((
|
||||||
|
rules.Field('shipping_name'),
|
||||||
|
rules.Field('shipping_street'),
|
||||||
|
rules.Field('shipping_postalcode'),
|
||||||
|
rules.Field('shipping_city'),
|
||||||
|
rules.Field('shipping_latitude'),
|
||||||
|
rules.Field('shipping_longitude'),
|
||||||
|
), 'Shipping information')
|
||||||
|
)
|
||||||
|
|
||||||
form_overrides = {'entity_info': TextAreaField, 'extra': TextAreaField, 'remarks': TextAreaField}
|
form_overrides = {'entity_info': TextAreaField, 'extra': TextAreaField, 'remarks': TextAreaField}
|
||||||
form_args = {
|
form_args = {
|
||||||
'shipping_name': {'validators': [validators.Length(max=35)]},
|
'shipping_name': {'validators': [validators.Length(max=35)]},
|
||||||
|
@ -117,6 +130,10 @@ class FaceshieldRequestAdmin(ModelView):
|
||||||
('hskrk', 'hskrk'),
|
('hskrk', 'hskrk'),
|
||||||
('hswro', 'hswro'),
|
('hswro', 'hswro'),
|
||||||
],
|
],
|
||||||
|
'delivery_method': [
|
||||||
|
('shipping', 'Shipping'),
|
||||||
|
('pickup', 'Pickup'),
|
||||||
|
],
|
||||||
'shipping_provider': [
|
'shipping_provider': [
|
||||||
('kurjerzy', 'Kurjerzy'),
|
('kurjerzy', 'Kurjerzy'),
|
||||||
('xbs', 'XBS Group'),
|
('xbs', 'XBS Group'),
|
||||||
|
|
|
@ -69,6 +69,8 @@ class FaceshieldRequest(db.Model):
|
||||||
adapter_rd40_dar_delivered = db.Column(db.Integer, default=0, server_default='0')
|
adapter_rd40_dar_delivered = db.Column(db.Integer, default=0, server_default='0')
|
||||||
adapter_secura_dar_delivered = db.Column(db.Integer, default=0, server_default='0')
|
adapter_secura_dar_delivered = db.Column(db.Integer, default=0, server_default='0')
|
||||||
|
|
||||||
|
delivery_method = db.Column(db.String, default='shipping')
|
||||||
|
|
||||||
shipping_name = db.Column(db.String)
|
shipping_name = db.Column(db.String)
|
||||||
shipping_street = db.Column(db.String)
|
shipping_street = db.Column(db.String)
|
||||||
shipping_postalcode = db.Column(db.String)
|
shipping_postalcode = db.Column(db.String)
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
"""Add delivery_method
|
||||||
|
|
||||||
|
Revision ID: f801adcdbdff
|
||||||
|
Revises: daa8f858e53a
|
||||||
|
Create Date: 2020-04-19 21:00:27.052904
|
||||||
|
|
||||||
|
"""
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision = 'f801adcdbdff'
|
||||||
|
down_revision = 'daa8f858e53a'
|
||||||
|
branch_labels = None
|
||||||
|
depends_on = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.add_column('faceshield_request', sa.Column('delivery_method', sa.String(), nullable=True))
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade():
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_column('faceshield_request', 'delivery_method')
|
||||||
|
# ### end Alembic commands ###
|
Loading…
Reference in New Issue