@fleetbase/fleetops-engine 0.4.0 → 0.4.1

package/addon/templates/operations/service-rates/index/new.hbs

@@ -1,9 +1,9 @@
 <Overlay @position="right" @noBackdrop={{true}} @isResizable={{true}} @fullHeight={{true}} @width="570px">
-    <Overlay::Header @title={{if this.serviceRate.id this.serviceRate.service_name "New service rate"}} @status={{this.serviceRate.public_id}} @hideStatusDot={{true}} @createdAt={{this.serviceRate.createdAt}} @onPressCancel={{this.transitionBack}}>
+    <Overlay::Header @title={{if this.serviceRate.id this.serviceRate.service_name (t "fleet-ops.operations.service-rates.index.new.new-service-rate-title")}} @status={{this.serviceRate.public_id}} @hideStatusDot={{true}} @createdAt={{this.serviceRate.createdAt}} @onPressCancel={{this.transitionBack}}>
         {{#if this.serviceRate.id}}
-            <Button @icon="save" @type="primary" @text="Save Service Rate" @onClick={{this.updateServiceRate}} @isLoading={{this.isUpdatingServiceRate}} />
+            <Button @icon="save" @type="primary" @text={{t "fleet-ops.operations.service-rates.index.new.save-service-button"}} @onClick={{this.updateServiceRate}} @isLoading={{this.isUpdatingServiceRate}} />
         {{else}}
-            <Button @icon="check" @type="primary" @text="Create Service Rate" @onClick={{this.createServiceRate}} @isLoading={{this.isCreatingServiceRate}} />
+            <Button @icon="check" @type="primary" @text={{t "fleet-ops.operations.service-rates.index.new.create-service-button"}} @onClick={{this.createServiceRate}} @isLoading={{this.isCreatingServiceRate}} />
         {{/if}}
     </Overlay::Header>
 
@@ -11,48 +11,48 @@
         <div>
             <div class="grid grid-cols-2 gap-2">
                 <div class="input-group">
-                    <InputLabel @labelText="Service Name" @helpText="Display name for this service." @required={{true}} />
-                    <Input @type="text" @value={{this.serviceRate.service_name}} placeholder="Service Name" class="form-input w-full" />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.service-name"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.service-name-help-text"}} @required={{true}} />
+                    <Input @type="text" @value={{this.serviceRate.service_name}} placeholder={{t "fleet-ops.operations.service-rates.index.new.service-name"}} class="form-input w-full" />
                 </div>
 
                 <div class="input-group">
-                    <InputLabel @labelText="Service Order Type" @helpText="Restrict this service rate to an explicit `order type`." />
-                    <Select class="w-full" @options={{this.serviceTypes}} @value={{this.serviceRate.service_type}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.service_type)}} @placeholder="Select order type to restrict service to" />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.service-order-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.service-order-help-text"}} />
+                    <Select class="w-full" @options={{this.serviceTypes}} @value={{this.serviceRate.service_type}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.service_type)}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.service-order-placeholder"}} />
                 </div>
 
                 <div class="input-group">
-                    <InputLabel @labelText="Base Fee" @helpText="Set a base fee which represents the minimum cost for this serice." @required={{true}} />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.base-fee-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.base-fee-help-text"}} @required={{true}} />
                     <MoneyInput class="w-full" @value={{this.serviceRate.base_fee}} @currency={{this.serviceRate.currency}} @canSelectCurrency={{true}} @onCurrencyChange={{fn (mut this.serviceRate.currency)}} />
                 </div>
 
                 <div class="input-group">
-                    <InputLabel @labelText="Rate Calculation Method" @helpText="The method this service will use to calculate rates when queried." @required={{true}} />
-                    <Select class="w-full" @options={{this.calculationMethods}} @value={{this.serviceRate.rate_calculation_method}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.rate_calculation_method)}} @placeholder="Select rate calculation method" />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.rate-calculation-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.rate-calculation-help-text"}} @required={{true}} />
+                    <Select class="w-full" @options={{this.calculationMethods}} @value={{this.serviceRate.rate_calculation_method}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.rate_calculation_method)}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.rate-calculation-placeholder"}} />
                 </div>
             </div>
         </div>
 
         {{#if this.serviceRate.isParcelService}}
             <div class="input-group">
-                <InputLabel @labelText="Estimated Delivery Days" @helpText="The estimated number of days this service will take. For a same-day service use `0`." @required={{true}} />
+                <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.estimated-days"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.estimated-days-help-text"}} @required={{true}} />
 
