Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Localized the title of panel and dialog in Sales Summary screen #127

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6083750
Localized the title of panel and dialog in Sales Summary screen
hellozhangwei Sep 23, 2021
2f3828b
Merge branch 'moqui:master' into master
Sep 27, 2021
a1f4d30
Merge branch 'moqui:master' into master
Oct 29, 2021
e349f77
Fixed the problem that cannot add multiple features
hellozhangwei Oct 29, 2021
e98cfc9
Merge branch 'moqui:master' into master
Dec 17, 2021
4dc1ad0
Merge branch 'moqui:master' into master
Jan 5, 2022
0c642ff
Merge branch 'moqui:master' into master
Jan 7, 2022
35e38fe
Merge branch 'moqui:master' into master
Jan 14, 2022
2b8bca5
Merge branch 'moqui:master' into master
Apr 26, 2022
e76c1b7
Merge branch 'moqui:master' into master
May 19, 2022
ddf95a7
Merge branch 'moqui:master' into master
May 21, 2022
336f933
Merge branch 'moqui:master' into master
Jun 16, 2022
ef91036
Merge branch 'moqui:master' into master
Jun 24, 2022
7bc9d03
Merge branch 'moqui:master' into master
Jul 14, 2022
d86168c
Merge branch 'moqui:master' into master
Jul 28, 2022
ca4dffc
Merge branch 'moqui:master' into master
Oct 28, 2022
c7e1627
Merge branch 'moqui:master' into master
Nov 5, 2022
e5bb0ed
Merge branch 'moqui:master' into master
Nov 15, 2022
52c3a2e
Merge branch 'moqui:master' into master
Nov 15, 2022
3f1fc98
Merge branch 'moqui:master' into master
Dec 3, 2022
0e3fd65
Merge branch 'moqui:master' into master
Dec 20, 2022
ec2d471
Fixed incorrect section-include of equipment status
hellozhangwei Jan 5, 2023
47ab142
Merge branch 'moqui:master' into master
Feb 6, 2023
bffd719
Merge branch 'moqui:master' into master
May 27, 2023
b9cee12
Upload party primary image
hellozhangwei Jun 9, 2023
c7c2e4f
Merge branch 'master' of https://github.com/hellozhangwei/SimpleScreens
hellozhangwei Jun 19, 2023
be11ea0
Merge branch 'moqui:master' into master
Dec 22, 2023
a2b2c72
Merge branch 'moqui:master' into master
hellozhangwei Nov 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,6 @@ Written in 2019 by Jacob Barnes - Tellan
Written in 2020 by Joseph Wager - JWager-rch
Written in 2021 by Amir Anjomshoaa - amiranjom
Written in 2022 by Guru Dharam Singh Khalsa - pandor4u
Written in 2023 by Zhang Wei - hellozhangwei

===========================================================================
42 changes: 42 additions & 0 deletions screen/MyAccount/User/Account.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,27 @@ along with this software (see the LICENSE.md file). If not, see

<transition name="updateUser"><service-call name="mantle.party.PartyServices.update#Account" in-map="context"/>
<default-response url="."/></transition>

<transition name="createContent">
<actions>
<if condition="partyContentId">
<service-call name="mantle.party.PartyServices.update#PartyContent" in-map="context"/>
<else>
<service-call name="mantle.party.PartyServices.create#PartyContent" in-map="context"/>
</else>
</if>
</actions>
<default-response url="."/></transition>

<transition name="downloadContent" read-only="true">
<parameter name="partyContentId"/>
<actions>
<entity-find-one entity-name="mantle.party.PartyContent" value-field="partyContent"/>
<script>ec.web.sendResourceResponse(partyContent.contentLocation)</script>
</actions>
<default-response type="none"/>
</transition>

<transition name="changePassword"><service-call name="org.moqui.impl.UserServices.update#Password"/>
<default-response url="."/><error-response url="."/></transition>

Expand Down Expand Up @@ -74,8 +95,29 @@ along with this software (see the LICENSE.md file). If not, see
<!-- only show SMS dialog if org.moqui.SmsServices.send#SmsMessage service is NOT from moqui-framework (on classpath) -->
<set field="sendSmsLoc" from="ec.service.getServiceDefinition('org.moqui.SmsServices.send#SmsMessage')?.serviceNode?.fileLocation"/>
<set field="isSmsActive" from="sendSmsLoc &amp;&amp; !sendSmsLoc.contains('classpath')"/>

