Skip to content

Commit a6078cd

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature-tree-table
2 parents 903852e + 908b3af commit a6078cd

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

db/data/sap.common-Currencies.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CODE;SYMBOL;NAME;DESCR
1+
code;symbol;name;descr
22
EUR;€;Euro;European Euro
33
USD;$;US Dollar;United States Dollar
44
CAD;$;Canadian Dollar;Canadian Dollar

db/data/sap.common-Currencies.texts.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
CODE;LOCALE;NAME;DESCR
1+
code;locale;name;descr
22
EUR;de;Euro;European Euro
33
USD;de;US-Dollar;United States Dollar
44
CAD;de;Kanadischer Dollar;Kanadischer Dollar

mtx/sidecar/package-lock.json

Lines changed: 11 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.3.6</version>
9+
<version>3.4.0</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

srv/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@
168168
<plugin>
169169
<groupId>org.graalvm.buildtools</groupId>
170170
<artifactId>native-maven-plugin</artifactId>
171+
<configuration>
172+
<metadataRepository>
173+
<version>0.3.14</version>
174+
</metadataRepository>
175+
</configuration>
171176
</plugin>
172177

173178
<!-- STEPS TO BUILD CDS MODEL AND GENERATE POJOs -->

srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@
3939
import com.sap.cds.services.messages.Messages;
4040
import com.sap.cds.services.persistence.PersistenceService;
4141

42-
import cds.gen.adminservice.BooksAddToOrderContext;
4342
import cds.gen.adminservice.AdminService;
4443
import cds.gen.adminservice.AdminService_;
4544
import cds.gen.adminservice.Books;
45+
import cds.gen.adminservice.BooksAddToOrderContext;
4646
import cds.gen.adminservice.Books_;
4747
import cds.gen.adminservice.OrderItems;
4848
import cds.gen.adminservice.OrderItems_;
@@ -196,7 +196,7 @@ private BigDecimal calculateAmountInDraft(String orderItemId, Integer newQuantit
196196
if(includeWarnings && quantity <= 0) {
197197
// Tip: add additional messages with localized messages from property files
198198
// these messages are transported in sap-messages and do not abort the request
199-
messages.warn(MessageKeys.QUANTITY_REQUIRE_MINIMUM);
199+
messages.warn(MessageKeys.QUANTITY_REQUIRE_MINIMUM).target(ORDER_ITEMS, i -> i.quantity());
200200
}
201201

202202
// get the price of the updated book ID

0 commit comments

Comments
 (0)