lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add cashOut attribute to machines API

Browse source
This commit is contained in:
Josh Harvey 2017-05-16 15:10:47 +03:00
parent db97533d5c
commit 87a4236313
3 changed files with 109 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/machine-loader.js
View file

@ -28,8 +28,11 @@ function getMachineNames (config) {
return Promise.all([getMachines(), getConfig(config)]) return Promise.all([getMachines(), getConfig(config)])
.then(([machines, config]) => { .then(([machines, config]) => {
const addName = r => { const addName = r => {
const name = configManager.machineScoped(r.deviceId, config).machineName const machineScoped = configManager.machineScoped(r.deviceId, config)
return _.set('name', name, r) const name = machineScoped.machineName
const cashOut = machineScoped.cashOutEnabled
return _.assign(r, {name, cashOut})
} }
return _.map(addName, machines) return _.map(addName, machines)

214
public/elm.js
View file

@ -27493,6 +27493,7 @@ var _user$project$Css_Classes$InvalidComponent = {ctor: 'InvalidComponent'};
var _user$project$Css_Classes$FocusedComponent = {ctor: 'FocusedComponent'}; var _user$project$Css_Classes$FocusedComponent = {ctor: 'FocusedComponent'};
var _user$project$Css_Classes$Component = {ctor: 'Component'}; var _user$project$Css_Classes$Component = {ctor: 'Component'};
var _user$project$Css_Classes$NoInput = {ctor: 'NoInput'}; var _user$project$Css_Classes$NoInput = {ctor: 'NoInput'};
var _user$project$Css_Classes$CellDisabled = {ctor: 'CellDisabled'};
var _user$project$Css_Classes$BasicInputReadOnly = {ctor: 'BasicInputReadOnly'}; var _user$project$Css_Classes$BasicInputReadOnly = {ctor: 'BasicInputReadOnly'};
var _user$project$Css_Classes$BasicInputDisabled = {ctor: 'BasicInputDisabled'}; var _user$project$Css_Classes$BasicInputDisabled = {ctor: 'BasicInputDisabled'};
var _user$project$Css_Classes$BasicInput = {ctor: 'BasicInput'}; var _user$project$Css_Classes$BasicInput = {ctor: 'BasicInput'};
@ -32729,9 +32730,9 @@ var _user$project$Maintenance_Types$SubModel = F2(
function (a, b) { function (a, b) {
return {status: a, machines: b}; return {status: a, machines: b};
}); });
var _user$project$Maintenance_Types$Machine = F6( var _user$project$Maintenance_Types$Machine = F7(
function (a, b, c, d, e, f) { function (a, b, c, d, e, f, g) {
return {deviceId: a, name: b, cashbox: c, cassette1: d, cassette2: e, paired: f}; return {deviceId: a, name: b, cashbox: c, cassette1: d, cassette2: e, paired: f, cashOut: g};
}); });
var _user$project$Maintenance_Types$NotSaving = {ctor: 'NotSaving'}; var _user$project$Maintenance_Types$NotSaving = {ctor: 'NotSaving'};
var _user$project$Maintenance_Types$Editing = {ctor: 'Editing'}; var _user$project$Maintenance_Types$Editing = {ctor: 'Editing'};
@ -34117,15 +34118,16 @@ var _user$project$Maintenance_Rest$encodeAction = function (action) {
}); });
} }
}; };
var _user$project$Maintenance_Rest$machineDecoder = A7( var _user$project$Maintenance_Rest$machineDecoder = A8(
_elm_lang$core$Json_Decode$map6, _elm_lang$core$Json_Decode$map7,
_user$project$Maintenance_Types$Machine, _user$project$Maintenance_Types$Machine,
A2(_elm_lang$core$Json_Decode$field, 'deviceId', _elm_lang$core$Json_Decode$string), A2(_elm_lang$core$Json_Decode$field, 'deviceId', _elm_lang$core$Json_Decode$string),
A2(_elm_lang$core$Json_Decode$field, 'name', _elm_lang$core$Json_Decode$string), A2(_elm_lang$core$Json_Decode$field, 'name', _elm_lang$core$Json_Decode$string),
A2(_elm_lang$core$Json_Decode$field, 'cashbox', _elm_lang$core$Json_Decode$int), A2(_elm_lang$core$Json_Decode$field, 'cashbox', _elm_lang$core$Json_Decode$int),
A2(_elm_lang$core$Json_Decode$field, 'cassette1', _elm_lang$core$Json_Decode$int), A2(_elm_lang$core$Json_Decode$field, 'cassette1', _elm_lang$core$Json_Decode$int),
A2(_elm_lang$core$Json_Decode$field, 'cassette2', _elm_lang$core$Json_Decode$int), A2(_elm_lang$core$Json_Decode$field, 'cassette2', _elm_lang$core$Json_Decode$int),
A2(_elm_lang$core$Json_Decode$field, 'paired', _elm_lang$core$Json_Decode$bool)); A2(_elm_lang$core$Json_Decode$field, 'paired', _elm_lang$core$Json_Decode$bool),
A2(_elm_lang$core$Json_Decode$field, 'cashOut', _elm_lang$core$Json_Decode$bool));
var _user$project$Maintenance_Rest$machinesDecoder = A2( var _user$project$Maintenance_Rest$machinesDecoder = A2(
_elm_lang$core$Json_Decode$map, _elm_lang$core$Json_Decode$map,
_elm_lang$core$Basics$identity, _elm_lang$core$Basics$identity,
@ -34718,7 +34720,7 @@ var _user$project$Maintenance_View$inputCassetteView = F3(
{ctor: '[]'}); {ctor: '[]'});
}); });
var _user$project$Maintenance_View$rowView = function (machine) { var _user$project$Maintenance_View$rowView = function (machine) {
var actions = machine.paired ? { var cassetteCounts = machine.cashOut ? {
ctor: '::', ctor: '::',
_0: A2( _0: A2(
_elm_lang$html$Html$td, _elm_lang$html$Html$td,
@ -34726,26 +34728,24 @@ var _user$project$Maintenance_View$rowView = function (machine) {
{ {
ctor: '::', ctor: '::',
_0: A2( _0: A2(
_elm_lang$html$Html$button, _elm_lang$html$Html$div,
{ {
ctor: '::', ctor: '::',
_0: _user$project$Css_Admin$class( _0: _user$project$Css_Admin$classList(
{ {
ctor: '::', ctor: '::',
_0: _user$project$Css_Classes$TableButton, _0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$Component, _1: true},
_1: {ctor: '[]'} _1: {
ctor: '::',
_0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$FocusedComponent, _1: false},
_1: {ctor: '[]'}
}
}), }),
_1: { _1: {ctor: '[]'}
ctor: '::',
_0: _elm_lang$html$Html_Events$onClick(
_user$project$Maintenance_Types$Submit(
_user$project$Maintenance_Types$ResetCashOutBills(machine))),
_1: {ctor: '[]'}
}
}, },
{ {
ctor: '::', ctor: '::',
_0: _elm_lang$html$Html$text('Reset Bills'), _0: A3(_user$project$Maintenance_View$inputCassetteView, machine, _user$project$Maintenance_Types$Top, machine.cassette1),
_1: {ctor: '[]'} _1: {ctor: '[]'}
}), }),
_1: {ctor: '[]'} _1: {ctor: '[]'}
@ -34758,26 +34758,24 @@ var _user$project$Maintenance_View$rowView = function (machine) {
{ {
ctor: '::', ctor: '::',
_0: A2( _0: A2(
_elm_lang$html$Html$button, _elm_lang$html$Html$div,
{ {
ctor: '::', ctor: '::',
_0: _user$project$Css_Admin$class( _0: _user$project$Css_Admin$classList(
{ {
ctor: '::', ctor: '::',
_0: _user$project$Css_Classes$TableButton, _0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$Component, _1: true},
_1: {ctor: '[]'} _1: {
ctor: '::',
_0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$FocusedComponent, _1: false},
_1: {ctor: '[]'}
}
}), }),
_1: { _1: {ctor: '[]'}
ctor: '::',
_0: _elm_lang$html$Html_Events$onClick(
_user$project$Maintenance_Types$Submit(
_user$project$Maintenance_Types$UnpairMachine(machine))),
_1: {ctor: '[]'}
}
}, },
{ {
ctor: '::', ctor: '::',
_0: _elm_lang$html$Html$text('Unpair'), _0: A3(_user$project$Maintenance_View$inputCassetteView, machine, _user$project$Maintenance_Types$Bottom, machine.cassette2),
_1: {ctor: '[]'} _1: {ctor: '[]'}
}), }),
_1: {ctor: '[]'} _1: {ctor: '[]'}
@ -34785,6 +34783,72 @@ var _user$project$Maintenance_View$rowView = function (machine) {
_1: {ctor: '[]'} _1: {ctor: '[]'}
} }
} : { } : {
ctor: '::',
_0: A2(
_elm_lang$html$Html$td,
{
ctor: '::',
_0: _user$project$Css_Admin$class(
{
ctor: '::',
_0: _user$project$Css_Classes$CellDisabled,
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
},
{ctor: '[]'}),
_1: {
ctor: '::',
_0: A2(
_elm_lang$html$Html$td,
{
ctor: '::',
_0: _user$project$Css_Admin$class(
{
ctor: '::',
_0: _user$project$Css_Classes$CellDisabled,
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
},
{ctor: '[]'}),
_1: {ctor: '[]'}
}
};
var resetBills = machine.cashOut ? A2(
_elm_lang$html$Html$td,
{ctor: '[]'},
{
ctor: '::',
_0: A2(
_elm_lang$html$Html$button,
{
ctor: '::',
_0: _user$project$Css_Admin$class(
{
ctor: '::',
_0: _user$project$Css_Classes$TableButton,
_1: {ctor: '[]'}
}),
_1: {
ctor: '::',
_0: _elm_lang$html$Html_Events$onClick(
_user$project$Maintenance_Types$Submit(
_user$project$Maintenance_Types$ResetCashOutBills(machine))),
_1: {ctor: '[]'}
}
},
{
ctor: '::',
_0: _elm_lang$html$Html$text('Update Counts'),
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
}) : A2(
_elm_lang$html$Html$td,
{ctor: '[]'},
{ctor: '[]'});
var actions = {
ctor: '::', ctor: '::',
_0: A2( _0: A2(
_elm_lang$html$Html$td, _elm_lang$html$Html$td,
@ -34805,36 +34869,20 @@ var _user$project$Maintenance_View$rowView = function (machine) {
ctor: '::', ctor: '::',
_0: _elm_lang$html$Html_Events$onClick( _0: _elm_lang$html$Html_Events$onClick(
_user$project$Maintenance_Types$Submit( _user$project$Maintenance_Types$Submit(
_user$project$Maintenance_Types$ResetCashOutBills(machine))), _user$project$Maintenance_Types$UnpairMachine(machine))),
_1: {ctor: '[]'} _1: {ctor: '[]'}
} }
}, },
{ {
ctor: '::', ctor: '::',
_0: _elm_lang$html$Html$text('Reset Bills'), _0: _elm_lang$html$Html$text('Unpair'),
_1: {ctor: '[]'} _1: {ctor: '[]'}
}), }),
_1: {ctor: '[]'} _1: {ctor: '[]'}
}), }),
_1: { _1: {
ctor: '::', ctor: '::',
_0: A2( _0: resetBills,
_elm_lang$html$Html$td,
{
ctor: '::',
_0: _user$project$Css_Admin$class(
{
ctor: '::',
_0: _user$project$Css_Classes$NoInput,
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
},
{
ctor: '::',
_0: _elm_lang$html$Html$text('Unpaired'),
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'} _1: {ctor: '[]'}
} }
}; };
@ -34853,71 +34901,9 @@ var _user$project$Maintenance_View$rowView = function (machine) {
_0: _elm_lang$html$Html$text(machine.name), _0: _elm_lang$html$Html$text(machine.name),
_1: {ctor: '[]'} _1: {ctor: '[]'}
}), }),
_1: { _1: {ctor: '[]'}
ctor: '::',
_0: A2(
_elm_lang$html$Html$td,
{ctor: '[]'},
{
ctor: '::',
_0: A2(
_elm_lang$html$Html$div,
{
ctor: '::',
_0: _user$project$Css_Admin$classList(
{
ctor: '::',
_0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$Component, _1: true},
_1: {
ctor: '::',
_0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$FocusedComponent, _1: false},
_1: {ctor: '[]'}
}
}),
_1: {ctor: '[]'}
},
{
ctor: '::',
_0: A3(_user$project$Maintenance_View$inputCassetteView, machine, _user$project$Maintenance_Types$Top, machine.cassette1),
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
}),
_1: {
ctor: '::',
_0: A2(
_elm_lang$html$Html$td,
{ctor: '[]'},
{
ctor: '::',
_0: A2(
_elm_lang$html$Html$div,
{
ctor: '::',
_0: _user$project$Css_Admin$classList(
{
ctor: '::',
_0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$Component, _1: true},
_1: {
ctor: '::',
_0: {ctor: '_Tuple2', _0: _user$project$Css_Classes$FocusedComponent, _1: false},
_1: {ctor: '[]'}
}
}),
_1: {ctor: '[]'}
},
{
ctor: '::',
_0: A3(_user$project$Maintenance_View$inputCassetteView, machine, _user$project$Maintenance_Types$Bottom, machine.cassette2),
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
}),
_1: {ctor: '[]'}
}
}
}, },
actions)); A2(_elm_lang$core$Basics_ops['++'], cassetteCounts, actions)));
}; };
var _user$project$Maintenance_View$tableView = function (machines) { var _user$project$Maintenance_View$tableView = function (machines) {
return _elm_lang$core$List$isEmpty(machines) ? A2( return _elm_lang$core$List$isEmpty(machines) ? A2(

4
public/styles.css
View file

@ -365,6 +365,10 @@ p {
background-color: #ffffff; background-color: #ffffff;
} }
.lamassuAdminConfigTable .lamassuAdminCellDisabled {
background: repeating-linear-gradient(45deg,#dfdfdc,#dfdfdc 2px,#e6e6e3 5px);
}
.lamassuAdminConfigTable .lamassuAdminBasicInputDisabled { .lamassuAdminConfigTable .lamassuAdminBasicInputDisabled {
height: 25px; height: 25px;
line-height: 25px; line-height: 25px;