<entity-find entity-name="mantle.party.PartyContent" list="contentList">
<econdition field-name="partyId"/>
<econdition field-name="partyContentTypeEnumId" value="PcntPrimaryImage"/>
<econdition field-name="contentLocation" operator="not-equals" value=""/>
<order-by field-name="-contentDate"/>
</entity-find>
<set field="partyContentId" from="contentList?.first.partyContentId"/>

</actions>
<widgets>

<form-single name="NewContentForm" transition="createContent">
<field name="partyId"><default-field><hidden/></default-field></field>
<field name="partyContentId" from="partyContentId"><default-field><hidden/></default-field></field>
<field name="partyContentTypeEnumId"><default-field><hidden default-value="PcntPrimaryImage"/></default-field></field>
<field name="contentFile"><default-field>
<image-file url="downloadContent/${partyContentId}/${ec.user.nowTimestamp}"/>
<!--<image url="downloadContent/${partyId}" url-type="transition" />-->
</default-field></field>
<field name="submitButton"><default-field><submit text="Save"/></default-field></field>
</form-single>

<container-panel id="UserInfoContainer">
<panel-center>
<container-dialog id="change-password" button-text="Change Password">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ along with this software (see the LICENSE.md file). If not, see
<#assign modalTitle = title + " Detail">
<#if sri.getRenderMode() == "vuet" || sri.getRenderMode() == "html">
<div class="panel panel-default"><div class="panel-body" onclick="$('#${modalId}').modal('show');">
<h5 class="text-center" style="margin-top:0;">${title}</h5>
<h5 class="text-center" style="margin-top:0;">${ec.l10n.localize(title)}</h5>
<@statsPanelContent title mainFormat valThis valLast valPrior valAvg false chartList chartMaList labelList/>
</div></div>
<div class="modal fade" id="${modalId}" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document"><div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">${title}</h4>
<h4 class="modal-title">${ec.l10n.localize(title)}</h4>
</div>
<div class="modal-body">
<@statsPanelContent modalTitle mainFormat valThis valLast valPrior valAvg true chartList chartMaList labelList/>
</div>
</div></div>
</div>
<#elseif sri.getRenderMode() == "qvt">
<m-container-dialog title="${title}">
<m-container-dialog title="${ec.l10n.localize(title)}">
<template v-slot:button>
<q-card flat bordered class="q-ma-sm"><q-card-section>
<h5 class="text-center" style="margin-top:0;margin-bottom:8px;">${title}</h5>
<h5 class="text-center" style="margin-top:0;margin-bottom:8px;">${ec.l10n.localize(title)}</h5>
<@statsPanelContent title mainFormat valThis valLast valPrior valAvg false chartList chartMaList labelList/>
</q-card-section></q-card>
</template>
Expand Down
13 changes: 5 additions & 8 deletions screen/SimpleScreens/Catalog/FeatureGroup/EditFeatureGroup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,11 @@ along with this software (see the LICENSE.md file). If not, see

<transition name="createProductFeatureGroupAppl">
<actions>
<if condition="productFeatureId instanceof Collection"><then>
<iterate list="productFeatureId" entry="curId">
<service-call name="create#mantle.product.feature.ProductFeatureGroupAppl"
in-map="[productFeatureId:curId, productFeatureGroupId:productFeatureGroupId, fromDate:fromDate]"/>
</iterate>
</then><else>
<service-call name="create#mantle.product.feature.ProductFeatureGroupAppl" in-map="context"/>
</else></if>
<set field="productFeatureIds" from="productFeatureId?.split(',')"/>
<iterate list="productFeatureIds" entry="curId">
<service-call name="create#mantle.product.feature.ProductFeatureGroupAppl"
in-map="[productFeatureId:curId, productFeatureGroupId:productFeatureGroupId, fromDate:fromDate]"/>
</iterate>
</actions>
<default-response url="."/>
</transition>
Expand Down
4 changes: 2 additions & 2 deletions screen/SimpleScreens/Shipping/Picklist/PicklistDetail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ along with this software (see the LICENSE.md file). If not, see
<box-body>
<container-row>
<row-col lg="5">
<section-include name="AssetStatusChangeAndHistorySection"
location="component://SimpleScreens/template/basic/StatusWidgets.xml#StatusChangeSection"/>
<section-include name="StatusChangeAndHistorySection"
location="component://SimpleScreens/template/basic/StatusWidgets.xml"/>
</row-col>
<row-col lg="7">
<form-single name="UpdateAssetAssign" transition="updateAssetAssign" map="assetAssign">
Expand Down