fix: Fix order price.

tabetalt · May 27, 2021 · 1424b2f · 1424b2f
1 parent 4ca0875
commit 1424b2f
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 24 deletions.
diff --git a/src/modules/catalog/product/ProductCreate.tsx b/src/modules/catalog/product/ProductCreate.tsx
@@ -12,10 +12,14 @@ import {
  GetCategoriesShortDocument,
  useCreateProductMutation,
  ProductCategoryCreateInput,
+ TenantPriceDisplay,
 } from '../../../generated/graphql';
 import * as DineroHelper from '../../../helpers';
+import { DineroObject } from 'dinero.js';
+import { useTenant } from '../../../context/TenantContext';
 
 const ProductCreate: React.FC = () => {
+ const { currentTenant } = useTenant();
  const navigate = useNavigate();
  const [createProduct, { error }] = useCreateProductMutation({
  refetchQueries: [
@@ -27,13 +31,22 @@ const ProductCreate: React.FC = () => {
  const onSubmitBasic = useCallback(
  async (values) => {
  const input: ProductCreateInput = {
- tenantId: 1,
+ tenantId: currentTenant?.id,
  ...values,
  price: {
- grossAmount: DineroHelper.moneyFromString(values.price),
+ grossAmount:
+ currentTenant?.priceDisplay === TenantPriceDisplay.ExlVat
+ ? DineroHelper.moneyFromString(values.price)
+ : DineroHelper.moneyFromString(
+ DineroHelper.priceWithoutRate(
+ currentTenant?.vatRate?.value as DineroObject,
+ values.price
+ )
+ ),
  },
  stockControl: true,
  inStockNum: 0,
+ vatRateId: currentTenant?.vatRate?.id,
  };
 
  if (values.categories) {

diff --git a/src/modules/catalog/product/ProductUpdate.tsx b/src/modules/catalog/product/ProductUpdate.tsx
@@ -20,10 +20,14 @@ import {
  useGetProductQuery,
  useUpdateProductMutation,
  ProductUpdateInput,
+ TenantPriceDisplay,
 } from '../../../generated/graphql';
 import * as DineroHelper from '../../../helpers';
+import { DineroObject } from 'dinero.js';
+import { useTenant } from '../../../context/TenantContext';
 
 const ProductUpdate: React.FC = () => {
+ const { currentTenant } = useTenant();
  const navigate = useNavigate();
  const params = useParams();
  const productId = Number(params.productId);
@@ -49,16 +53,26 @@ const ProductUpdate: React.FC = () => {
 
  const onSubmit = useCallback(
  async (values) => {
- const input = _.omit({ tenantId: 1, ...data?.product, ...values }, [
- 'id',
- '__typename',
- 'price',
- 'categories',
- ]) as ProductUpdateInput;
+ const input = _.omit(
+ {
+ tenantId: currentTenant?.id,
+ ...data?.product,
+ ...values,
+ },
+ ['id', '__typename', 'price', 'categories']
+ ) as ProductUpdateInput;
 
  if (values.price) {
  input.price = {
- grossAmount: DineroHelper.moneyFromString(values.price),
+ grossAmount:
+ currentTenant?.priceDisplay === TenantPriceDisplay.ExlVat
+ ? DineroHelper.moneyFromString(values.price)
+ : DineroHelper.moneyFromString(
+ DineroHelper.priceWithoutRate(
+ currentTenant?.vatRate?.value as DineroObject,
+ values.price
+ )
+ ),
  };
  }
  if (values.categories) {

diff --git a/src/modules/catalog/product/components/ProductBasicOptions.tsx b/src/modules/catalog/product/components/ProductBasicOptions.tsx
@@ -22,6 +22,7 @@ import {
  GetSignedUrlQuery,
  GetSignedUrlQueryVariables,
  ProductStatus,
+ TenantPriceDisplay,
  useGetCategoriesShortQuery,
 } from '../../../../generated/graphql';
 import { useTenant } from '../../../../context/TenantContext';
@@ -86,7 +87,10 @@ const ProductBasicOptions: React.FC<ProductBasicOptionsProps> = ({
  initialValues: {
  ...defaultValues,
  ...product,
- price: DineroHelper.formatPrice(product?.price),
+ price: DineroHelper.formatPrice(
+ product?.price,
+ currentTenant?.priceDisplay === TenantPriceDisplay.IncVat
+ ),
  categories: product?.categories.map((category) => ({
  id: category?.id,
  name: category?.title,
@@ -195,7 +199,11 @@ const ProductBasicOptions: React.FC<ProductBasicOptionsProps> = ({
  </div>
  <div>
  <PrefilledInput
- label="Pris inkl. MVA"
+ label={
+ currentTenant?.priceDisplay === TenantPriceDisplay.IncVat
+ ? 'Pris inkl. MVA'
+ : 'Pris'
+ }
  prefilledText="NOK"
  prefilledTextPosition={TextPosition.RIGHT}
  placeholder="258,00"
@@ -208,13 +216,15 @@ const ProductBasicOptions: React.FC<ProductBasicOptionsProps> = ({
  {form.touched.price && form.errors.price && (
  <Error message={form.errors.price} />
  )}
- <Label sx={{ color: 'gray', ml: 158 }}>
- {'Pris eks. MVA: ' +
- DineroHelper.priceWithoutRate(
- currentTenant?.vatRate?.value as DineroObject,
- form.values.price
- )}
- </Label>
+ {currentTenant?.priceDisplay === TenantPriceDisplay.IncVat && (
+ <Label sx={{ color: 'gray', ml: 158 }}>
+ {'Pris eks. MVA: ' +
+ DineroHelper.priceWithoutRate(
+ currentTenant?.vatRate?.value as DineroObject,
+ form.values.price
+ )}
+ </Label>
+ )}
  </div>
  <div>
  <Field

diff --git a/src/modules/settings/ShippingSettings.tsx b/src/modules/settings/ShippingSettings.tsx
@@ -17,6 +17,7 @@ import {
  useGetDeliveryMethodsQuery,
 } from '../../generated/graphql';
 import { TenantItem } from '../../context/TenantContext';
+import * as DineroHelper from '../../helpers';
 
 export type DeliveryMethodItem =
  GetDeliveryMethodsQuery['deliveryMethods']['items'][0];
@@ -86,6 +87,10 @@ const Shipping: React.FC<ShippingSettingsProps> = ({ tenant }) => {
  {
  Header: 'Pris',
  accessor: 'price.amount',
+ Cell: ({
+ row: { original: deliveryMethod },
+ }: CellProps<DeliveryMethodItem>) =>
+ DineroHelper.formatMoney(deliveryMethod?.price),
  },
  {
  Header: 'Status',

diff --git a/src/modules/settings/ShippingSettingsModalContent.tsx b/src/modules/settings/ShippingSettingsModalContent.tsx
@@ -31,10 +31,8 @@ export const ShippingSettingsModalContent: React.FC<{
  tenantId: number | null | undefined;
  onRequestClose: () => void;
 }> = ({ currentDeliveryMethod, onRequestClose, tenantId }) => {
- const [updateDeliveryMethod, { error: updateError }] =
- useUpdateDeliveryMethodMutation();
- const [createDeliveryMethod, { error: createError }] =
- useCreateDeliveryMethodMutation();
+ const [updateDeliveryMethod] = useUpdateDeliveryMethodMutation();
+ const [createDeliveryMethod] = useCreateDeliveryMethodMutation();
 
  const update = async (
  currentDeliveryMethod: DeliveryMethodItem,
@@ -68,14 +66,14 @@ export const ShippingSettingsModalContent: React.FC<{
  <Formik
  initialValues={{
  name: currentDeliveryMethod?.name || '',
- price: currentDeliveryMethod?.price.amount || '',
+ price: DineroHelper.formatMoney(currentDeliveryMethod?.price) || '',
  status:
  currentDeliveryMethod?.status ||
  DeliveryMethodStatus.DeliveryMethodStatusUnspecified,
  digitalDelivery: currentDeliveryMethod?.digitalDelivery || false,
  }}
  validationSchema={DeliveryMethodSchema}
- onSubmit={async (values, { setSubmitting }) => {
+ onSubmit={async (values) => {
  const input = {
  name: values.name,
  price: DineroHelper.moneyFromString(String(values.price)),