Commits · dev · sdoc / billrun-frontend

26 Apr, 2020 1 commit

Shani authored Apr 26, 2020

BRCD-2130 feat(Tax) - added 'Dispaly in list' support for tax fields

See merge request sdoc/brcloud!1093

6d199bda

14 Apr, 2020 1 commit
- BRCD-2130 fix(List) - added support for hierarchical fields with '.' in field_name · f424164f
  Roman authored Apr 15, 2020
  
  f424164f
06 Apr, 2020 1 commit

Merge branch '_release-5.11-alpha2' into 'dev' · 3a64a895

Shani authored Apr 06, 2020

BRCD-1536 Define events by percentage + trigger by different groups - UI

See merge request sdoc/brcloud!1071

3a64a895

30 Mar, 2020 3 commits
- fix(ReduxFormModal) - fix JS warnint by adding object prop-type · 277bacdf
  Roman authored Mar 30, 2020
  
  277bacdf
- BRCD-1536 fix(BalanceEvent) - improve fix by reset contition type when needed only if it set · e60b7fbc
  Roman authored Mar 30, 2020
  
  e60b7fbc
- BRCD-1536 fix(BalanceEvent) - improve fix by not removing condition value and type if not needed · a3fa608b
  Roman authored Mar 30, 2020
  
  a3fa608b
29 Mar, 2020 3 commits
- Merge branch 'BRCD-1536_release-5.11-alpha2' of git.bill.run:roman/braas into... · 936c4f29
  Roman authored Mar 29, 2020
```
Merge branch 'BRCD-1536_release-5.11-alpha2' of git.bill.run:roman/braas into BRCD-1536_release-5.11-alpha2
```
  936c4f29
- BRCD-1536 fix(BalanceEvent) - hide reached_percentage when condition is on 'Limit to Activity Type' · 2244d774
  Roman authored Mar 29, 2020
  
  2244d774
- Merge branch 'dev' of git.bill.run:sdoc/brcloud into BRCD-1536 _release-5.11-alpha2 · a0654135
  Roman authored Mar 29, 2020
  
  a0654135
22 Mar, 2020 1 commit
- BRCD-2130 feat(Tax) - added 'Dispaly in list' support for tax fields · a9c2fd16
  Roman authored Mar 22, 2020
  
  a9c2fd16
12 Mar, 2020 1 commit
- Merge branch 'dev' of git.bill.run:sdoc/brcloud into BRCD-2130 · b619c21b
  Roman authored Mar 12, 2020
  
  b619c21b
26 Feb, 2020 2 commits
- Merge branch 'brcd_1897' into 'dev' · a1de9786
  Shani authored Feb 26, 2020
```
BRCD-1897 - Billing cycle page(UI) taking time to load

See merge request sdoc/brcloud!1010
```
  a1de9786
- BRCD-1536 fix(Event) - percentage value must be between 0-100 · 7e4e1b96
  Roman authored Feb 26, 2020
  
  7e4e1b96
19 Feb, 2020 4 commits
- Fix issue of empty cycles select options in customer page. · f03cbda3
  Idan Daniel authored Feb 19, 2020
  
  f03cbda3
- Merge branch 'BRCD-1536_release-5.11-alpha2' of git.bill.run:roman/braas into... · bf49386c
  Roman authored Feb 19, 2020
```
Merge branch 'BRCD-1536_release-5.11-alpha2' of git.bill.run:roman/braas into BRCD-1536_release-5.11-alpha2
```
  bf49386c
- BRCD-1536 feat(BalanceEvent) - by default set USAGE condition trigger · 1a5592ca
  Roman authored Feb 19, 2020
  
  1a5592ca
- BRCD-1536 fix(BalanceEvent) - filter Monetary groups · ddc0e4f8
  Roman authored Feb 19, 2020
  
  ddc0e4f8
16 Feb, 2020 1 commit
- Hide charge button · 67b9d3ad
  Idan Daniel authored Feb 16, 2020
  
  67b9d3ad
13 Feb, 2020 1 commit
- Merge branch 'dev' into 'BRCD-1536_release-5.11-alpha2' · 36c9b5d5
  Roman authored Feb 13, 2020
```
# Conflicts:
#   src/components/PaymentGateways/GatewayParamsModal.js
```
  36c9b5d5
29 Jan, 2020 1 commit
- Merge branch 'dev' into 'dev' · b0c5d09e
  Shani authored Jan 29, 2020
```
Merge release-5.11 into dev

See merge request sdoc/brcloud!1086
```
  b0c5d09e
