Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 8
TitelFeature/checkout upgrade
Beschreibung
Statusmerged
Created at 2018-08-14T10:13:06.024Z
Updated at 2018-08-14T14:54:12.297Z
Source branchfeature/checkout-upgrade
Target branchdevelop
AuthorSascha Immig
AssigneeMarcel Pociot

Discussion notes

added 1 commit
  • 3b7a0cd7 - cs-fix
Compare with previous version
Sascha Immig 2018-08-14T11:00:25.847Z
added 1 commit
  • 4c845cb8 - Modify spinner to use the correct adyen event
Compare with previous version
Marcel Pociot 2018-08-14T13:34:11.195Z
@gabrielg Ich habe ein paar Anpassungen an dem Spinner gemacht. Zum einen habe ich den Code so angepasst, dass wir hier auf jQuery verzichten können und nur VueJS nutzen. Ich habe die CheckoutForm Komponente einfach nach außen gesetzt und mit `ref="spinner"` kann ich die Spinner Komponente dann innerhalb der CheckoutForm Komponente referenzieren. Ausserdem war das einblenden des Ladebildschirms an der falschen Stelle - nämlich vor der Weiterleitung. Marcel Pociot 2018-08-14T13:37:05.238Z
Das Einblenden des des Ladebildschirms vor der Weiterleitung war so gewollt, da z.B. bei mir nach der Weiterleitung sehr viel Zeit vergeht, bis die Buchung durch ist (locker 30 Sekunden). Wenn eine andere Stelle den Spinner auch noch benötigt, dann gerne. Gregor Gabriel 2018-08-14T14:11:47.997Z
added 1 commit
  • aa109022 - removed old fragments, updated package.lock
Compare with previous version
Sascha Immig 2018-08-14T14:50:40.334Z
merged Sascha Immig 2018-08-14T14:54:12.346Z
mentioned in commit 8559b0aaee4ae487ca4fe7b087cf94bbfc581214 Sascha Immig 2018-08-14T14:54:12.390Z

Merge Commits

Title Id Author Created at Message
cs-fix 3b7a0cd703ef3d55406c21e9026d15bf4779b0f5 TUV\immigs 2018-08-14T11:00:16.000Z cs-fix
cs-fix 41d34c6c16f44c109882c93293ede3319fb4b6da TUV\immigs 2018-08-14T10:12:26.000Z cs-fix
Modify spinner to use the correct adyen event 4c845cb860cb3076aa290dc773d6177cd3f32cde Marcel Pociot 2018-08-14T13:33:35.000Z Modify spinner to use the correct adyen event
WIP - removed npm update from dev_updater, as this does not work in vagrant yet and 52303930b48b35a9361be5ae73e77a0b4de13cab TUV\gabrielg 2018-07-10T12:37:40.000Z WIP - removed npm update from dev_updater, as this does not work in vagrant yet and
WIP - checkout now uses sdkVersion 1.3.0 657e2b947efcd9c6cecd5aa09cc419bedb934505 TUV\gabrielg 2018-07-11T15:42:05.000Z WIP - checkout now uses sdkVersion 1.3.0
WIP - streamlined code - removed not working evebt handling 726bc1e0d4a7d112d92c3faf29f43f4cc928fab0 TUV\gabrielg 2018-07-17T11:49:28.000Z WIP - streamlined code - removed not working evebt handling
Merge branch 'develop' of http://40.69.64.159/lms/seventeen into feature/checkout-upgrade 8517aceafcb2a0118b0f10a1fd3b172ccd97cb27 TUV\gabrielg 2018-07-12T12:37:35.000Z Merge branch 'develop' of http://40.69.64.159/lms/seventeen into feature/checkout-upgrade # Conflicts: # public/js/admin/app.js.map # public/js/app.js.map
Merge branch 'develop' of http://40.69.64.159/lms/seventeen into feature/checkout-upgrade a604c28779afe9971a365c02b6157a552c1cafdd TUV\gabrielg 2018-07-12T07:40:06.000Z Merge branch 'develop' of http://40.69.64.159/lms/seventeen into feature/checkout-upgrade # Conflicts: # public/js/admin/app.js # public/js/admin/app.js.map # public/js/app.js.map
removed old fragments, updated package.lock aa109022d2cf667fbb99f98a55a71e7552597f0e TUV\immigs 2018-08-14T14:50:23.000Z removed old fragments, updated package.lock
WIP - added vue spiner, that can react on 'ui-on-hold' event b84c8c6d656311fd0f50bc84417bfb3749433425 TUV\gabrielg 2018-07-13T14:30:54.000Z WIP - added vue spiner, that can react on 'ui-on-hold' event
WIP - rebuild with "npm run dev" cb46b167a259c134e34192d98ba0a7e0b5297243 TUV\gabrielg 2018-07-12T12:31:37.000Z WIP - rebuild with "npm run dev"
WIP - Spinner ist triggering now - some debug-code has to be removed ce5a18b8110365b6f09ad53c74655822d6e71e6e TUV\gabrielg 2018-07-16T11:00:35.000Z WIP - Spinner ist triggering now - some debug-code has to be removed
Merge branch 'develop' into feature/checkout-upgrade f96aff049b72af329f0c44e8a3a37d0ac314b75a TUV\immigs 2018-08-14T10:07:33.000Z Merge branch 'develop' into feature/checkout-upgrade # Conflicts: # app/Http/Controllers/CheckoutController.php # public/css/admin/style.css.map # public/css/app.css.map # public/css/print.css.map # public/js/admin/app.js # public/js/admin/app.js.map # public/js/app.js # public/js/app.js.map # resources/assets/js/app.js # resources/lang/de.json
Merge branch 'develop' of http://40.69.64.159/lms/seventeen into feature/checkout-upgrade fe0375662c12ecf3f017a1fc68d6f7dd1420d974 TUV\gabrielg 2018-07-16T12:30:41.000Z Merge branch 'develop' of http://40.69.64.159/lms/seventeen into feature/checkout-upgrade # Conflicts: # public/css/admin/style.css.map # public/js/admin/app.js # public/js/admin/app.js.map # public/js/app.js # public/js/app.js.map