Details des Tickets

Beschreibung,Kommentare und Anhänge

merge request id 825
TitelLL-1535 | view for chargeable catalogs added
Beschreibung
Statusmerged
Created at 2023-06-23T14:28:14.462Z
Updated at 2023-06-29T14:22:54.920Z
Source branchfeature/LL-1535-catalog-prise-view
Target branchdevelop
AuthorSascha Immig
AssigneeSascha Immig

Discussion notes

added 3 commits
  • 3f2f6436 - LL-1510 | CatalogUserLimitService.php and CatalogUserLimitServiceTest.php created.
  • d56eccf0 - corrected typo in function name
  • 2caee27b - Merge branch 'feature/LL-1510-catalogs-prises-controller' into 'feature/LL-1535-catalog-prise-view'
Compare with previous version
Sascha Immig 2023-06-27T10:34:39.535Z
added 1 commit
  • 5c6151a0 - fixed 0 vs NULL problem
Compare with previous version
Gregor Gabriel 2023-06-27T10:48:30.802Z
LL-1510 hier hinein gemerged Sascha Immig 2023-06-27T14:09:11.373Z
added 227 commits
  • 5c6151a0...32b2a16c - 226 commits from branch develop
  • 91088720 - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2023-06-28T07:57:53.747Z
added 1 commit
  • 8ce4a4c1 - + made sure service works in client context too
Compare with previous version
Gregor Gabriel 2023-06-28T08:14:38.787Z
added 2 commits
  • e397a3f6 - 1 commit from branch develop
  • 164a923f - Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into…
Compare with previous version
Gregor Gabriel 2023-06-28T08:59:11.023Z
added 1 commit
  • 504c403d - + use CatalogUserLimitService now to calculate price of additional catalogs
Compare with previous version
Gregor Gabriel 2023-06-29T10:59:00.926Z
added 1 commit
  • be6ec076 - refactoring: moved whole card body to catalog_card_body.blade.php, including php…
Compare with previous version
Sascha Immig 2023-06-29T13:51:06.683Z
added 1 commit
  • ba984e9b - another refactoring: saved service result in variable to avoid a second call.
Compare with previous version
Sascha Immig 2023-06-29T13:58:51.198Z
merged Sascha Immig 2023-06-29T14:22:54.985Z
mentioned in commit 2d1025f7df2617d18263c1ca2eeee494a00a72bf Sascha Immig 2023-06-29T14:22:55.192Z

Merge Commits

Title Id Author Created at Message
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 164a923f6382301047cc9ae05622af82497f40ca TUV\gabrielg 2023-06-28T08:59:07.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1535-catalog-prise-view
Merge branch 'feature/LL-1510-catalogs-prises-controller' into 'feature/LL-1535-catalog-prise-view' 2caee27be026e9b075b10377e4157ba85c2257a4 Sascha Immig 2023-06-27T10:34:38.000Z Merge branch 'feature/LL-1510-catalogs-prises-controller' into 'feature/LL-1535-catalog-prise-view' Feature/ll 1510 catalogs price controller See merge request lms/seventeen!820
LL-1510 | CatalogUserLimitService.php and CatalogUserLimitServiceTest.php created. 3f2f6436894165bee2308876894a52a1dc521110 Sebastian Majchrzak 2023-06-08T10:05:54.000Z LL-1510 | CatalogUserLimitService.php and CatalogUserLimitServiceTest.php created.
+ use CatalogUserLimitService now to calculate price of additional catalogs 504c403d2f68683445071eba1e0c94ee2eb01d68 TUV\gabrielg 2023-06-29T10:58:57.000Z + use CatalogUserLimitService now to calculate price of additional catalogs + use price_format(...) to format catalog prices + make CatalogUserLimitService capable to handle other value than null for unlimited users
fixed 0 vs NULL problem 5c6151a044168b816ad9ebbfd8d5e60f0691f924 TUV\gabrielg 2023-06-27T10:48:27.000Z fixed 0 vs NULL problem
+ made sure service works in client context too 8ce4a4c1fcd3067127cfc3bd9e39325be752ad53 TUV\gabrielg 2023-06-28T08:14:35.000Z + made sure service works in client context too + handled problem, when given catalog does not exist
Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into… 91088720410a7db0a4a083a5a2056d9a9a87baaf TUV\gabrielg 2023-06-28T07:57:46.000Z Merge branch 'develop' of https://gitlab.learningsystem.de/lms/seventeen into feature/LL-1535-catalog-prise-view
another refactoring: saved service result in variable to avoid a second call. ba984e9b40bfd144a30f2a5efa6a51bb98e39b9f TUV\immigs 2023-06-29T13:58:42.000Z another refactoring: saved service result in variable to avoid a second call.
refactoring: moved whole card body to catalog_card_body.blade.php, including php… be6ec076501b49de44886d2ec7746c3ed21d8966 TUV\immigs 2023-06-29T13:46:57.000Z refactoring: moved whole card body to catalog_card_body.blade.php, including php and looping. Also removed forwarding variables from subscription.blade.php to included blade. + fixed variable typo,
LL-1535 | view for chargeable catalogs added bedfb79181a93bc9c964ae9e7663b4df6e10690a Sebastian Majchrzak 2023-06-22T10:56:29.000Z LL-1535 | view for chargeable catalogs added
corrected typo in function name d56eccf027107cbbeb5efe23da609cb56e3d6786 TUV\immigs 2023-06-23T14:23:30.000Z corrected typo in function name