Zoho Books Invoice report

boxoffice/assets/js/templates/admin_org_report.html.js

@@ -12,15 +12,65 @@ export const OrgReportTemplate = `
               <p class="field-title filled">Report type</p>
               <select name="report-type" value="{{ reportType }}">
                 <option value="invoices" selected="selected">Invoices</option>
-                {{#if siteadmin}}
-                  <option value="settlements">Settlements</option>
-                {{/if}}
+                <option value="settlements">Settlements</option>
+                <option value="invoices_zoho_books">Zoho Books Invoices</option>
               </select>
-              {{#if reportType == "settlements"}}
-                <p class='settlements-month-widget'>
-                  <input id="month" type="month" value="{{monthYear}}">
-                </p>
-              {{/if}}
+              <p class="{{showForZBInvoicesClass()}}">
+                <small>
+                  Following fields do not get automatically detected during import
+                  and need to be manually mapped:
+                  <ul>
+                    <li>Sales Order Number</li>
+                    <li>
+                      Contact Details
+                      <ul>
+                        <li>First Name</li>
+                        <li>Last Name</li>
+                        <li>Email</li>
+                      </ul>
+                    </li>
+                    <li>
+                      Item Details
+                      <ul>
+                        <li>Item Tax %</li>
+                      </ul>
+                    </li>
+                  </ul>
+                  Following fields need to be manually added to the exported file:
+                  <ul>
+                    <li>Place of Supply</li>
+                    <li>
+                      Item Details
+                      <ul>
+                        <li>Account</li>
+                        <li>HSN/SAC</li>
+                      </ul>
+                    </li>
+                  </ul>
+                </small>
+              </p>
+            </div>
+            <div class="group-select {{hideForSettlementsClass()}}">
+              <p class="field-title filled">Filter by period</p>
+              <select name="period-type" value="{{ periodType }}">
+                <option value="all" selected="selected">All</option>
+                <option value="monthly">Monthly</option>
+                <option value="custom">Custom</option>
+              </select>
+            </div>
+            <div class="report-period">
+              <p class="field-title filled {{periodMonthlyClass()}}">Month</p>
+              <p class="{{periodMonthlyClass()}}">
+                <input id="month" type="month" value="{{periodMonth}}" max="{{currentMonth}}">
+              </p>
+              <p class="field-title filled {{periodCustomClass()}}">From</p>
+              <p class="{{periodCustomClass()}}">
+                <input id="period-from" type="date" name="from" value="{{periodFrom}}" max="{{periodTo}}">
+              </p>
+              <p class="field-title filled {{periodCustomClass()}}">To</p>
+              <p class="{{periodCustomClass()}}">
+                <input id="period-to" type="date" name="to" value="{{periodTo}}" max="{{periodTo}}">
+              </p>
             </div>
             <div class="btn-wrapper">
               <a href="{{ reportsUrl() }}" download="{{ reportsFilename() }}" class="boxoffice-button boxoffice-button-action">Download</a>

boxoffice/assets/js/views/admin_org_report.js

@@ -16,21 +16,45 @@ export const OrgReportView = {
         scope_id: accountName,
         root: true,
       }),
-    }).done(({ account_title: accountTitle, siteadmin }) => {
+    }).done(({ account_title: accountTitle }) => {
       // Initial render
       const currentDate = new Date();
-      const currentYear = currentDate.getFullYear();
+      const currentYear = String(currentDate.getFullYear());
       // month starts from 0
-      const currentMonth = currentDate.getMonth() + 1;
+      const currentMonth = String(currentDate.getMonth() + 1).padStart(2, '0');
+      const prevMonth = String(
+        ((currentDate.getMonth() + 11) % 12) + 1
+      ).padStart(2, '0');
+      const toDate = String(currentDate.getDate()).padStart(2, '0');
       const reportComponent = new Ractive({
         el: '#main-content-area',
         template: OrgReportTemplate,
         transitions: { fly },
         data: {
           accountTitle,
           reportType: 'invoices',
-          monthYear: `${currentYear}-${currentMonth}`,
-          siteadmin,
+          periodType: 'all',
+          periodMonth: `${currentYear}-${prevMonth}`,
+          currentMonth: `${currentYear}-${currentMonth}`,
+          periodFrom: `${currentYear}-${currentMonth}-01`,
+          periodTo: `${currentYear}-${currentMonth}-${toDate}`,
+          hideForSettlementsClass() {
+            return this.get('reportType') === 'settlements' ? 'hide' : '';
+          },
+          showForZBInvoicesClass() {
+            return this.get('reportType') === 'invoices_zoho_books'
+              ? ''
+              : 'hide';
+          },
+          periodMonthlyClass() {
+            if (this.get('reportType') === 'settlements') return '';
+            return this.get('periodType') !== 'monthly' ? 'hide' : '';
+          },
+          periodCustomClass() {
+            return this.get('periodType') !== 'custom'
+              ? 'hide'
+              : this.get('hideForSettlementsClass')();
+          },
           reportsUrl() {
             const reportType = this.get('reportType');
             const url = urlFor('index', {
@@ -40,19 +64,48 @@ export const OrgReportView = {
               ext: 'csv',
               root: true,
             });
+            const params = {};
             if (reportType === 'settlements') {
-              const [year, month] = this.get('monthYear').split('-');
-              return `${url}?year=${year}&month=${month}`;
+              const periodMonth = this.get('periodMonth');
+              if (periodMonth)
+                [params.year, params.month] = periodMonth.split('-');
+            } else {
+              params.type = this.get('periodType');
+              switch (params.type) {
+                case 'monthly':
+                  params.month = this.get('periodMonth');
+                  break;
+                case 'custom':
+                  params.from = this.get('periodFrom');
+                  params.to = this.get('periodTo');
+                  break;
+                default:
+                  break;
+              }
             }
-            return url;
+            return `${url}?${$.param(params)}`;
           },
           reportsFilename() {
+            let filename = `${accountName}_${this.get('reportType')}`;
             if (this.get('reportType') === 'settlements') {
-              return `${accountName}_${this.get('reportType')}_${this.get(
-                'monthYear'
-              )}.csv`;
+              filename += `_${this.get('periodMonth')}`;
+            } else {
+              const periodType = this.get('periodType');
+              switch (periodType) {
+                case 'monthly':
+                  filename += `_${this.get('periodMonth')}`;
+                  break;
+                case 'custom':
+                  filename += `_${this.get('periodFrom')}_${this.get(
+                    'periodTo'
+                  )}`;
+                  break;
+                default:
+                  break;
+              }
             }
-            return `${accountName}_${this.get('reportType')}.csv`;
+            filename += '.csv';
+            return filename;
           },
         },
       });

boxoffice/assets/sass/_layout.scss

@@ -616,7 +616,7 @@ ul.content-slider-content {
   }
 }
 
-p.settlements-month-widget {
+p.period-type {
   margin-top: 10px;
 }
 //styles for admin page

boxoffice/extapi/razorpay.py

@@ -80,12 +80,12 @@ def get_settled_transactions(date_range, tz=None):
         "Transaction external to Boxoffice. Credited directly to Razorpay?"
     )
 
-    for settled_transaction in settled_transactions['tickets']:
+    for settled_transaction in settled_transactions['items']:
         if settled_transaction['type'] == 'settlement':
             rows.append(
                 {
                     'settlement_id': settled_transaction['entity_id'],
-                    'settlement_amount': settled_transaction['amount'],
+                    'settlement_amount': settled_transaction['amount'] / 100,
                     'settled_at': settled_transaction['settled_at'],
                     'transaction_type': settled_transaction['type'],
                 }
@@ -102,9 +102,9 @@ def get_settled_transactions(date_range, tz=None):
                         'transaction_type': settled_transaction['type'],
                         'order_id': order.id,
                         'payment_id': settled_transaction['entity_id'],
-                        'razorpay_fees': settled_transaction['fee'],
+                        'razorpay_fees': settled_transaction['fee'] / 100,
                         'transaction_date': localize_timezone(order.paid_at, tz),
-                        'credit': settled_transaction['credit'],
+                        'credit': settled_transaction['credit'] / 100,
                         'buyer_fullname': order.buyer_fullname,
                         'menu': order.menu.title,
                     }
@@ -128,7 +128,7 @@ def get_settled_transactions(date_range, tz=None):
                     {
                         'settlement_id': settled_transaction['settlement_id'],
                         'payment_id': settled_transaction['entity_id'],
-                        'credit': settled_transaction['credit'],
+                        'credit': settled_transaction['credit'] / 100,
                         'description': external_transaction_msg,
                     }
                 )
@@ -149,11 +149,11 @@ def get_settled_transactions(date_range, tz=None):
                     'payment_id': settled_transaction['payment_id'],
                     'transaction_type': settled_transaction['type'],
                     'order_id': order.id,
-                    'razorpay_fees': settled_transaction['fee'],
-                    'debit': settled_transaction['debit'],
+                    'razorpay_fees': settled_transaction['fee'] / 100,
+                    'debit': settled_transaction['debit'] / 100,
                     'buyer_fullname': order.buyer_fullname,
                     'description': refund.refund_description,
-                    'amount': refund.amount,
+                    'amount': refund.amount / 100,
                     'menu': order.menu.title,
                 }
             )

boxoffice/mailclient.py

@@ -205,7 +205,7 @@ def send_ticket_reassignment_mail(
             )
         order = line_item.order
 
-        subject = _("{title}: Your ticket has been transfered to someone else").format(
+        subject = _("{title}: Your ticket has been transferred to someone else").format(
             title=order.menu.title
         )
         msg = Message(

boxoffice/models/__init__.py

@@ -6,7 +6,6 @@
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.dialects import postgresql
 from sqlalchemy.orm import DeclarativeBase, Mapped
-from sqlalchemy_json import mutable_json_type
 import sqlalchemy as sa
 
 from coaster.sqlalchemy import (
@@ -41,7 +40,6 @@ class Model(ModelBase, DeclarativeBase):
     sa.orm.mapped_column(sa.TIMESTAMP(timezone=True), default=sa.func.utcnow()),
 ]
 
-
 TimestampMixin.__with_timezone__ = True
 db = SQLAlchemy(metadata=Model.metadata, query_class=Query)  # type: ignore[arg-type]
 Model.init_flask_sqlalchemy(db)