refactor: use uniform cash box & cash cassette nomenclature

new-lamassu-admin/src/pages/Cashout/WizardStep.js

@@ -162,14 +162,14 @@ const WizardStep = ({
 
       {lastStep && (
         <div className={classes.disclaimer}>
-          <Info2 className={classes.title}>Cash-out Bill Count</Info2>
+          <Info2 className={classes.title}>Cash Cassette Bill Count</Info2>
           <P>
             <WarningIcon className={classes.disclaimerIcon} />
             When enabling cash-out, your bill count will be automatically set to
             zero. Make sure you physically put cash inside the cash cassettes to
             allow the machine to dispense it to your users. If you already did,
-            make sure you set the correct cash-out bill count for this machine
+            make sure you set the correct cash cassette bill count for this
-            on your Cash Cassettes tab under Maintenance.
+            machine on your Cash Boxes & Cassettes tab under Maintenance.
           </P>
 
           <Info2 className={classes.title}>Default Commissions</Info2>

new-lamassu-admin/src/pages/Machines/MachineComponents/Cassettes/Cassettes.js

@@ -26,7 +26,7 @@ const widthsByNumberOfCassettes = {
 const ValidationSchema = Yup.object().shape({
   name: Yup.string().required('Required'),
   cashbox: Yup.number()
-    .label('Cashbox')
+    .label('Cash box')
     .required()
     .integer()
     .min(0)
@@ -101,7 +101,7 @@ const CashCassettes = ({ machine, config, refetchData }) => {
   const elements = [
     {
       name: 'cashbox',
-      header: 'Cashbox',
+      header: 'Cash box',
       width: widthsByNumberOfCassettes[numberOfCassettes].cashbox,
       stripe: false,
       view: value => (
@@ -119,7 +119,7 @@ const CashCassettes = ({ machine, config, refetchData }) => {
     it => {
       elements.push({
         name: `cassette${it}`,
-        header: `Cash-out ${it}`,
+        header: `Cash cassette ${it}`,
         width: widthsByNumberOfCassettes[numberOfCassettes].cassette,
         stripe: true,
         doubleHeader: 'Cash-out',

new-lamassu-admin/src/pages/Machines/Machines.js

@@ -97,7 +97,7 @@ const Machines = () => {
               <Details data={machine} timezone={timezone} />
             </div>
             <div className={classes.detailItem}>
-              <TL1 className={classes.subtitle}>{'Cash cassettes'}</TL1>
+              <TL1 className={classes.subtitle}>{'Cash box & cassettes'}</TL1>
               <Cassettes
                 refetchData={refetch}
                 machine={machine}

new-lamassu-admin/src/pages/Maintenance/CashCassettes.js

@@ -31,7 +31,7 @@ const useStyles = makeStyles(styles)
 const ValidationSchema = Yup.object().shape({
   name: Yup.string().required(),
   cashbox: Yup.number()
-    .label('Cashbox')
+    .label('Cash box')
     .required()
     .integer()
     .min(0)
@@ -204,7 +204,7 @@ const CashCassettes = () => {
     },
     {
       name: 'cashbox',
-      header: 'Cash-in',
+      header: 'Cash box',
       width: maxNumberOfCassettes > 2 ? 140 : 280,
       view: value => (
         <CashIn currency={{ code: fiatCurrency }} notes={value} total={0} />
@@ -270,9 +270,9 @@ const CashCassettes = () => {
   return (
     <>
       <TitleSection
-        title="Cash Cassettes"
+        title="Cash Boxes & Cassettes"
         button={{
-          text: 'Cashbox history',
+          text: 'Cash box history',
           icon: HistoryIcon,
           inverseIcon: ReverseHistoryIcon,
           toggle: setShowHistory

new-lamassu-admin/src/pages/Maintenance/CashboxHistory.js

@@ -96,14 +96,18 @@ const CashboxHistory = ({ machines, currency }) => {
           `cash-cassette-${i}-refill`,
           <>
             <TxOutIcon />
-            <span className={classes.operationType}>Cash-out {i} refill</span>
+            <span className={classes.operationType}>
+              Cash cassette {i} refill
+            </span>
           </>
         ),
         R.assoc(
           `cash-cassette-${i}-empty`,
           <>
             <TxOutIcon />
-            <span className={classes.operationType}>Cash-out {i} emptied</span>
+            <span className={classes.operationType}>
+              Cash cassette {i} emptied
+            </span>
           </>
         )
       )(ret),
@@ -111,7 +115,7 @@ const CashboxHistory = ({ machines, currency }) => {
       'cash-box-empty': (
         <>
           <TxInIcon />
-          <span className={classes.operationType}>Cash-in emptied</span>
+          <span className={classes.operationType}>Cash box emptied</span>
         </>
       )
     },
@@ -254,7 +258,7 @@ const CashboxHistory = ({ machines, currency }) => {
           name="cashboxHistory"
           elements={elements}
           data={batches}
-          emptyText="No cashbox batches so far"
+          emptyText="No cash box batches so far"
         />
       )}
     </>

new-lamassu-admin/src/pages/Maintenance/Wizard/WizardSplash.js

@@ -67,7 +67,7 @@ const WizardSplash = ({ name, onContinue }) => {
       <div className={classes.warningInfo}>
         <WarningIcon className={classes.warningIcon} />
         <P noMargin className={classes.warningText}>
-          For cash-out cassettes, please make sure you've removed the remaining
+          For cash cassettes, please make sure you've removed the remaining
           bills before adding the new ones.
         </P>
       </div>

new-lamassu-admin/src/pages/Maintenance/Wizard/WizardStep.js

@@ -168,7 +168,7 @@ const WizardStep = ({
                       classes.verticalAlign,
                       classes.fullWidth
                     )}>
-                    <H4 noMargin>Did you empty the cash-in box?</H4>
+                    <H4 noMargin>Did you empty the cash box?</H4>
                     <Field
                       component={RadioGroup}
                       name="wasCashboxEmptied"
@@ -188,8 +188,8 @@ const WizardStep = ({
                       <P>Since previous update</P>
                       <Tooltip width={215}>
                         <P>
-                          Number of bills inside the cashbox, since the last
+                          Number of bills inside the cash box, since the last
-                          cashbox changes.
+                          cash box changes.
                         </P>
                       </Tooltip>
                     </div>
@@ -255,7 +255,7 @@ const WizardStep = ({
                         <H4
                           className={classes.cassetteFormTitleContent}
                           noMargin>
-                          Cash-out {step - 1} (dispenser)
+                          Cash cassette {step - 1} (dispenser)
                         </H4>
                       </div>
                       <Cashbox

new-lamassu-admin/src/pages/Notifications/sections/FiatBalanceOverrides.js

@@ -131,10 +131,10 @@ const FiatBalanceOverrides = ({ section }) => {
     it => {
       elements.push({
         name: `fillingPercentageCassette${it}`,
-        display: `Cash-out ${it}`,
+        display: `Cash cassette ${it}`,
         width: 155,
         textAlign: 'right',
-        doubleHeader: 'Cash-out (Cassette Empty)',
+        doubleHeader: 'Cash Cassette Empty',
         bold: true,
         input: NumberInput,
         suffix: '%',