@evershop/evershop 1.0.0 → 1.1.0

package/src/modules/stripe/api/stripeWebHook/[bodyJson]webhook.js

@@ -12,7 +12,7 @@ const {
 } = require('@evershop/evershop/src/lib/postgres/connection');
 const { getConfig } = require('@evershop/evershop/src/lib/util/getConfig');
 const { emit } = require('@evershop/evershop/src/lib/event/emitter');
-const { debug } = require('@evershop/evershop/src/lib/log/debuger');
+const { debug } = require('@evershop/evershop/src/lib/log/logger');
 const { display } = require('zero-decimal-currencies');
 const { getSetting } = require('../../../setting/services/setting');
 
@@ -57,7 +57,9 @@ module.exports = async (request, response, delegate, next) => {
         // Create payment transaction
         await insert('payment_transaction')
           .given({
-            amount: parseFloat(display(paymentIntent.amount, paymentIntent.currency)),
+            amount: parseFloat(
+              display(paymentIntent.amount, paymentIntent.currency)
+            ),
             payment_transaction_order_id: order.order_id,
             transaction_id: paymentIntent.id,
             transaction_type: 'online',

package/src/modules/tax/bootstrap.js

@@ -1,4 +1,9 @@
 const config = require('config');
+const { addProcessor } = require('../../lib/util/registry');
+const registerDefaultTaxClassCollectionFilters = require('./services/registerDefaultTaxClassCollectionFilters');
+const {
+  defaultPaginationFilters
+} = require('../../lib/util/defaultPaginationFilters');
 
 module.exports = () => {
   // Pricing configuration
@@ -13,4 +18,16 @@ module.exports = () => {
   };
   config.util.setModuleDefaults('pricing', pricingConfig);
   // Getting config value like this: config.get('pricing.tax.rounding');
+
+  // Reigtering the default filters for tax class collection
+  addProcessor(
+    'taxClassCollectionFilters',
+    registerDefaultTaxClassCollectionFilters,
+    1
+  );
+  addProcessor(
+    'taxClassCollectionFilters',
+    (filters) => [...filters, ...defaultPaginationFilters],
+    2
+  );
 };

package/src/modules/tax/services/TaxClassCollection.js

@@ -1,5 +1,6 @@
 const { camelCase } = require('@evershop/evershop/src/lib/util/camelCase');
 const { pool } = require('@evershop/evershop/src/lib/postgres/connection');
+const { getValue } = require('@evershop/evershop/src/lib/util/registry');
 
 class TaxClassCollection {
   constructor(baseQuery) {
@@ -8,68 +9,33 @@ class TaxClassCollection {
 
   async init(args, { filters = [] }) {
     const currentFilters = [];
-    // Name filter
-    const nameFilter = filters.find((f) => f.key === 'name');
-    if (nameFilter) {
-      this.baseQuery.andWhere(
-        'tax_class.name',
-        'ILIKE',
-        `%${nameFilter.value}%`
-      );
-      currentFilters.push({
-        key: 'name',
-        operation: '=',
-        value: nameFilter.value
-      });
-    }
 
-    const sortBy = filters.find((f) => f.key === 'sortBy');
-    const sortOrder = filters.find(
-      (f) =>
-        f.key === 'sortOrder' &&
-        ['ASC', 'DESC', 'asc', 'desc'].includes(f.value)
-    ) || { value: 'DESC' };
-    if (sortBy && sortBy.value === 'name') {
-      this.baseQuery.orderBy('tax_class.name', sortOrder.value);
-      currentFilters.push({
-        key: 'sortBy',
-        operation: '=',
-        value: sortBy.value
-      });
-    } else {
-      this.baseQuery.orderBy('tax_class.tax_class_id', 'DESC');
-    }
-    if (sortOrder.key) {
-      currentFilters.push({
-        key: 'sortOrder',
-        operation: '=',
-        value: sortOrder.value
-      });
-    }
+    // Apply the filters
+    const taxClassCollectionFilters = await getValue(
+      'taxClassCollectionFilters',
+      []
+    );
+
+    taxClassCollectionFilters.forEach((filter) => {
+      const check = filters.find((f) => f.key === filter.key);
+      if (check) {
+        if (filter.operation.includes(check.operation)) {
+          filter.callback(
+            this.baseQuery,
+            check.operation,
+            check.value,
+            currentFilters
+          );
+        }
+      }
+    });
 
     // Clone the main query for getting total right before doing the paging
     const totalQuery = this.baseQuery.clone();
     totalQuery.select('COUNT(*)', 'total');
     totalQuery.removeOrderBy();
-    // Paging
-    const page = filters.find((f) => f.key === 'page') || { value: 1 };
-    const limit = filters.find((f) => f.key === 'limit' && f.value > 0) || {
-      value: 20
-    }; // TODO: Get from the config
-    currentFilters.push({
-      key: 'page',
-      operation: '=',
-      value: page.value
-    });
-    currentFilters.push({
-      key: 'limit',
-      operation: '=',
-      value: limit.value
-    });
-    this.baseQuery.limit(
-      (page.value - 1) * parseInt(limit.value, 10),
-      parseInt(limit.value, 10)
-    );
+    totalQuery.removeLimit();
+
     this.currentFilters = currentFilters;
     this.totalQuery = totalQuery;
   }

package/src/modules/tax/services/registerDefaultTaxClassCollectionFilters.js

@@ -0,0 +1,49 @@
+const {
+  OPERATION_MAP
+} = require('@evershop/evershop/src/lib/util/filterOperationMapp');
+const { getValueSync } = require('@evershop/evershop/src/lib/util/registry');
+
+module.exports = async function registerDefaultTaxClassCollectionFilters() {
+  // List of default supported filters
+  const defaultFilters = [
+    {
+      key: 'name',
+      operation: ['like'],
+      callback: (query, operation, value, currentFilters) => {
+        query.andWhere(
+          'tax_class.name',
+          OPERATION_MAP[operation],
+          `%${value}%`
+        );
+        currentFilters.push({
+          key: 'name',
+          operation,
+          value
+        });
+      }
+    },
+    {
+      key: 'ob',
+      operation: ['eq'],
+      callback: (query, operation, value, currentFilters) => {
+        const taxClassCollectionSortBy = getValueSync(
+          'taxClassCollectionSortBy',
+          {
+            name: (query) => query.orderBy('tax_class.name')
+          }
+        );
+
+        if (taxClassCollectionSortBy[value]) {
+          taxClassCollectionSortBy[value](query, operation);
+          currentFilters.push({
+            key: 'ob',
+            operation,
+            value
+          });
+        }
+      }
+    }
+  ];
+
+  return defaultFilters;
+};

package/src/components/admin/oms/shippingSetting/Method.jsx

@@ -1,73 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { useModal } from '@components/common/modal/useModal';
-import MethodForm from './MethodForm';
-
-function Method({ method, getZones }) {
-  const modal = useModal();
-  return (
-    <>
-      <>
-        <td className="border-none py-1">{method.name}</td>
-        <td className="border-none py-1">
-          {method.isEnabled ? 'Enabled' : 'Disabled'}
-        </td>
-        <td className="border-none py-1">{method.cost?.text}</td>
-        <td className="border-none py-1">
-          {method.conditionType
-            ? `${method.min || 0} <= ${method.conditionType} <= ${
-                method.max || '∞'
-              }`
-            : 'None'}
-        </td>
-        <td className="border-none py-1">
-          <a
-            href="#"
-            className="text-interactive"
-            onClick={(e) => {
-              e.preventDefault();
-              modal.openModal();
-            }}
-          >
-            Edit
-          </a>
-        </td>
-      </>
-      {modal.state.showing && (
-        <div className={modal.className} onAnimationEnd={modal.onAnimationEnd}>
-          <div
-            className="modal-wrapper flex self-center justify-center items-center"
-            tabIndex={-1}
-            role="dialog"
-          >
-            <div className="modal">
-              <MethodForm
-                saveMethodApi={method.updateApi}
-                closeModal={() => modal.closeModal()}
-                getZones={getZones}
-                method={method}
-              />
-            </div>
-          </div>
-        </div>
-      )}
-    </>
-  );
-}
-
-Method.propTypes = {
-  method: PropTypes.shape({
-    name: PropTypes.string.isRequired,
-    isEnabled: PropTypes.bool.isRequired,
-    cost: PropTypes.shape({
-      text: PropTypes.string.isRequired
-    }),
-    conditionType: PropTypes.string.isRequired,
-    min: PropTypes.number.isRequired,
-    max: PropTypes.number.isRequired,
-    updateApi: PropTypes.string.isRequired
-  }).isRequired,
-  getZones: PropTypes.func.isRequired
-};
-
-export default Method;

package/src/components/common/grid/headers/Basic.jsx

@@ -1,55 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import { Input } from '@components/common/form/fields/Input';
-
-export default function BasicColumnHeader({ title, id, currentFilters = [] }) {
-  const filterInput = React.useRef(null);
-
-  const onKeyPress = (e) => {
-    const url = new URL(document.location);
-    if (e.key === 'Enter') {
-      if (e.target.value === '') url.searchParams.delete(id);
-      else url.searchParams.set(id, e.target.value);
-      window.location.href = url.href;
-    }
-  };
-
-  React.useEffect(() => {
-    const filter = currentFilters.find((fillter) => fillter.key === id) || {
-      value: ''
-    };
-    filterInput.current.value = filter.value;
-  }, []);
-
-  return (
-    <th className="column">
-      <div className="table-header id-header">
-        <div className="title" style={{ marginBottom: '1rem' }}>
-          <span>{title}</span>
-        </div>
-        <div className="filter" style={{ width: '15rem' }}>
-          <Input
-            ref={filterInput}
-            onKeyPress={(e) => onKeyPress(e)}
-            placeholder={title}
-          />
-        </div>
-      </div>
-    </th>
-  );
-}
-
-BasicColumnHeader.propTypes = {
-  id: PropTypes.string.isRequired,
-  title: PropTypes.string.isRequired,
-  currentFilters: PropTypes.arrayOf(
-    PropTypes.shape({
-      key: PropTypes.string,
-      value: PropTypes.string
-    })
-  )
-};
-
-BasicColumnHeader.defaultProps = {
-  currentFilters: []
-};

package/src/lib/log/debuger.js

@@ -1,89 +0,0 @@
-const { green, red, blue, yellow, white } = require('kleur');
-const isDevelopmentMode = require('../util/isDevelopmentMode');
-
-// Define logger function
-function debug(level, message) {
-  if (isDevelopmentMode() || process.argv.includes('--debug')) {
-    let logMessage = ``;
-    let textMessage = `${message}`;
-    // If message is an exception object, include the stack trace
-    if (message instanceof Error) {
-      textMessage = `${message.message}\n${message.stack}`;
-    }
-    // Switch color based on level
-    switch (level) {
-      case 'critical':
-        logMessage += red(`[debug] ❌ ${textMessage}`);
-        break;
-      case 'warning':
-        logMessage += yellow(`[debug] ⚠️ ${textMessage}`);
-        break;
-      case 'info':
-        logMessage += blue(`[debug] ℹ️ ${textMessage}`);
-        break;
-      case 'success':
-        logMessage += green(`[debug] ✅ ${textMessage}`);
-        break;
-      default:
-        logMessage += white(`[debug] - ${textMessage}`);
-        break;
-    }
-
-    // If message is added to a group, store it in the group
-    if (this.group && Array.isArray(this.group.messages)) {
-      this.group.messages.push(logMessage);
-      return; // Do not output message to console or file
-    }
-
-    // eslint-disable-next-line no-console
-    console.log(logMessage);
-  } else {
-    // Do not output message to console or file
-  }
-}
-
-function error(e) {
-  // Check if e is a string message
-  if (typeof e === 'string') {
-    // eslint-disable-next-line no-console
-    console.log(`\n❌ ${red(e)}\n`);
-  } else if (e instanceof Error) {
-    // eslint-disable-next-line no-console
-    console.log(`\n❌ ${red(e.stack)}`);
-  } else {
-    throw new Error('Error message must be a string or an Error object');
-  }
-}
-
-function warning(message) {
-  if (typeof message === 'string' || typeof message === 'number') {
-    // eslint-disable-next-line no-console
-    console.log(`\n⚠️  ${yellow(message)}\n`);
-  } else {
-    throw new Error('Warning message must be a string or number');
-  }
-}
-
-function info(message) {
-  if (typeof message === 'string' || typeof message === 'number') {
-    // eslint-disable-next-line no-console
-    console.log(`\nℹ️ ${blue(message)}\n`);
-  } else {
-    throw new Error('Warning message must be a string or number');
-  }
-}
-
-function success(message) {
-  if (typeof message === 'string' || typeof message === 'number') {
-    // eslint-disable-next-line no-console
-    console.log(`\n✅ ${green(message)}\n`);
-  } else {
-    throw new Error('Warning message must be a string or number');
-  }
-}
-
-module.exports.success = success;
-module.exports.info = info;
-module.exports.warning = warning;
-module.exports.error = error;
-module.exports.debug = debug;

package/src/modules/customer/pages/frontStore/login/LoginButton.jsx

@@ -1,27 +0,0 @@
-import React from 'react';
-import { _ } from '@evershop/evershop/src/lib/locale/translate';
-import Button from '@components/common/form/Button';
-
-export default function LoginButton() {
-  return (
-    <div className="form-submit-button flex border-t border-divider mt-1 pt-1">
-      <Button
-        title={_('SIGN IN')}
-        type="submit"
-        onAction={() => {
-          document.getElementById('loginForm').dispatchEvent(
-            new Event('submit', {
-              cancelable: true,
-              bubbles: true
-            })
-          );
-        }}
-      />
-    </div>
-  );
-}
-
-export const layout = {
-  areaId: 'loginFormInner',
-  sortOrder: 50
-};