-                <Input @type="number" @value={{this.serviceRate.estimated_days}} placeholder="Estimated Delivery Days" class="form-input w-full" />
+                <Input @type="number" @value={{this.serviceRate.estimated_days}} placeholder={{t "fleet-ops.operations.service-rates.index.new.estimated-days"}} class="form-input w-full" />
             </div>
         {{/if}}
 
         <div class="input-group col-span-2">
-            <InputLabel @labelText="Duration Terms" @helpText="Add additional terms of service regarding duration for this serice rate." />
+            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.duration-terms-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.duration-terms-help-text"}} />
 
-            <Input @type="text" @value={{this.serviceRate.duration_terms}} placeholder="Duration terms if applicable" class="form-input w-full" />
+            <Input @type="text" @value={{this.serviceRate.duration_terms}} placeholder={{t "fleet-ops.operations.service-rates.index.new.duration-terms-placeholder"}} class="form-input w-full" />
         </div>
 
         {{#if this.serviceRate.isFixedMeter}}
-            <ContentPanel @title="Fixed Meter Options" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-                <InfoBlock class="mb-5" @text="This option defines a fixed fee per kilometer." @exampleText="For example: Every 1 kilometer a fixed fee is defined. If the distance traveled by the order is 3,300 meters the fixed fee for the 3rd kilometer will be added to the sum of the base fee." />
+            <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.fixed-meter"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+                <InfoBlock class="mb-5" @text={{t "fleet-ops.operations.service-rates.index.new.fixed-meter-text"}} @exampleText={{t "fleet-ops.operations.service-rates.index.new.fixed-meter-example-text"}} />
 
                 <div class="input-group">
-                    <InputLabel @labelText="Maximum Distance" @helpText="The maximum distance servicable." @required={{true}} />
-                    <Input @type="number" @value={{this.fixedMeterMaxDistance}} placeholder="Maximum Distance" class="form-input w-full" />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.maximum-distance"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.maximum-distance-help-text"}} @required={{true}} />
+                    <Input @type="number" @value={{this.fixedMeterMaxDistance}} placeholder={{t "fleet-ops.operations.service-rates.index.new.maximum-distance"}} class="form-input w-full" />
                 </div>
 
                 <div class="table-scrolling-height overflow-y-scroll">
@@ -60,8 +60,8 @@
                         <table class="table table-fixed">
                             <thead>
                                 <tr>
-                                    <th>Distance</th>
-                                    <th>Fee</th>
+                                    <th>{{t "fleet-ops.operations.service-rates.index.new.distance"}}</th>
+                                    <th>{{t "fleet-ops.operations.service-rates.index.new.fee"}}</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -80,20 +80,20 @@
                 </div>
             </ContentPanel>
         {{else if this.serviceRate.isPerDrop}}
-            <ContentPanel @title="Per Drop-off Options" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-                <InfoBlock class="mb-5" @text="This option defines a fixed fee per drop-offs." @exampleText="For example: 1-5 dropoffs in the order will cost $x amount, 5-10 dropoffs per order will cost $x amount. This will be added to the sum of the base fee." />
+            <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.per-drop-off-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+                <InfoBlock class="mb-5" @text={{t "fleet-ops.operations.service-rates.index.new.per-drop-off-text"}} @exampleText={{t "fleet-ops.operations.service-rates.index.new.per-drop-off-example-text"}} />
 
                 <div class="input-group">
-                    <Button @text="Add drop-off range" @icon="plus" @iconPrefix="fas" @onClick={{this.addPerDropoffRateFee}} />
+                    <Button @text={{t "fleet-ops.operations.service-rates.index.new.add-drop-off-button"}} @icon="plus" @iconPrefix="fas" @onClick={{this.addPerDropoffRateFee}} />
                 </div>
 
                 <div class="table-wrapper table-fluid rounded-none">
                     <table class="table table-fixed">
                         <thead>
                             <tr>
-                                <th>Min Drop</th>
-                                <th>Max Drop</th>
-                                <th>Fee</th>
+                                <th>{{t "fleet-ops.operations.service-rates.index.new.min-drop"}}</th>
+                                <th>{{t "fleet-ops.operations.service-rates.index.new.max-drop"}}</th>
+                                <th>{{t "fleet-ops.operations.service-rates.index.new.fee"}}</th>
                                 <th></th>
                             </tr>
                         </thead>
