refactoring

Author: Systemaker

app/modules/auth/controllers/logout_controller.py

@@ -10,7 +10,7 @@
 from app import app
 from app import db
 from app.modules.users.models import User
-
+from app.modules.orders.models import Order
 
 
 # AUTHENTICATION PAGE
@@ -28,20 +28,22 @@ def logout():
  # redirect to the login page
  if request.is_xhr == True :
  # Remove classic session
+ logout_user()
  if 'email' in session:
  session.pop('email')
  session.pop('current_lang')
- if session.get('order_id') :
- session.pop('order_id') 
- session.clear()
+ if session.get('order_id') :
+ Order().destroy_data(session.get('order_id'))
+ session.pop('order_id') 
+ session.clear()
  return jsonify(data = {message:"You have successfully been logged out"}), 200, {'Content-Type': 'application/json'}
  else:
  # Remove flask login session
  logout_user()
  session.pop('email')
  session.pop('current_lang')
  if session.get('order_id') :
- session.pop('order_id')
+ Order().destroy_data(session.get('order_id')) 
  session.clear()
  flash('You have successfully been logged out', 'info')
  return redirect(url_for('auth_page.login'))

app/modules/orders/controllers.py

@@ -165,6 +165,8 @@ def new():
 
  'items' : form.items.data,
 
+ 'comments' : form.comments.data,
+
  'is_active' : form.is_active.data
  }
 
@@ -221,14 +223,16 @@ def edit(id=1):
 
  'items' : form.items.data,
 
+ 'comments' : form.comments.data,
+
  'is_active' : form.is_active.data
  }
 
  orders.update_data(order.id, sanitize_form)
 
  # Remove current order
- if order.status != 'cart' and session.get('order_id'):
- session.pop('order_id')
+ #if order.status != 'cart' and session.get('order_id'):
+ #session.pop('order_id')
 
  logger.info("Editing a new record.")
 
@@ -248,6 +252,8 @@ def edit(id=1):
  if order.items :
  form.items.data = order.items
 
+ form.comments.data = order.comments
+
  form.is_active.data = order.is_active
 
  # html or Json response

app/modules/orders/forms.py

@@ -21,5 +21,8 @@ class Form_Record_Add(Form):
  query_factory=lambda : Item.query.filter(Item.is_active == True).all(),
  get_label=lambda s: s.title_en_US,
  allow_blank=True)
+ 
+ comments = TextAreaField('comments', validators=[validators.Length(max=200, message='max 200 characters')])
+
 
  is_active = BooleanField('is_active', default=True)

app/modules/orders/models.py

@@ -72,6 +72,10 @@ class Order(db.Model):
  # amount in decimal , precision=10, scale=2 .
  amount = db.Column(db.Numeric(10,2), nullable=False, default=0.0)
 
+ params = db.Column(db.Text())
+
+ comments = db.Column(db.Text())
+
  # is_active usually returns True. 
  # This should return False only in cases where we have disabled order. 
  is_active = db.Column(db.Boolean, index=True, default=True)

app/modules/orders/templates/orders/edit.html

@@ -7,7 +7,7 @@ <h3>{{ title_en_US }}</h3>
  <div class="col-lg-8 col-centered">
  <div class="well">
  <form method="POST" action="{{ form.action }}" enctype="multipart/form-data" role="form" class="form-horizontal" accept-charset="utf-8">
- 
+
  <input id="csrf_token" name="csrf_token" value="{{ csrf_token() }}" type="hidden">
  <fieldset>
  <legend>Form order</legend>
@@ -71,7 +71,20 @@ <h3>{{ title_en_US }}</h3>
  </div>
  </div>
 
- 
+ <div class="form-group">
+ <label for="order_comments" class="col-lg-4 control-label">{{ form.comments.label }}</label>
+
+ <div class="col-lg-6">
+ {{ form.comments (cols="35", rows="5", class="form-control") }}
+ <!-- <textarea class="form-control" id="order_comments" name="order_comments">form.comments.data</textarea> -->
+ {% for error in form.errors.comments %} <br/>
+
+ <div class="alert alert-danger" style="display: inline-block">
+ {{ error }}
+ </div>
+ {% endfor %}
+ </div>
+ </div>
 
  <div class="form-group">
  <label for="order_is_active" class="col-lg-4 control-label">{{ form.is_active.label }}</label>

app/modules/orders/templates/orders/index.html

@@ -15,6 +15,8 @@ <h3>Order</h3>
  <th>User</th>
  <th>Items</th>
  <th>Amount</th>
+ <th>Params</th>
+ <th>Comments</th>
  <th>Active</th>
  <th>Updated Date</th>
  <th>Created Date</th>
@@ -59,6 +61,8 @@ <h3>Order</h3>
  <td>
  {{ order.amount }}
  </td>
+ <td>{{ order.params }}</td>
+ <td>{{ order.comments }}</td>
  <td>{{ order.is_active }}</td>
  <td>{{ order.updated_at | datetimeformat }}</td>
  <td>{{ order.created_at | datetimeformat }}</td>

app/modules/orders/templates/orders/show.html

@@ -37,6 +37,8 @@ <h4 class="text-right"><a href="/orders"><span class="glyphicon glyphicon-chevro
  {% endif %}
  </p>
  <p>{{ order.amount }}</p>
+ <p>{{ order.params }}</p>
+ <p>{{ order.comments }}</p>
  <p>{{ order.is_active }}</p>
  <p>{{ order.updated_at }}</p>
  <p>{{ order.created_at }}</p>

app/templates/base.html

@@ -13,17 +13,16 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
  <title>{% block title_en_US%} {{ app.config['APP_NAME'] }}{% endblock %}</title>
+ <link rel="shortcut icon" href="{{ url_for('static', filename='images/favicon.ico') }}">
  <link href="//netdna.bootstrapcdn.com/bootstrap/{{ bootstrap_version }}/css/bootstrap.min.css" rel="stylesheet" />
  <link href="//netdna.bootstrapcdn.com/bootswatch/{{ bootswatch_version }}/{{ bootswatch_theme }}/bootstrap.min.css" rel="stylesheet" >
 
  <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.3.0/css/datepicker3.min.css" />
- <link href="/static/styles/main.css" rel="stylesheet" />
- <link rel="shortcut icon" href="{{ url_for('static', filename='images/favicon.ico') }}">
+ <link href="/static/styles/main.css" rel="stylesheet" /> 
  {% block head_style %}{# page-specific CSS #}{% endblock %} 
 
  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
  <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/{{ modernizer_version }}/modernizr.min.js"></script>{# Modernizr must be here, above body tag. #}
-
  <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.3.0/js/bootstrap-datepicker.min.js"></script>
  <script src="https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.6/tinymce.min.js"></script>
  <script src="http://cdnjs.cloudflare.com/ajax/libs/tinymce/4.5.6/jquery.tinymce.min.js"></script>
@@ -79,7 +78,7 @@
 
  </div><!-- /footer -->
  </footer>
- <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/{{ jquery_version }}/jquery.min.js"></script> -->
+ <!-- <script src="https://ajax.googleapis.com/ajax/libs/jquery/{{ jquery_version }}/jquery.min.js"></script>-->
  <script src="//netdna.bootstrapcdn.com/bootstrap/{{ bootstrap_version }}/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/{{ moment_version }}/moment.min.js"></script>
  <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key={{ app.config['GOOGLE_MAP_API_KEY'] }}"></script>