22 Jan, 2020 4 commits
- Merge branch 'release-5.11' of git.bill.run:sdoc/brcloud into release-5.11 · ed7111da
  Shani authored Jan 22, 2020
  
  ed7111da
- Merge branch 'payments-BRCD-2188' into 'release-5.11' · 584e9397
  Shani authored Jan 22, 2020
```
BRCD-2188-Remove "denied amount" field, from bills report. Add "is denial" field.

See merge request sdoc/brcloud!1068
```
  584e9397
- Merge branch 'tax-BRCD-2158' into 'release-5.11' · c1009dac
  Shani authored Jan 22, 2020
```
BRCD-2158:Change of Epic tax rates & rules to support VATN

See merge request sdoc/brcloud!1073
```
  c1009dac
- Merge branch 'payments-BRCD-2113' into 'release-5.11' · bf91b03b
  Shani authored Jan 22, 2020
```
BRCD-2113:Custom payment gateways - log file

See merge request sdoc/brcloud!1083
```
  bf91b03b
19 Jan, 2020 3 commits
- Update version · 60518025
  Shani authored Jan 19, 2020
  
  60518025
- Merge branch 'BRCD-2245' into 'release-5.11' · ba7355f0
  Shani authored Jan 19, 2020
```
BRCD-2245 feat(Audit) - move to audit collection + added audited flag

See merge request sdoc/brcloud!1077
```
  ba7355f0
- BRCD-2113 :Added "total_amount" per file, from the log - to the reports. · 34a66c84
  Sahar Leviad authored Jan 19, 2020
  
  34a66c84
16 Jan, 2020 2 commits
- Merge branch 'payment_gateways_loop' into 'release-5.11' · 042c9e6d
  Shani authored Jan 16, 2020
```
fix(payment_gateways) - check for undefined to prevent JS error (BRCD-2274)

See merge request sdoc/brcloud!1080
```
  042c9e6d
- fix(payment_gateways) - check for undefined to prevent JS error · 929e887a
  Roman authored Jan 16, 2020
  
  929e887a
06 Jan, 2020 2 commits
- BRCD-2245 feat(Audit) - move to audit collection + added audited flag + better... · 02a34967
  Roman authored Jan 06, 2020
```
BRCD-2245 feat(Audit) - move to audit collection + added audited flag + better table values formatting
```
  02a34967
- Merge branch 'dev' of git.bill.run:sdoc/brcloud into dev · 1405f8a0
  Roman authored Jan 06, 2020
  
  1405f8a0
31 Dec, 2019 2 commits

Merge branch '' into 'release-5.11' · d9aa72e7

Shani authored Dec 31, 2019

BRCD-2009 feat(Import) - Hide Import BTN in entity list in no importers available

See merge request sdoc/brcloud!1043

d9aa72e7

Merge branch '' into 'release-5.11' · 226e3786

Shani authored Dec 31, 2019

BRCD-2088 fix(Number) - dont run function on non editable number value

See merge request sdoc/brcloud!1061

226e3786

29 Dec, 2019 2 commits
- Merge branch 'release-5.11' into 'release-5.11' · 11cbc72c
  Shani authored Dec 29, 2019
```
Release 5.11 sync with dev

See merge request sdoc/brcloud!1076
```
  11cbc72c
- Merge branch 'dev' into release-5.11 · f3549159
  Shani authored Dec 29, 2019
```
# Conflicts:
#	src/config/report.js
```
  f3549159
26 Dec, 2019 5 commits
- Merge branch 'release-5.11-to-merge' into 'release-5.11' · 7320607b
  Shani authored Dec 26, 2019
```
merge missing commits from 5.10 to 5.11

See merge request sdoc/brcloud!1075
```
  7320607b
- Separate Discount key ("key" field) from Plan / Service key in reports (BRCD-1875 ) · efd9a9f9
  Shani authored May 16, 2019
  
  efd9a9f9
- Merge branch 'release-5.11' into 'release-5.11' · 130193fe
  Shani authored Dec 26, 2019
```
Release 5.11 sync with release-5.9

See merge request sdoc/brcloud!1074
```
  130193fe
- Merge branch 'release-5.9' into release-5.11 · 47250172
  Shani authored Dec 26, 2019
```
# Conflicts:
#	.gitignore
#	config/globalSettings.dev.js
#	public/js/components/InputProcessor/RateMapping/ComputedRate.js
#	src/config/report.js
#	src/config/system.js
#	src/selectors/reportSelectors.js
#	yarn.lock
```
  47250172
- BRCD-2158 :Added "installments" field to tax mapping - computed. · 8860d405
  Sahar Leviad authored Dec 26, 2019
  
  8860d405