@@ -101,16 +101,16 @@
                             {{#each this.perDropRateFees as |rateFee index|}}
                                 <tr>
                                     <td>
-                                        <Input @type="number" @value={{rateFee.min}} placeholder="Min" class="form-input w-16" />
+                                        <Input @type="number" @value={{rateFee.min}} placeholder={{t "fleet-ops.operations.service-rates.index.new.min"}} class="form-input w-16" />
                                     </td>
                                     <td>
-                                        <Input @type="number" @value={{rateFee.max}} placeholder="Max" class="form-input w-16" />
+                                        <Input @type="number" @value={{rateFee.max}} placeholder={{t "fleet-ops.operations.service-rates.index.new.max"}} class="form-input w-16" />
                                     </td>
                                     <td>
                                         <MoneyInput class="w-full" @currency={{this.serviceRate.currency}} @value={{rateFee.fee}} />
                                     </td>
                                     <td>
-                                        <a href="javascript:;" class="text-danger text-red-500 font-semibold" {{on "click" (fn this.removePerDropoffRateFee index)}}>Remove</a>
+                                        <a href="javascript:;" class="text-danger text-red-500 font-semibold" {{on "click" (fn this.removePerDropoffRateFee index)}}>{{t "fleet-ops.common.remove"}}</a>
                                     </td>
                                 </tr>
                             {{/each}}
@@ -119,18 +119,18 @@
                 </div>
             </ContentPanel>
         {{else if this.serviceRate.isPerMeter}}
-            <ContentPanel @title="Per Meter" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-                <InfoBlock class="mb-5" @text="This option allows the service to be calculated per kilometer or meter, that means you define a flat fee which is then multiplied by the distance which can be either meter or kilometer." @exampleText="For example: {fee} * {distance} + {baseFee}" />
+            <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.per-meter"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+                <InfoBlock class="mb-5" @text={{t "fleet-ops.operations.service-rates.index.new.per-meter-text"}} @exampleText={{t "fleet-ops.operations.service-rates.index.new.per-meter-example-text"}} />
 
                 <div class="grid grid-cols-2 gap-2">
                     <div class="input-group">
-                        <InputLabel @labelText="Per Meter Flat Rate Fee" @helpText="The single flat fee which will be multipled by the distance." @required={{true}} />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.per-meter-rate-fee"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.per-meter-rate-fee-help-text"}} @required={{true}} />
                         <MoneyInput class="w-full" @currency={{this.serviceRate.currency}} @value={{this.serviceRate.per_meter_flat_rate_fee}} />
                     </div>
 
                     <div class="input-group">
-                        <InputLabel @labelText="Distance Unit" @helpText="The unit of distance can be either per kilometer or meter." @required={{true}} />
-                        <Select class="w-full" @options={{this.distanceUnits}} @value={{this.serviceRate.per_meter_unit}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.per_meter_unit)}} placeholder="Select distance unit." />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.distance-unit"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.distance-unit-help-text"}} @required={{true}} />
+                        <Select class="w-full" @options={{this.distanceUnits}} @value={{this.serviceRate.per_meter_unit}} @optionLabel="name" @optionValue="key" @onSelect={{fn (mut this.serviceRate.per_meter_unit)}} placeholder={{t "fleet-ops.operations.service-rates.index.new.distance-unit-placeholder"}} />
                     </div>
 
                     <div class="col-span-2">
@@ -141,39 +141,37 @@
                 </div>
             </ContentPanel>
         {{else if this.serviceRate.isAlgorithm}}
-            <ContentPanel @title="Custom Algorithm" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.custom-algorithm-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <InfoBlock class="mb-5">
-                    This option is to define a custom calculation for this service's fee with variables.
-                    Note that variables must be wrapped in a single curly brace.
+                    {{t "fleet-ops.operations.service-rates.index.new.custom-algorithm-info-message"}}
+                    {{t "fleet-ops.operations.service-rates.index.new.custom-algorithm-info-second-message"}}
 
                     <div class="block my-4 break-text">
                         <ul class="list-disc space-y-2 pl-16">
-                            <li class="leading-5"><i>distance</i> - the distance in meters from the order
-                                route.</li>
-                            <li class="leading-5"><i>time</i> - the route ETA in seconds.</li>
+                            <li class="leading-5"><i>{{t "fleet-ops.operations.service-rates.index.new.distance-message"}}</i> {{t "fleet-ops.operations.service-rates.index.new.distance-continue-message"}}</li>
+                            <li class="leading-5"><i>{{t "fleet-ops.operations.service-rates.index.new.time-message"}}</i> {{t "fleet-ops.operations.service-rates.index.new.time-continue-message"}}</li>
                         </ul>
                     </div>
 
                     <div>
