payment-kit 1.13.185 → 1.13.187

package/api/src/routes/invoices.ts

@@ -2,6 +2,7 @@ import { isValid } from '@arcblock/did';
 import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
+import { Op } from 'sequelize';
 
 import { syncStripeInvoice } from '../integrations/stripe/handlers/invoice';
 import { syncStripePayment } from '../integrations/stripe/handlers/payment-intent';
@@ -41,6 +42,7 @@ const schema = Joi.object<{
   customer_did?: string;
   subscription_id?: string;
   currency_id?: string;
+  ignoreZero?: boolean;
   q?: string;
   o?: string;
 }>({
@@ -52,11 +54,12 @@ const schema = Joi.object<{
   customer_did: Joi.string().empty(''),
   subscription_id: Joi.string().empty(''),
   currency_id: Joi.string().empty(''),
+  ignoreZero: Joi.boolean().empty(false),
   q: Joi.string().empty(''), // query
   o: Joi.string().empty(''), // order
 });
 router.get('/', authMine, async (req, res) => {
-  const { page, pageSize, livemode, status, ...query } = await schema.validateAsync(req.query, {
+  const { page, pageSize, livemode, status, ignoreZero, ...query } = await schema.validateAsync(req.query, {
     stripUnknown: false,
     allowUnknown: true,
   });
@@ -68,6 +71,9 @@ router.get('/', authMine, async (req, res) => {
       .map((x) => x.trim())
       .filter(Boolean);
   }
+  if (ignoreZero) {
+    where.total = { [Op.ne]: '0' };
+  }
   if (query.customer_id) {
     where.customer_id = query.customer_id;
   }

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.185
+version: 1.13.187
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.185",
+  "version": "1.13.187",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.39",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.185",
+    "@blocklet/payment-react": "1.13.187",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.39",
     "@blocklet/uploader": "^0.0.74",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.185",
+    "@blocklet/payment-types": "1.13.187",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "4780ee769cd4f0a7e4c415fd2209dea6711a6b74"
+  "gitHead": "1eba252975f6a974397c878738badaca8388bb7a"
 }

package/src/components/invoice/list.tsx

@@ -47,6 +47,7 @@ type ListProps = {
   customer_id?: string;
   subscription_id?: string;
   status?: string;
+  ignoreZero?: boolean;
 
   invoiceProps?: {
     onClick?: (invoice: TInvoiceExpanded) => void | Promise<void>;
@@ -74,24 +75,34 @@ InvoiceList.defaultProps = {
   customer_id: '',
   subscription_id: '',
   status: '',
+  ignoreZero: false,
 
   invoiceProps: {},
 
   mode: 'admin',
 };
 
-export default function InvoiceList({ customer_id, subscription_id, features, status, invoiceProps, mode }: ListProps) {
+export default function InvoiceList({
+  customer_id,
+  subscription_id,
+  features,
+  status,
+  ignoreZero,
+  invoiceProps,
+  mode,
+}: ListProps) {
   const listKey = getListKey({ customer_id, subscription_id });
   const persisted = getDurableData(listKey);
 
   const { t } = useLocaleContext();
   const navigate = useNavigate();
-  const [search, setSearch] = useState<SearchProps>({
+  const [search, setSearch] = useState<SearchProps & { ignoreZero?: boolean }>({
     status: status as string,
     customer_id,
     subscription_id,
     pageSize: persisted.rowsPerPage || 20,
     page: persisted.page ? persisted.page + 1 : 1,
+    ignoreZero: !!ignoreZero,
   });
   const { startTransition } = useTransitionContext();
 

package/src/components/invoice/table.tsx

@@ -82,7 +82,7 @@ export default function InvoiceTable({ invoice, simple }: Props) {
             <TableCell align="right">
               <Stack direction="row" spacing={0.5} alignItems="center" justifyContent="flex-end">
                 <Typography>{line.quantity}</Typography>
-                {line.metadata && line.metadata.quantity && (
+                {line.metadata && !!line.metadata.quantity && (
                   <Tooltip
                     title={t('payment.customer.invoice.rawQuantity', { quantity: line.metadata.quantity })}
                     placement="top">

package/src/components/subscription/portal/cancel.tsx

@@ -17,7 +17,7 @@ export default function CustomerCancelForm({ data }: { data: TSubscriptionExpand
         name="cancel.feedback"
         control={control}
         render={({ field }) => (
-          <RadioGroup {...field}>
+          <RadioGroup {...field} sx={{ ml: '5px !important' }}>
             <FormControlLabel
               value="too_expensive"
               control={<Radio checked={field.value === 'too_expensive'} />}

package/src/pages/customer/subscription/detail.tsx

@@ -158,6 +158,7 @@ export default function CustomerSubscriptionDetail() {
                 navigate(`/customer/invoice/${invoice.id}`);
               },
             }}
+            ignoreZero
             mode="customer"
           />
         </Box>