-                        <h4 class="mb-1 text-sm font-semibold">Example</h4>
+                        <h4 class="mb-1 text-sm font-semibold">{{t "fleet-ops.operations.service-rates.index.new.example"}}</h4>
                         <div class="mb-3 text-inherit">
-                            If the order request is a distance of 2,200 meters with an ETA of 30 minutes.
-                            Then the following formula will calculate a service fee of $2.50, which will be
-                            added to the base fee.
+                            {{t "fleet-ops.operations.service-rates.index.new.example-message"}}
+                            {{t "fleet-ops.operations.service-rates.index.new.example-second-message"}}
                         </div>
                         <code class="text-xs font-mono">(( {distance} / 50 ) * .05 ) + (( {time} / 60 ) * .01)</code>
                     </div>
                 </InfoBlock>
 
                 <div class="input-group">
-                    <InputLabel @labelText="Algorithm" @helpText="Define a formula to be evaluated for this service rate calculation." @required={{true}} />
-                    <Input @type="tel" @value={{this.serviceRate.algorithm}} placeholder="(( {distance} / 50 ) * .05 ) + (( {time} / 60 ) * .01)" class="form-input w-full" />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.algorithm-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.algorithm-help-text"}} @required={{true}} />
+                    <Input @type="tel" @value={{this.serviceRate.algorithm}} placeholder={{t "fleet-ops.operations.service-rates.index.new.algorithm-placeholder"}} class="form-input w-full" />
                 </div>
             </ContentPanel>
         {{/if}}
 
         {{#if this.serviceRate.isParcelService}}
-            <ContentPanel @title="Parcel Fee's" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.percel-fee-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
                 <div class="space-y-2">
                     {{#each this.parcelFees as |parcelFee|}}
                         <div class="dark:text-gray-100">
@@ -185,38 +183,38 @@
                                 <div class="col-span-6 dimensions-box">
                                     <div class="grid grid-cols-4 gap-2 px-2 mb-2">
                                         <div class="input-group">
-                                            <InputLabel @labelText="Length" />
-                                            <Input @type="tel" @value={{parcelFee.length}} placeholder="Length in {{parcelFee.dimension_unit}}" class="form-input w-4/5" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.length-label"}} />
+                                            <Input @type="tel" @value={{parcelFee.length}} placeholder={{t "fleet-ops.operations.service-rates.index.new.length-placeholder" htmlSafe=true parcelFeeDimension=@parcelFee.dimension_unit}} class="form-input w-4/5" />
                                         </div>
 
                                         <div class="input-group">
-                                            <InputLabel @labelText="Width" />
-                                            <Input @type="tel" @value={{parcelFee.width}} placeholder="Width in {{parcelFee.dimension_unit}}" class="form-input w-4/5" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.width-label"}} />
+                                            <Input @type="tel" @value={{parcelFee.width}} placeholder={{t "fleet-ops.operations.service-rates.index.new.width-placeholder" htmlSafe=true parcelFeeDimension=@parcelFee.dimension_unit }} class="form-input w-4/5" />
                                         </div>
 
                                         <div class="input-group">
-                                            <InputLabel @labelText="Height" />
-                                            <Input @type="tel" @value={{parcelFee.height}} placeholder="Height in {{parcelFee.dimension_unit}}" class="form-input w-4/5" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.height-label"}} />
+                                            <Input @type="tel" @value={{parcelFee.height}} placeholder={{t "fleet-ops.operations.service-rates.index.new.height-placeholder" htmlSafe=true parcelFeeDimension=@parcelFee.dimension_unit }} class="form-input w-4/5" />
                                         </div>
 
                                         <div class="input-group">
-                                            <InputLabel @labelText="Weight" />
-                                            <Input @type="tel" @value={{parcelFee.weight}} placeholder="Weight in {{parcelFee.weight_unit}}" class="form-input w-4/5" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.weight-label"}} />
+                                            <Input @type="tel" @value={{parcelFee.weight}} placeholder={{t "fleet-ops.operations.service-rates.index.new.weight-label" htmlSafe=true parcelFeeWeight=@parcelFee.weight_unit }} class="form-input w-4/5" />
                                         </div>
                                     </div>
                                     <div class="grid grid-cols-3 gap-2 px-2">
                                         <div class="input-group">
-                                            <InputLabel @labelText="Dimensions Unit" />
-                                            <Select class="w-full" @options={{this.dimensionUnits}} @value={{parcelFee.dimension_unit}} placeholder="Select unit" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.deminsions-unit"}} />
+                                            <Select class="w-full" @options={{this.dimensionUnits}} @value={{parcelFee.dimension_unit}} placeholder={{t "fleet-ops.operations.service-rates.index.new.select-unit-placeholder"}} />
                                         </div>
 
                                         <div class="input-group">
-                                            <InputLabel @labelText="Weight Unit" />
-                                            <Select class="w-full" @options={{this.weightUnits}} @value={{parcelFee.weight_unit}} placeholder="Select unit" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.weight-unit"}} />
+                                            <Select class="w-full" @options={{this.weightUnits}} @value={{parcelFee.weight_unit}} placeholder={{t "fleet-ops.operations.service-rates.index.new.select-unit-placeholder"}} />
                                         </div>
 
                                         <div class="input-group">
-                                            <InputLabel @labelText="Additional Fee" />
+                                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.additional-fee"}} />
                                             <MoneyInput class="w-full" @currency={{this.serviceRate.currency}} @value={{parcelFee.fee}} />
                                         </div>
                                     </div>
@@ -228,79 +226,79 @@
             </ContentPanel>
         {{/if}}
 
-        <ContentPanel @title="Cash on Delivery" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-            <Toggle @wrapperClass="justify-start-i mb-5" @label="Enable additional fee for `cash on delivery` orders?" @isToggled={{this.serviceRate.has_cod_fee}} @onToggle={{fn (mut this.serviceRate.has_cod_fee)}} />
+        <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.cash-delivery-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <Toggle @wrapperClass="justify-start-i mb-5" @label={{t "fleet-ops.operations.service-rates.index.new.cash-delivery-label"}} @isToggled={{this.serviceRate.has_cod_fee}} @onToggle={{fn (mut this.serviceRate.has_cod_fee)}} />
 
             {{#if this.serviceRate.has_cod_fee}}
                 <div class="grid grid-cols-2 gap-2">
                     <div class="input-group">
-                        <InputLabel @labelText="Cash on Delivery Fee Calculation Method" @helpText="Method used to calculate the COD fee." @required={{true}} />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.calculation-method-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.calculation-method-help-text"}} @required={{true}} />
                         <Select class="w-full" @options={{this.codCalculationMethods}} @optionLabel="name" @optionValue="key" @value={{this.serviceRate.cod_calculation_method}} @onSelect={{fn (mut
-                                                            this.serviceRate.cod_calculation_method)}} @placeholder="Select COD fee calculation method" />
+                                                            this.serviceRate.cod_calculation_method)}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.calculation-method-placeholder"}} />
                     </div>
 
                     {{#if this.serviceRate.hasCodFlatFee}}
                         <div class="input-group">
-                            <InputLabel @labelText="Cash on Delivery Flat Fee" @helpText="Defines a flat fee to be added during peak hours." @required={{true}} />
+                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.delivery-flat-fee"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.delivery-flat-fee-help-text"}} @required={{true}} />
                             <MoneyInput class="w-full" @currency={{this.serviceRate.currency}} @value={{this.serviceRate.cod_flat_fee}} />
                         </div>
                     {{else if  this.serviceRate.hasCodPercentageFee}}
                         <div class="input-group">
-                            <InputLabel @labelText="Cash on Delivery Fee Percentage" @helpText="Defines a percentage based fee from the service rate subtotal to be added as the COD fee." @required={{true}} />
-                            <Input @type="number" min="0" max="100" @value={{this.serviceRate.cod_percent}} placeholder="Percentage" class="form-input w-full" />
+                            <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.fee-percentage"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.fee-percentage-help-text"}} @required={{true}} />
+                            <Input @type="number" min="0" max="100" @value={{this.serviceRate.cod_percent}} placeholder={{t "fleet-ops.operations.service-rates.index.new.percentage-placeholder"}} class="form-input w-full" />
                         </div>
                     {{/if}}
                 </div>
             {{/if}}
         </ContentPanel>
 
-        <ContentPanel @title="Peak Hours" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
-            <Toggle @wrapperClass="justify-start-i mb-5" @label="Enable additional fee for order made during service defined `peak hours`?" @isToggled={{this.serviceRate.has_peak_hours_fee}} @onToggle={{fn (mut this.serviceRate.has_peak_hours_fee)}} />
+        <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.peak-hours-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+            <Toggle @wrapperClass="justify-start-i mb-5" @label={{t "fleet-ops.operations.service-rates.index.new.peak-hours-label"}} @isToggled={{this.serviceRate.has_peak_hours_fee}} @onToggle={{fn (mut this.serviceRate.has_peak_hours_fee)}} />
 
             {{#if this.serviceRate.has_peak_hours_fee}}
                 <div class="grid grid-cols-2 gap-2">
                     <div class="input-group">
-                        <InputLabel @labelText="Peak Hours Start" @helpText="Defines the what time the peak hour fee starts." @required={{true}} />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-start-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-start-help-text"}} @required={{true}} />
 
                         <Input @type="time" @value={{this.serviceRate.peak_hours_start}} class="form-input w-full" />
                     </div>
 
                     <div class="input-group">
-                        <InputLabel @labelText="Peak Hours End" @helpText="Defines the what time the peak hour fee ends." @required={{true}} />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-end-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-end-help-text"}} @required={{true}} />
 
                         <Input @type="time" @value={{this.serviceRate.peak_hours_end}} class="form-input w-full" />
                     </div>
                 </div>
 
                 <div class="input-group">
-                    <InputLabel @labelText="Peak Hours Fee Calculation Method" @helpText="Method used to calculate the peak hours fee." @required={{true}} />
-                    <Select class="w-full" @options={{this.peakHourCalculationMethods}} @optionLabel="name" @optionValue="key" @value={{this.serviceRate.peak_hours_calculation_method}} @onSelect={{fn (mut this.serviceRate.peak_hours_calculation_method)}} @placeholder="Select peak hours fee calculation method" />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-fee-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-fee-help-text"}} @required={{true}} />
+                    <Select class="w-full" @options={{this.peakHourCalculationMethods}} @optionLabel="name" @optionValue="key" @value={{this.serviceRate.peak_hours_calculation_method}} @onSelect={{fn (mut this.serviceRate.peak_hours_calculation_method)}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.peak-hours-fee-placeholder"}} />
                 </div>
 
                 {{#if this.serviceRate.hasPeakHoursFlatFee}}
                     <div class="input-group">
-                        <InputLabel @labelText="Peak Hours Flat Fee" @helpText="Defines a flat fee to be added during peak hours." @required={{true}} />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.flat-fee-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.flat-fee-help-text"}} @required={{true}} />
                         <MoneyInput class="w-full" @currency={{this.serviceRate.currency}} @value={{this.serviceRate.peak_hours_flat_fee}} />
                     </div>
                 {{else if this.serviceRate.hasPeakHoursPercentageFee}}
                     <div class="input-group">
-                        <InputLabel @labelText="Peak Hours Fee Percentage" @helpText="Defines a percentage based fee from the service rate subtotal to be added during peak hours." @required={{true}} />
-                        <Input @type="number" min="0" max="100" @value={{this.serviceRate.peak_hours_percent}} placeholder="Percentage" class="form-input w-full" />
+                        <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-percentage-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.peak-hours-percentage-help-text"}} @required={{true}} />
+                        <Input @type="number" min="0" max="100" @value={{this.serviceRate.peak_hours_percent}} placeholder={{t "fleet-ops.operations.service-rates.index.new.percentage-placeholder"}} class="form-input w-full" />
                     </div>
                 {{/if}}
             {{/if}}
         </ContentPanel>
 
-        <ContentPanel @title="Restrict Service" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
+        <ContentPanel @title={{t "fleet-ops.operations.service-rates.index.new.restrict-service-title"}} @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
             <div class="input-group">
-                <InputLabel @labelText="Service Area" @helpText="Restrict this service to order request originating from a service area." />
-                <Select class="w-full" @options={{this.serviceAreas}} @optionLabel="name" @optionValue="id" @value={{this.serviceRate.service_area_uuid}} @onSelect={{this.selectServiceArea}} @placeholder="Restrict to service area" @disabled={{not this.serviceAreas.length}} />
+                <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.service-area-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.service-area-help-text"}} />
+                <Select class="w-full" @options={{this.serviceAreas}} @optionLabel="name" @optionValue="id" @value={{this.serviceRate.service_area_uuid}} @onSelect={{this.selectServiceArea}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.service-area-placeholder"}} @disabled={{not this.serviceAreas.length}} />
             </div>
 
             {{#if this.serviceRate.service_area_uuid}}
                 <div class="input-group">
-                    <InputLabel @labelText="Zone" @helpText="Restrict this service to order request originating from a specific zone." />
-                    <Select class="w-full" @options={{this.zones}} @optionLabel="name" @optionValue="id" @value={{this.serviceRate.zone_uuid}} @onSelect={{fn (mut this.serviceRate.zone_uuid)}} @placeholder="Restrict to zone" @disabled={{not this.zones.length}} />
+                    <InputLabel @labelText={{t "fleet-ops.operations.service-rates.index.new.zone-label"}} @helpText={{t "fleet-ops.operations.service-rates.index.new.zone-help-text"}} />
+                    <Select class="w-full" @options={{this.zones}} @optionLabel="name" @optionValue="id" @value={{this.serviceRate.zone_uuid}} @onSelect={{fn (mut this.serviceRate.zone_uuid)}} @placeholder={{t "fleet-ops.operations.service-rates.index.new.zone-placeholder"}} @disabled={{not this.zones.length}} />
                 </div>
             {{/if}}
         </ContentPanel>

package/addon/templates/operations/service-rates/index.hbs

@@ -1,5 +1,5 @@
-<Layout::Section::Header @title="Service Rates" @searchQuery={{this.query}} @onSearch={{perform this.search}}>
-    <Button @icon="refresh" @onClick={{this.reload}} @helpText="Reload data" class="mr-2" />
+<Layout::Section::Header @title={{t "fleet-ops.operations.service-rates.index.title"}} @searchQuery={{this.query}} @onSearch={{perform this.search}}>
+    <Button @icon="refresh" @onClick={{this.reload}} @helpText={{t "fleet-ops.operations.service-rates.index.reload-data"}} class="mr-2" />
     <FiltersPicker
         @columns={{this.columns}}
         @onApply={{fn this.filters.apply this}}
@@ -10,18 +10,18 @@
     />
     <VisibleColumnPicker @columns={{this.columns}} @onChange={{fn (mut this.columns)}} class="mr-2" />
     {{#if (safe-has this.table "selectedRows")}}
-        <DropdownButton @icon="layer-group" @text="Bulk Action" @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
+        <DropdownButton @icon="layer-group" @text={{t "fleet-ops.common.bulk-action"}} @type="magic" @size="sm" @buttonWrapperClass="mr-2" @contentClass="dropdown-menu" as |dd|>
             <div class="next-dd-menu mt-2 mx-0">
                 <div class="px-1">
                     <a href="#" class="text-red-500 next-dd-item" {{on "click" (dropdown-fn dd this.bulkDeleteServiceRates this.selectedServiceRates)}}>
-                        Delete Service Rates
+                        {{t "fleet-ops.operations.service-rates.index.delete-service-rates"}}
                     </a>
                 </div>
             </div>
         </DropdownButton>
     {{/if}}
-    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text="New" class="mr-2" @onClick={{transition-to "operations.service-rates.index.new"}} />
-    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text="Export" />
+    <Button @icon="plus" @iconPrefix="fas" @type="primary" @text={{t "fleet-ops.common.new"}} class="mr-2" @onClick={{transition-to "operations.service-rates.index.new"}} />
+    <Button @icon="long-arrow-up" @iconClass="rotate-icon-45" @text={{t "fleet-ops.common.export"}} />
 </Layout::Section::Header>
 
 <Layout::Section::Body>

package/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "fleetbase/fleetops-api",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "keywords": [
         "fleetbase-extension",
@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "fleetbase/core-api": "^1.3.10",
+        "fleetbase/core-api": "^1.3.12",
         "barryvdh/laravel-dompdf": "^2.0",
         "brick/geo": "0.7.2",
         "cknow/laravel-money": "^7.1",

package/extension.json

@@ -1,6 +1,6 @@
 {
     "name": "Fleet-Ops",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "repository": "https://github.com/fleetbase/fleetops",
     "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fleetbase/fleetops-engine",
-    "version": "0.4.0",
+    "version": "0.4.1",
     "description": "Fleet & Transport Management Extension for Fleetbase",
     "fleetbase": {
         "route": "fleet-ops",
@@ -33,6 +33,7 @@
         "lint:hbs:fix": "ember-template-lint . --fix",
         "lint:js": "eslint . --cache",
         "lint:js:fix": "eslint . --fix",
+        "lint:intl": "fleetbase-intl-lint",
         "start": "ember serve",
         "test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
         "test:ember": "ember test",
@@ -68,6 +69,7 @@
         "leaflet-rotatedmarker": "^0.2.0"
     },
     "devDependencies": {
+        "@fleetbase/intl-lint": "^0.0.1",
         "@babel/eslint-parser": "^7.22.15",
         "@babel/plugin-proposal-decorators": "^7.23.2",
         "@ember/optional-features": "^2.0.0",

package/server/resources/views/labels/default.php

@@ -1,6 +1,6 @@
 <?php
 
-use Fleetbase\Models\Order;
+use Fleetbase\Fleetops\Models\Order;
 use Fleetbase\Support\Utils; ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -43,32 +43,33 @@ use Fleetbase\Support\Utils; ?>
 
 <body bgcolor="#f7f7f7">
 	<div style="width: 420px; border: 2px #414141 solid; margin: auto;">
-		<div class="group" style="border-bottom: 1px #414141 solid;">
-			<div style="float:left; display:inline-block; width: 100px; height: 90px; border-right: 1px #414141 solid; text-align: center; padding: 10px;">
-				<img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code ?>" style="width: 100%; height: 90px;">
+		<div class="group" style="border-bottom: 1px #414141 solid; overflow: hidden;">
+			<div style="float: left; width: 130px; height: 120px; border-right: 1px #414141 solid; text-align: center; padding: 10px; box-sizing: border-box;">
+				<img src="data:image/png;base64,<?= Utils::notEmpty($trackingNumber) ? $trackingNumber->qr_code : $order->trackingNumber->qr_code ?>" style="width: 100%; height: 100%; object-fit: cover;">
 			</div>
-			<div style="display: inline-block; height: 90px;">
-				<div style="padding: 10px; font-size: 20px;">
-					<span style="display: block; margin-top: 15px;"><?= $company->name ?></span>
-					<span style="display: block;">
-						<?php
-						if ($order && $order instanceof Order) {
-							$order->load('purchaseRate.serviceQuote.serviceRate');
-							if (isset($order->purchaseRate->serviceQuote->serviceRate)) {
-								echo strtoupper($order->purchaseRate->serviceQuote->serviceRate->name);
-							}
+			<div style="margin-top: 10px; padding-left: 10px;">
+				<div style="font-size: 18px; font-weight: bold;"><?= strtoupper($company->name) ?></div>
+				<div style="font-size: 16px; font-weight: 300; color: #000;">
+					<?php
+					if ($order && $order instanceof Order) {
+						$order->load('purchaseRate.serviceQuote.serviceRate');
+						$serviceName = data_get($order, 'purchaseRate.serviceQuote.serviceRate.service_name');
+						if ($serviceName) {
+							echo strtoupper($serviceName);
 						}
-						?>
-					</span>
+					}
+					?>
 				</div>
 			</div>
 		</div>
+
 		<?php
 		// load payload locations
 		if ($order) {
-			$order->load('payload.pickup', 'payload.dropoff');
+			$order->load('payload.pickup', 'payload.dropoff', 'payload.entities');
 			$pickup = $pickup ?? $order->payload->pickup;
 			$dropoff = $dropoff ?? $order->payload->dropoff;
+			$entities = $entities ?? ($order->payload['entities'] ?? []);
 		}
 		?>
 		<?php if ($pickup) { ?>
@@ -114,7 +115,7 @@ use Fleetbase\Support\Utils; ?>
 		<?php } ?>
 		<?php if ($dropoff) { ?>
 			<div class="group">
-				<div style="padding: 15px;" class="group">
+				<div style="padding: 15px;" class="group" style="border-bottom: 1px #414141 solid; padding: 15px;">
 					<div style="float: left; display: inline-block; margin-right: 15px; font-weight: bold;">
 						DROPOFF:
 					</div>
@@ -153,6 +154,27 @@ use Fleetbase\Support\Utils; ?>
 				</div>
 			</div>
 		<?php } ?>
+		<?php if ($entities) { ?>
+			<div class="group">
+				<div style="padding: 15px;" class="group" style="border-bottom: 1px #414141 solid; padding: 15px;">
+					<div style="float: left; display: inline-block; margin-right: 15px">
+						<?php foreach ($entities as $entity) { ?>
+							<div class="line">
+								<strong>
+									<?php
+									if (isset($entity['name']) && !empty($entity['name'])) {
+										echo strtoupper($entity['name']) . ' - ' . ($entity['internal_id'] ?? '');
+									} else {
+										echo 'ITEM -' . ($entity['internal_id'] ?? '');
+									}
+									?>
+								</strong>
+							</div>
+						<?php } ?>
+					</div>
+				</div>
+			</div>
+		<?php } ?>
 		<div class="group">
 			<div style="text-align: center; padding: 15px 0px; border-top: 1px #414141 solid;">
 				<img src="data:image/png;base64,<?= isset($trackingNumber) ? $trackingNumber->barcode : $order->trackingNumber->barcode ?>" style="height: 90px; margin-top: 10px;">